summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hooks/base9
-rw-r--r--init18
2 files changed, 11 insertions, 16 deletions
diff --git a/hooks/base b/hooks/base
deleted file mode 100644
index eccf591..0000000
--- a/hooks/base
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim:set ft=sh:
-run_hook ()
-{
- if [ -e "/sys/bus/pci" ]; then
- msg -n "Loading base modules..."
- /bin/modprobe -a -q $(/bin/cat /sys/bus/pci/devices/*/modalias) >/dev/null 2>&1
- msg "done."
- fi
-}
diff --git a/init b/init
index b12f269..8faab99 100644
--- a/init
+++ b/init
@@ -20,22 +20,26 @@ for cmd in $CMDLINE; do
case "$cmd" in
[0123456Ss]) export runlevel="$cmd" ;;
single) export runlevel="S" ;; #some people use 'single'
- *.*) ;; #do nothing if it contains a dot
- *=*) export "${cmd}" ;;
- *) export "${cmd}=y" ;;
+ # only export stuff that does work with dash :)
+ *=*) cmd="$(replace "${cmd}" '.' '_')"
+ cmd="$(replace "${cmd}" '-' '_')"
+ export "${cmd}"
+ ;;
+ *) cmd="$(replace "${cmd}" '.' '_')"
+ cmd="$(replace "${cmd}" '-' '_')"
+ export "${cmd}=y"
+ ;;
esac
done
if [ "x${disablehooks}" != "x" ]; then
- k="$(replace -q "${disablehooks}" '-' '_')"
- for d in $(replace "${k}" ','); do
+ for d in $(replace "${disablehooks}" ','); do
export "hook_${d}=disabled"
done
fi
if [ "x${disablemodules}" != "x" ]; then
- k="$(replace "${disablemodules}" '-' '_')"
- for d in $(replace "${k}" ','); do
+ for d in $(replace "${disablemodules}" ','); do
export "mod_${d}=disabled"
done
fi