summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-30 22:53:40 +0000
committerRoy Marples <roy@marples.name>2008-01-30 22:53:40 +0000
commit0ce909e12b29cbe52e8161bc50b72ec40acaaf19 (patch)
tree1d4ef790da9e9234272fa9c4e93ac35b567726e5
parent05e5865bdccd90c803eaa18a04d07ed6730b5f8e (diff)
downloadopenrc-0ce909e12b29cbe52e8161bc50b72ec40acaaf19.tar.gz
openrc-0ce909e12b29cbe52e8161bc50b72ec40acaaf19.tar.bz2
openrc-0ce909e12b29cbe52e8161bc50b72ec40acaaf19.tar.xz
addons should check things, not us.
-rwxr-xr-xsh.Linux/init.sh17
1 files changed, 4 insertions, 13 deletions
diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh
index 1be9b4a..8be7079 100755
--- a/sh.Linux/init.sh
+++ b/sh.Linux/init.sh
@@ -209,24 +209,15 @@ else
esac
for m in ${managers}; do
- # Check common manager prerequisites and kernel params
+ # Check kernel params
if get_bootparam "no${m}" || ! has_addon ${m}-start; then
continue
fi
- # Check specific manager prerequisites
- case ${m} in
- devfs)
- grep -Eqs "[[:space:]]+devfs$" /proc/filesystems || continue
- ;;
- *)
- if [ -e /dev/.devfsd ]; then
- mountinfo --quiet --fstype-regex devfs && continue
- fi
- ;;
- esac
-
# Let's see if we can get this puppy rolling
start_addon ${m} && break
+
+ # Clean up
+ mountinfo -q /dev && umount -n /dev
done
fi