diff options
author | Dirk von Suchodoletz | 2007-05-11 01:00:29 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-05-11 01:00:29 +0200 |
commit | 2a896ef06c5fdefad689bf81b2588b3a26537cc0 (patch) | |
tree | 827ab4a0e40ee79f33edef2c7552e16a2cf2a819 | |
parent | Switched to much more flexible disk formatting for /tmp (starting with (diff) | |
download | core-2a896ef06c5fdefad689bf81b2588b3a26537cc0.tar.gz core-2a896ef06c5fdefad689bf81b2588b3a26537cc0.tar.xz core-2a896ef06c5fdefad689bf81b2588b3a26537cc0.zip |
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
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.0 | 32 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-9.3 | 9 | ||||
-rw-r--r-- | initramfs/initrd-stuff/etc/functions | 44 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/init | 13 | ||||
-rwxr-xr-x | initramfs/mkdxsinitrd | 13 |
5 files changed, 26 insertions, 85 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.0 b/initramfs/distro-specs/suse/functions-10.0 index 7151c9c0..a33fe426 100644 --- a/initramfs/distro-specs/suse/functions-10.0 +++ b/initramfs/distro-specs/suse/functions-10.0 @@ -1,26 +1,18 @@ -# OpenSLX configuration functions for SuSE 10.0 which differ from functions -# defined in general SuSE base settings ... General changes should be done -# there, version specific changes for the 10.0 here. +# Copyright (c) 2003 - 2006 - RZ Uni Freiburg +# Copyright (c) 2006, 2007 - OpenSLX GmbH # -# Dirk von Suchodoletz <dvs@openslx.com>, 28-10-2006 +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING # -# (c) 2006 - RZ Universitaet Freiburg -# (c) 2006 - OpenSLX.ORG Project +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found under http://openslx.org +# +# Configuration functions for SuSE 10.0 which differ from functions defined +# in general SuSE base definitions ... General changes should be done there, +# version specific changes for the version 10.0 go here. -# udev service -udev_hotplug () { -local result=0 -echo "Starting udev" -udevstart || result=1 -if [ -x /bin/udevd ] ; then - export UDEVD_EXPECTED_SEQNUM=$(cat /sys/kernel/hotplug_seqnum) - export UDEVD_EVENT_TIMEOUT=1 - echo "" > /proc/sys/kernel/hotplug - udevd --daemon || result=1 -else error "$df_errudev" nonfatal -fi -return $result -} # prepare virtual machine environment (vmware, vmplayer) config_vmware () { diff --git a/initramfs/distro-specs/suse/functions-9.3 b/initramfs/distro-specs/suse/functions-9.3 index efd88b35..89e13033 100644 --- a/initramfs/distro-specs/suse/functions-9.3 +++ b/initramfs/distro-specs/suse/functions-9.3 @@ -13,15 +13,6 @@ # in general SuSE base definitions ... General changes should be done there, # version specific changes for the 9.3 go here. -# udev/hotplug - auto device discovery service (deprecated) -udev_hotplug () { -local result=0 -[ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal -udevstart || result=1 -udevd -d || result=1 -return $result -} - # acpi and powersave config_acpi () { rllinker powersaved "10" "12" diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 39920e5d..58bb9b0e 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -29,50 +29,6 @@ postinit () { config_distro () { : } -# udev/hotplug - auto device discovery service (deprecated) -udev_hotplug () { -: -} - -############################################################################# -# generate events with the sysfs trigger (most probably obsolete) -trigger_device_events () { - local list=$(echo /sys/bus/*/devices/*/uevent) - list="$list $(echo /sys/class/*/*/uevent)" - list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)" - for i in $list; do - case "$i" in - */device/uevent|*\**) - continue - ;; - */class/mem/*|*/class/tty/*) - first="$first $i" - ;; - */block/md*) - last="$last $i" - ;; - */*) - default="$default $i" - ;; - esac - done - # trigger the sorted events - for i in $first $default $last; do - echo "add" > "$i" - done -} - -############################################################################# -# mini udev of busybox (most probably obsolete: or distro specific -# udev_hotplug) -runudev () { -if [ -x /bin/mdev ] ; then - mdev -s -else - udev_hotplug -fi -echo "Started udev" -} ############################################################################# # produce error message and if $2 is empty run (debug) shell 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)" diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 2f68a3a0..e722a378 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -88,8 +88,8 @@ usage() echo " -S name of the system for which the initramfs is built" echo " -s theme (for splash)" echo " -t tpm support (client security)" - echo " -w include (list of) WLAN driver modules. WLAN specific tools are" - echo " added to the initramfs" + echo " -w enable WLAN support. Put WLAN kernel drivers to the network module" + echo " list" exit 0 } @@ -310,7 +310,7 @@ cp -a ${themes}* ${INSTDIR}/usr/share/themes ######################################################################### # End of function declaration -while getopts :dhk:c:i:r:o:s:f:n:m:S:tu:w:I:a: a ; do +while getopts :dhk:c:i:r:o:s:f:n:m:S:tu:wI:a: a ; do case $a in \:|\?) case $OPTARG in @@ -325,7 +325,6 @@ while getopts :dhk:c:i:r:o:s:f:n:m:S:tu:w:I:a: a ; do I) echo "-I requires network interface parameter";; S) echo "-S requires the system name";; V) echo "-V requires an executable to run inside linuxrc";; - w) echo "-w requires WLAN module (list) parameter";; *) echo "Unknown option: -$OPTARG" echo "Try mkinitrd -h";; esac @@ -338,11 +337,11 @@ while getopts :dhk:c:i:r:o:s:f:n:m:S:tu:w:I:a: a ; do f) FSMODULES=$OPTARG;; n) NWMODULES=$OPTARG;; m) MISCMODULES=$OPTARG;; - w) WLANMODULES=$OPTARG;; r) ROOTDIR=$OPTARG;; s) theme=$OPTARG;; S) SYSTEM_NAME=$OPTARG;; t) use_tpm=1;; + w) enable_wlan=1;; d) IRFSDEBUG=$OPTARG;; l) local_init_script="$OPTARG";; # use for pre/postinit.local? h) usage;; @@ -474,7 +473,7 @@ done fi # if wlan should be supported in stage3 -if [ -n "${WLANMODULES}" ] ; then +if [ -n "${enable_wlan}" ] ; then cobi iwconfig bin fi @@ -544,7 +543,7 @@ fi # put all needed modules into initial ramdisk mkdir -p ${INSTDIR}/lib/modules/${KERNVER} for module in af_packet unix ${NWMODULES} ${FSMODULES} ${MISCMODULES} \ - ${WLANMODULES} ${DEBUGMODULES} usbcore usbhid uhci-hcd ohci-hcd; do + ${DEBUGMODULES} usbcore usbhid uhci-hcd ohci-hcd; do mod=$(cd /${ROOTDIR}; find "lib/modules/${KERNVER}" -name ${module}.ko \ 2>/dev/null) |