diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2007-05-12 18:05:51 +0200 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2007-05-12 18:05:51 +0200 |
| commit | 00e2615161b589f10d37001feab07ff8fc3d31ca (patch) | |
| tree | da0b40a70c317ff0a87374fd08ea32fcab4c9737 /init | |
| parent | c1c12f540ffbce793d94a191bc378c08a7258c4e (diff) | |
| download | mkinitcpio-00e2615161b589f10d37001feab07ff8fc3d31ca.tar.gz mkinitcpio-00e2615161b589f10d37001feab07ff8fc3d31ca.tar.xz | |
- fix a bug with BINARIES= (also accept shared objects, not only executables)
- fix some bugs introduced by phrakture (could you be more careful?)
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@204 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'init')
| -rw-r--r-- | init | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -14,7 +14,7 @@ export CMDLINE # Used so hooks can override params to kinit export kinit_params="" export root="" -echo "/bin/modprobe" > /proc/sys/kernel/modprobe +echo "/sbin/modprobe" > /proc/sys/kernel/modprobe for cmd in $CMDLINE; do case "$cmd" in @@ -110,11 +110,11 @@ if [ ! -e "${root}" ]; then PS1="ramfs$ " /bin/sh -i msg "Rebooting..." /bin/reboot -else - msg ":: Initramfs Completed - control passing to kinit" - if [ -f "/message" ]; then - msg "$(cat /message)" - fi +fi + +msg ":: Initramfs Completed - control passing to kinit" +if [ -f "/message" ]; then + msg "$(cat /message)" fi #Special handling if udev is running @@ -125,6 +125,4 @@ if [ "x${udevpid}" != "x" ]; then fi -echo "/sbin/modprobe" > /proc/sys/kernel/modprobe - exec /bin/kinit -- "root=${root}" ${kinit_params} "${runlevel}" > /dev/null 2>&1 |