diff options
| -rwxr-xr-x | initramfs/initrd-stuff/bin/switch_root (renamed from initramfs/initrd-stuff/bin/run-init) | bin | 10832 -> 10832 bytes | |||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 4 | ||||
| -rwxr-xr-x | initramfs/mkdxsinitrd | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/initramfs/initrd-stuff/bin/run-init b/initramfs/initrd-stuff/bin/switch_root Binary files differindex 556caeb6..556caeb6 100755 --- a/initramfs/initrd-stuff/bin/run-init +++ b/initramfs/initrd-stuff/bin/switch_root diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index b5630bdc..86208016 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -576,6 +576,6 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ UDEVD_EXPECTED_SEQNUM #strinstr "bash" "$(ls -la /bin/sh)" && EE="-c" # new style of pivoting (exec -c would set an empty environment in bash) -exec run-init -c dev/console /mnt /sbin/init || error "$init_runinit" +#exec run-init -c dev/console /mnt /sbin/init || error "$init_runinit" # run-init could be replaced with switch_root from busybox ... -#exec switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" +exec switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index fade9b20..245e9fb8 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -473,9 +473,6 @@ esac # at this point ${DISTRO} ${DISTRO_VER} should be fixed copy_distro_stuff ${DISTRO} ${DISTRO_VER} -# hotplug/udev type and related stuff -cp -a ${ROOTDIR}/etc/udev ${INSTDIR}/etc - # binary and corresponding library copies could be avoided if a small # initial ramdisk environment of its own is generated from busybox, # dietlibc and similar, see odlx project page ... @@ -488,6 +485,14 @@ mknod ${INSTDIR}/tmp/ctl b 241 255 &>/dev/null # suse specific, but might be usable with other distros too mknod ${INSTDIR}/tmp/bootsplash p &>/dev/null +# initial ramdisk scripts: init, functions, servconfig, hwautocfg, ... +# copy and replace variable names +for dirs in `find ${SLX_SHARE_PATH}/initramfs/* ! -regex ".*/\..*"` ; do + repco ${dirs##*initramfs/} +done +chmod 755 ${INSTDIR}/init \ + ${INSTDIR}/bin/{servconfig,hwautocfg,screenres,dhcpmkconfig} + # test for the existance of busybox if [ "$use_busybox" = 1 ]; then [ -x ${SLX_SHARE_PATH}/busybox/busybox ] || { @@ -503,7 +508,7 @@ if [ -n "$use_busybox" ] ; then mknod mkswap modprobe mount mv nice ping ps rdate rm rmmod sed \ sleep sort swapoff swapon switch_root tar test tftp time udhcpc \ umount uptime usleep vconfig vi zcat zcip; do - ln -s /bin/busybox ${INSTDIR}/bin/$bbins + ln -fs /bin/busybox ${INSTDIR}/bin/$bbins done # fake the sh link in busybox environment echo -e "#!/bin/ash\n/bin/ash \$@" > ${INSTDIR}/bin/sh @@ -560,6 +565,9 @@ fi mkdir -p ${INSTDIR}/var/{lib,run} +# hotplug/udev type and related stuff +cp -a ${ROOTDIR}/etc/udev ${INSTDIR}/etc + # type of hotplug/udev/dev (for etc directories see above!!) for bbins in udev udevd udevstart udevtrigger udevsend do @@ -716,14 +724,6 @@ done cp ${ROOTDIR}/lib/modules/${KERNVER}/modules.* \ ${INSTDIR}/lib/modules/${KERNVER} -# initial ramdisk scripts: init, functions, servconfig, hwautocfg, ... -# copy and replace variable names -for dirs in `find ${SLX_SHARE_PATH}/initramfs/* ! -regex ".*/\..*"` ; do - repco ${dirs##*initramfs/} -done -chmod 755 ${INSTDIR}/init \ - ${INSTDIR}/bin/{servconfig,hwautocfg,screenres,dhcpmkconfig} - # add the common default client configuration file - just to ensure to # have all major variables defined. !!These settings are most probably # are overwritten by fileget in stage3 within initramfs!! |