diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-08-01 04:08:12 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-08-01 04:08:12 +0200 |
| commit | e9aa72aef50d72b8bb358cd5ef126d3ce9c64635 (patch) | |
| tree | ff17345f02365ba7684ffd00054a02cf6543b35b | |
| parent | 5ff944e1eb22afa51b9d999edaa5d967c6edaa9f (diff) | |
| download | mkinitcpio-e9aa72aef50d72b8bb358cd5ef126d3ce9c64635.tar.gz mkinitcpio-e9aa72aef50d72b8bb358cd5ef126d3ce9c64635.tar.xz | |
Accept resume changes (brain0)
Fixed disablemodules, Bug 5138
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@138 880c04e9-e011-0410-abf7-b926e227c9cd
| -rw-r--r-- | init | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -19,6 +19,7 @@ echo "/bin/modprobe" > /proc/sys/kernel/modprobe for cmd in $CMDLINE; do case "$cmd" in [0123456Ss]) export runlevel="$cmd" ;; + single) export runlevel="S" ;; #some people use 'single' *=*) export "${cmd}" ;; *) export "${cmd}=y" ;; esac @@ -43,7 +44,7 @@ IFS=$OLDIFS for m in $MODULES; do TST="" - eval "TST=\$mod_${h}" + eval "TST=\$mod_${m}" if [ "${TST}" != "disabled" ]; then /bin/modprobe -q $m > /dev/null 2>&1 fi @@ -70,14 +71,13 @@ if [ "${break}" = "y" ]; then PS1="ramfs$ " /bin/sh -i fi -#Special handling is udev is running +#Special handling if udev is running udevpid=$(/bin/minips -C udevd -o pid=) if [ "x${udevpid}" != "x" ]; then /bin/kill -9 $udevpid /bin/sleep 0.01 fi -# Optimize fs type loop for mounting rootfs msg ":: Initramfs Completed - control passing to kinit" echo "/sbin/modprobe" > /proc/sys/kernel/modprobe |