Fehler beim Startskriptlinking und dhcp-client behoben

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

5 files changed, 19 insertions, 11 deletions

diff --git a/initrd/distro-specs/debian/config b/initrd/distro-specs/debian/config
index fd6233f2..a04620fd 100644
--- a/initrd/distro-specs/debian/config
+++ b/initrd/distro-specs/debian/config
@@ -26,7 +26,7 @@ SYSCONFDIR=/default
 DISETCEXCL="etc/gconf/*\n*.old\n*-\n\
 etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
 pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script\ninit.d/boot.d/*\n\
+X11/xdm/pixmaps\ndhclient.script\n\
 rc2.d/*\nrc5.d/*"
 BINDMPTS="tmp root home"
 DIRINBINDMNT="/var/run /var/log /var/tmp"
@@ -41,7 +41,7 @@ DISBINDMNT="# "
 INITDIR="/init.d"
 INITBOOTD="/rcS.d"
 RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-INITSCRIPTS="boot.udev boot.proc boot.shm boot.klog boot.loadmodules boot.clock boot.localnet boot.sysctl boot.ipconfig"
+INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
 XF86CONFFILE="/etc/X11/xorg.conf"
 XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
 DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/debian/functions-debian b/initrd/distro-specs/debian/functions-debian
index 1edb34a9..00d64832 100644
--- a/initrd/distro-specs/debian/functions-debian
+++ b/initrd/distro-specs/debian/functions-debian
@@ -26,6 +26,7 @@ local stop="$3"
 for i in rc3.d/K$stop$script rc5.d/K$stop$script \
          rc3.d/S$start$script rc5.d/S$start$script ; do
   ln -sf ../$script /mnt/etc/init.d/$i
+  echo "Linked $script"
 done
 }
 
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
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index b9f33417..e11baa2a 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -131,7 +131,7 @@ shared_object_files() {
 	    lib="${lib:1}" ;;
 	*)
 	    # Library could not be found.
-	    oops 7 "Dynamic library $lib not found"
+	    echo "Dynamic library $lib not found"
 	    continue ;;
 	esac
 
@@ -167,7 +167,7 @@ resolve_modules() {
 	    --show-depends $module 2> /dev/null \
 	    | sed -ne 's:.*insmod /\?::p' )
 	if [ -z "$module_list" ]; then
-	    oops 7 "Cannot determine dependencies of module $module." \
+	    echo "Cannot determine dependencies of module $module." \
 		"Is modules.dep up to date?"
 	fi
 	echo "$module_list"
@@ -271,7 +271,7 @@ mkdir -p ${INSTDIR}/usr/share
 mkdir -p ${INSTDIR}/etc/sysconfig
 
 # source configuration file for the distribution used
-DISTRO=suse
+DISTRO=debian
 case "${DISTRO}.${DISVER}" in
   SuSE*|suse*|Suse*|SuSe*)
 	DISTRO=suse-10.0
@@ -367,8 +367,8 @@ for lib in `shared_object_files ${INSTDIR}/bin/*` ; do
 done
 
 # add kernel modules and dependency files
-KERNVER=2.6.13-15.7-default
-#KERNVER=2.6.12-10-386
+#KERNVER=2.6.13-15.7-default
+KERNVER=2.6.12-10-386
 NWMODULES="e100 tg3 via-rhine"
 FSMODULES="nbd nfs"