diff options
| author | Dirk von Suchodoletz | 2007-01-31 20:11:02 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-01-31 20:11:02 +0100 |
| commit | 1ad51ac519e7afc970a5ddf991c9141e140bf7f3 (patch) | |
| tree | 2b35cf904a5e029ee2da9a355976a47d7c6ab670 /initramfs/initrd-stuff/init | |
| parent | Use the right variable name of the existing path. (diff) | |
| download | core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.tar.gz core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.tar.xz core-1ad51ac519e7afc970a5ddf991c9141e140bf7f3.zip | |
Fixed slow stage3 in higher debuglevels (sleep -> usleep in
/etc/functions)
Heavy rewrite of base scripts init/hwautocfg/servconfig. Moved
lots of stuff from hwautocfg to init and servconfig to get a
cleaner structure (do not wait for processes of init or servconfig
in hwautocfg)
Cleanup started, old codefragments will be removed soon ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@661 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 419ad956..de879d69 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -451,7 +451,7 @@ if [ -n "${UNIONFS}" -o -n "${UNION}" ] ; then error "$init_loadufs" nonfatal UNIONFS=""; } fi - +echo "Vor Union" # setup of client root filesystem dependent on the availability of UnionFS if [ -n "${UNIONFS}" ] ; then echo "Using UnionFS for rw access" @@ -532,6 +532,7 @@ fi # script for stuff to execute during early bootup d_mkrlscript init boot.ld "Running configuration postponed from InitRamFS" echo "fs complete at $(sysup)" >/tmp/fscmpl +echo "FS complete" # write debug file information after filesystem setup completed echo -e "# /etc${D_SYSCONFDIR}/logfile - file created by $0 (initramfs \ @@ -582,10 +583,12 @@ if [ -z "${NOLDSC}" ] ; then else error "$init_infldcfg" nonfatal fi -# copy machine configuration (from global settings, additions made within -# here and from dhcp/ldap sources) to client /etc for later checks -waitfor /tmp/svcfg 20000 || error "$init_errsw" +# wait a while for hardware setup to complete and copy stuff to stage4 waitfor /tmp/hwcfg 30000 || error "$init_errhw" +[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \ + >> /mnt/etc/udev/rules.d/04-scanner.rules +# wait a while for services setup to complete +waitfor /tmp/svcfg 20000 || error "$init_errsw" # IP configuration is made and should not be updated automatically, udevd # should be killed if started within init killall -9 dhcpcd dhclient pump udhcpc 2>/dev/null @@ -614,8 +617,9 @@ done test -f /mnt/etc/inittab || error "$init_erritab" # close runlevel script for stuff to execute during early bootup d_mkrlscript close boot.ld "" -# put /tmp into stage4 mtab +# put /tmp into stage4 mtab and add stuff to stage4 fstab sed -n "s,/mnt,,;/\/tmp /p" /proc/mounts >> /mnt/etc/mtab +[ -f /tmp/fstab ] && cat /tmp/fstab >> /mnt/etc/fstab # preparations to leave initramfs - umounting ... umount -n /sys || error "$init_errsys" nonfatal umount -n /proc/bus/usb >/dev/null 2>&1 |