Added exclusion of runlevel links to init (tar in bind mount scenario to

clean up initial_boot), see Changeset 650 too ... Minor fixes ...


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@651 95ad53e4-c205-0410-b2fa-d234c58c8868

6 files changed, 27 insertions, 31 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 6a857892..1cbae875 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -79,7 +79,7 @@ echo "
          |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
            _____/|__|    |______|__|  |__|  |_______|______|__|  |__|
 
-   Diskless Workstation (v4.1/$dstr   (c) <OpenSLX.ORG project>
+   Diskless Workstation (v4.0.6/$dstr (c) <OpenSLX.ORG project>
 ">/mnt/etc/issue
 
 #############################################################################
@@ -548,4 +548,4 @@ fi
 [ $DEBUGLEVEL -eq 8 ] && echo "** SW setup finished at $(sysup)"
 
 # servconfig finished successfully
-echo "finished" > /tmp/svcfg
+echo "servconfig finished at $(sysup)" > /tmp/svcfg
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 1bf5ffdc..8ecb5db1 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -67,19 +67,9 @@ trigger_device_events () {
 # mini udev of busybox or distro specific udev_hotplug
 runudev () {
 if [ -x /bin/mdev ] ; then
-  # simple shell daemon which runs for 100 seconds and stops if hwautocfg is
-  # completed
-  #miniudev () {
-  #  local maxwait=100
-  #  local count=0
-  #  while [ ! -e /tmp/hwcfg ] ; do
-      mdev -s
-  #    sleep 1
-  #    count=`expr $count + 1`
-  #    [ $count -gt $maxwait ] && return 0
-  #  done
-  #}
-  #miniudev &
+  mknod /dev/mem c 1 1 &>/dev/null
+  mknod /dev/zero c 1 5 &>/dev/null
+  mdev -s
 else
   udev_hotplug
 fi
@@ -402,17 +392,16 @@ case $dhcp in
   pump)
       error "$error_pump"
   ;;
-  # udhcpc is part of busybox
+  # udhcpc is part of busybox; then we expect to have mknod installed
   udhcpc)
     [ -n $vci ] && vci="-V $vci"
     testmkd /usr/share/udhcpc
+    test -c /dev/urandom || mknod /dev/urandom c 1 9 2>/dev/null
     ln -s /bin/dhcpmkconfig /usr/share/udhcpc/default.script
     udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0 2>/dev/null
   ;;
-  *)
-  ;;
 esac
-echo "dhcp finished" > /tmp/dhcp-done
+echo "dhcp finished at $(sysup)" > /tmp/dhcp-done
 }
 
 #############################################################################
@@ -903,10 +892,7 @@ esac
 # setup initial boot scripts (for most standard distributions, gentoo is to
 # be handled differently)
 initial_boot () {
-for i in ${D_RCDIRS} ${D_INITBOOTD} ; do
-  rm -f /mnt/etc/$i/*
-done
-count=10
+local count=10
 # boot.ld is a special runlevel script generated within initialramfs which
 # should be executed before the normal runlevel scripts. Proper shutdown is
 # not needed!?
diff --git a/initramfs/initrd-stuff/etc/vmware-prep b/initramfs/initrd-stuff/etc/vmware-prep
index c7d4d9da..2619db9a 100644
--- a/initramfs/initrd-stuff/etc/vmware-prep
+++ b/initramfs/initrd-stuff/etc/vmware-prep
@@ -48,4 +48,4 @@ mount -n -t msdos -o loop,umask=000 /$loopsrc/fd.img $loopdst
 
 # mount usbfs needed for vmware to detect usb devices
 grep "/proc/bus/usb" /proc/mounts >/dev/null || \
-  mount -t usbfs usbfs /proc/bus/usb
+  mount -t usbfs usbfs /proc/bus/usb 2>/dev/null
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index b29b0719..e273438c 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -482,6 +482,10 @@ elif [ -z "$COWLOOP" ] ; then
   done
   testmkd ${RWDIR}/var/tmp
   chmod a+rwxt ${RWDIR}/var/tmp >/dev/null 2>&1
+  # exclude all sysv runlevel link stuff
+  for i in ${D_RCDIRS} ${D_INITBOOTD} ; do
+    echo "*$i/*" >>/tmp/etc.exclude
+  done
   echo -e "${D_ETCEXCL} @@@COMETCEXCL@@@" >>/tmp/etc.exclude
   # if ld.so.cache is to be generated then do not copy the file
   [ -z "${NOLDSC}" ] && echo -e "ld.so.cache*" >>/tmp/etc.exclude
@@ -501,7 +505,7 @@ elif [ -z "$COWLOOP" ] ; then
 fi
 # script for stuff to execute during early bootup
 d_mkrlscript init boot.ld "Running configuration postponed from InitRamFS"
-echo "fs complete" >/tmp/fscmpl
+echo "fs complete at $(sysup)" >/tmp/fscmpl
 
 # write debug file information after filesystem setup completed
 echo -e "# /etc${D_SYSCONFDIR}/logfile - file created by $0 (initramfs \
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index db7d4241..5c0735de 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -4,7 +4,7 @@
 #               ramdisks for linux diskless clients (stage2 system
 #               setup)
 #
-# Author(s):    Dirk von Suchodoletz <dvs@OpenSLX.com>, 10-01-2007
+# Author(s):    Dirk von Suchodoletz <dvs@OpenSLX.com>, 29-01-2007
 #               Nico Dietrich
 #               Felix Endres
 #               <mj0@uni-freiburg.de> (xenbr), 09-01-2007
diff --git a/initramfs/slxmkramfs b/initramfs/slxmkramfs
index 8162f840..c3d1ec74 100755
--- a/initramfs/slxmkramfs
+++ b/initramfs/slxmkramfs
@@ -1,14 +1,20 @@
 #!/bin/bash
 #
+# (c) 2003 - 2006 - RZ Universitaet Freiburg
+# (c) 2006, 2007 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# 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
+#
 # universal (distro independent) generator for initialramfs for OpenSLX
 # linux diskless clients (part of stage2 system setup). This script is the
 # successor of mkdxsinitrd. It expects all project files to be installed. It
 # does not work directly out of repository any more.
-#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 2006, 2007
-#
-# (c) 2003 - 2006 - RZ Universitaet Freiburg
-# (c) 2006, 2007 - OpenSLX GmbH
 
 # NOTE (zooey):
 #   this whole file should be reimplemented in perl in order to