Heftiges Bugfixing in mkdxsinitrd ... intensiv gecheckt mit SuSE 10.0 -

wieder funktionsfähig.



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

2 files changed, 7 insertions, 11 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 8630dfb3..e19f533a 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -369,7 +369,8 @@ data via dhcp until now ..." nonfatal
 waitfor /tmp/ldap-done 10000 || error "  Did not get any configuration \
 data via ldap until now ..." nonfatal
 . /etc/machine-setup
-waitfor /tmp/fscmpl 20000
+# wait for completion of clients root filesystem in /mnt
+waitfor /tmp/fscmpl 40000
 # run localizator and configure keyboard and console fonts
 DEFKEYTABLE="de-latin1-nodeadkeys"
 localization $country
@@ -378,9 +379,9 @@ if [ -z "${KEYTABLE}" ] ; then
 '${DEFKEYTABLE}' defined\nin $0."
   KEYTABLE=${DEFKEYTABLE}
 fi
-echo -e "# entry added by $0: $date" \
+echo -e "\t# entry added by $0: $date" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
-echo -e "loadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+echo -e "\tloadkeys -q ${KEYTABLE}\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 [ -n "${CONSOLE_FONT}" ] && consolefont
 # run X11 / Xorg configurator
 . /etc/sysconfig/xserver >/dev/null 2>&1 || error "  The xserver \
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index bff7518e..5f782bc5 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -10,7 +10,7 @@
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.0.1b
+# Version:      0.0.2a
 
 # check for configuration files to source
 
@@ -89,11 +89,6 @@ test -n "$domain_name_servers" && {
 # delete and create runlevel links for initial booting (SuSE, Debian,
 # ...)
 case ${DISTRO} in
-  suse*)
-    ${SUSESPECIFICSUBDIR} = "boot.d/"
-  ;;
-esac
-case ${DISTRO} in
   suse*|debian*|ubuntu*)
     for i in ${D_RCDIRS} ${D_INITBOOTD} ; do
       rm -f /mnt/etc/$i/*
@@ -104,8 +99,8 @@ case ${DISTRO} in
     for i in boot.ld ${D_INITSCRIPTS}; do 
       count=`expr $count + 1`
       revcnt=`expr 41 - $count`
-      ln -sf /etc${D_INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}S${count}$i
-      ln -sf /etc${D_INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}K${revcnt}$i
+      ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/S${count}$i
+      ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/K${revcnt}$i
     done
   ;;
   gentoo*)