Some minor bugfixes and cleanups ...

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@48 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 21 insertions, 22 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 4ba7998a..4618eeea 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,17 +4,14 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-01-2006
 #		Blabla
 #		Blub
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #
-#
-#
-
 
-# local functions
+# local functions used within hwautocfg
 displaysetup () {
 local xfc=$1
 # define some defaults
@@ -277,15 +274,15 @@ fi
 # USB core is needed for presence of /proc/bus/usb
 ( modprobe ${MODPRV} usbcore && mount -n -t usbfs usbfs /proc/bus/usb ) &
 
-#fixmee: Kernelmodul für ps-maeuse laden, da sie sonst nicht von hwsetup erkannt werden.
-if [ -f /mnt/lib/modules/${KERNEL}/kernel/drivers/input/mouse/psmouse.ko ]; then
-	( modprobe ${MODPRV} psmouse )
-fi
+#fixmee: Kernelmodul für ps-maeuse laden, da sie sonst nicht von hwsetup 
+# erkannt werden. ( -> /lib reicht, bind mounted!! )
+[ -f /lib/modules/${KERNEL}/kernel/drivers/input/mouse/psmouse.ko ] && \
+  modprobe ${MODPRV} psmouse
 
 # start the knoppix hardware autodetection tool
 ( hwsetup -v > /tmp/hwsetup.info && echo "hwsetup" > /tmp/hwrun1 ) &
 
-# ACPI configuration
+# ACPI configuration - at least not needed with SuSE 9.3/10.0
 #if [ -d /proc/acpi ]; then
 #  if ! strinstr "noacpi" ${KCMDLINE} || \
 #    ! strinstr "acpi=off" ${KCMDLINE} ; then
@@ -374,6 +371,10 @@ if strinfile "IDE" /tmp/hwsetup.info ; then
   strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} ide_disk &
   usleep 5
 fi ) &
+# cdrom/dvd und plattenkonfig. ergaenzen. Module sind hier geladen und
+# devices sind klar
+
+# fixme - psmouse entladen, falls nicht vorhanden
 
 # configure some variables from configuration file - wait for dhcp or ldap
 # confiurator to complete
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 3e558545..d5220e64 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,13 +4,13 @@
 #		for linux diskless clients (executed within initial
 #		ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 20-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-01-2006
 #		Blabla
 #		Blub
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.2a
+# Version:      0.0.2b
 
 # check for configuration files to source
 
@@ -28,7 +28,7 @@
 
 #######################################################################
 # copy distro specific scripts, programs, libraries and configs
-cp -a /etc/sysconfig/files/* /mnt > /dev/null 2&>1 & 
+cp -a /etc/sysconfig/files/* /mnt 2>/dev/null 
 
 # set greeting
 echo "
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 4b4bffb9..985253b7 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -374,7 +374,8 @@ else
 /etc/ld.so.cache file. That might cause errors\n  if libraries are installed \
 after this file was created on server." nonfatal
 fi
-# save machine configuration
+# copy machine configuration (from global settings, additions made within
+# here and from dhcp/ldap sources) to client /etc for later checks
 cp /etc/machine-setup /mnt/etc
 waitfor /tmp/hwcfg 20000 || error "  For some reason the hardware autoconfig \
 of this client did not finish in\n  time. You might check the process list \
@@ -382,14 +383,14 @@ and list the modules loaded until\n  now."
 waitfor /tmp/svcfg 20000 || error "  For some reason the software config \
 of this client did not finish in\n  time. You might check the process list \
 and list the modules loaded until\n  now."
-# IP configuration is made and should not be updated automatically
+# IP configuration is made and should not be updated automatically, udevd
+# should be killed if started within init
 killall -9 dhcpcd dhclient pump udevd 2>/dev/null
 # unmount the bind mounted modules directory
 umount -n /lib/modules/${KERNEL} || error "Unmount of the kernel \
 modules directory failed for some reason."
 # close runlevel script for stuff to execute during early bootup
 d_mkbootld close
-
 # check for inittab file
 test -f /mnt/etc/inittab || error "  The file /etc/inittab does not exist or \
 is no regular one. It is needed\n  for the bootup procedure to follow."
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 30230c69..c3679b6b 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,7 +3,7 @@
 # Description:  universal (distro independent) generator for initial
 #		ramdisks for linux diskless clients 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-01-2006
 #		Nico Dietrich
 #		Blub
 #
@@ -102,13 +102,11 @@ else
 fi
 }
 
-
-
 # Resolve dynamic library dependencies. Returns a list of symbolic links
 # to shared objects and shared object files for the binaries in $*.
 # stolen from SuSE mkinitrd
 shared_object_files() {
-    local LDD CHROOT initrd_libs lib_files lib_links lib link
+    local LDD initrd_libs lib_files lib_links lib link
 
     LDD=`which ldd`
     if [ ! -x $LDD ]; then
@@ -191,6 +189,7 @@ copy_distro_stuff() {
   # now insert the current stuff
   cat distro-specs/$1/config-$2 >>${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/functions-$2 >>${INSTDIR}/etc/distro-functions
+  # would be cool not to copy .svn here ...
   cp -a distro-specs/$1/files-$2 ${INSTDIR}/etc/sysconfig/files 2>/dev/null
 }
 
@@ -407,8 +406,6 @@ mkdir -p ${INSTDIR}/var/lib/nfs/state
 # if nbd
 # cobi nbd-client bin
 
-#if nfs - dann modul suchen, kopieren 
-
 # distro specific additional stuff
 case "${DISTRO}" in 
   debian*)