From 2a896ef06c5fdefad689bf81b2588b3a26537cc0 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Thu, 10 May 2007 23:00:29 +0000 Subject: Removed udev stuff (from main scripts and suse specific) ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1041 95ad53e4-c205-0410-b2fa-d234c58c8868 --- initramfs/initrd-stuff/init | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'initramfs/initrd-stuff/init') diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index ac4a5ccb..67344f93 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -64,7 +64,6 @@ export SLXVERSION="${slxconf_slxver}" # do not use dnbd cache file nodnbdcache="yes" - # mount the important standard directories [ ! -f /proc/cpuinfo ] && mount -n -t proc proc /proc [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys @@ -96,8 +95,7 @@ preinit [ -x /bin/preinit.local ] && /bin/preinit.local # start device auto discovery service - busybox (or distro specific function) -#mdev -s # enable this one -runudev #(remove that functions soon, see #129, #130 ...) +mdev -s # switch off the several configuration methods, will be switched on # according to kernel commandline settings @@ -123,6 +121,11 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ echo "** SLX init started near $(sysup)" ;; + # essid for WLAN boot (experimental, might be moved to a module component + # in later versions + essid=*) + essid==${opts#essid=} + ;; # if configuration should not be gathered by dhcp client nodhcp) nodhcp="yes" @@ -693,8 +696,8 @@ umount -n /proc/bus/usb >/dev/null 2>&1 chmod 1777 /mnt/dev/shm /mnt/tmp /mnt/tmp/scratch 2>/dev/null mount -n --move /dev /mnt/dev -# stop udevd (non-busybox udevs) and kill hwautocfg, servconfig -killall -9 udevd hwautocfg servconfig 2>/mnt/dev/null +# kill hwautocfg, servconfig +killall -9 hwautocfg servconfig 2>/mnt/dev/null # runtimer [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ echo "** SLX init ended near $(sysup)" -- cgit v1.2.3-55-g7522