Fehler beim Startskriptlinking und dhcp-client behoben

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

2 files changed, 11 insertions, 4 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 55827289..0a3a39a7 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -86,6 +86,11 @@ 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 ${RCDIRS} ${INITBOOTD} ; do
       rm -f /mnt/etc/$i/*
@@ -94,8 +99,8 @@ case ${DISTRO} in
     for i in ${INITSCRIPTS}; do 
       count=`expr $count + 1`
       revcnt=`expr 41 - $count`
-      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/boot.d/S${count}$i
-      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/boot.d/K${revcnt}$i
+      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}S${count}$i
+      ln -sf /etc${INITDIR}/$i /mnt/etc/init.d/${SUSESPECIFICSUBDIR}K${revcnt}$i
     done
   ;;
   gentoo*)
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index a392f173..e6e957c7 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -32,7 +32,7 @@ if [ -x /bin/udev -a -x /bin/udevstart ] ; then
 #  else
     echo "/bin/udev" > /proc/sys/kernel/hotplug
 #  fi
-  /bin/udevstart &
+  /bin/udevstart 
 elif [ -x /bin/hotplug ] ; then
   echo "Enabling hotplug"
   echo "/bin/hotplug" > /proc/sys/kernel/hotplug
@@ -165,6 +165,8 @@ else
 fi
 # get configuration data via dhcp (with vendor code identifier if present in 
 # ${VCI} or ldap if available (in background)
+echo "dhcp:!:13117:0:99999:7:::" > /etc/passwd
+echo "dhcp:x:101:" > /etc/group
 [ -n "$DHCP" ] && rundhcp ${VCI} &
 if [ -n "$noipyet" ] ; then
   waitfor /tmp/dhcp-done 20000
@@ -342,7 +344,7 @@ 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."
 date
-#ash
+bash
 # IP configuration is made and should not be updated automatically
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory