Libraryabhängigkeiten für nfs und kleinere Bugfixes

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

2 files changed, 13 insertions, 5 deletions

diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 48a9f144..a81bbcb1 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -377,8 +377,7 @@ 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."
-date
-#bash
+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
@@ -400,6 +399,7 @@ umount -n /proc
 [ -n "${UNIONFS}" ] && mount -n --move /root /mnt/mnt 
 pivot_root . mnt || error "  Could not execute pivot_root due to missing \
 command or wrong\n  parameters given."
+echo "Exiting the initial ramdisk init"
 exec `which chroot` . sh -c 'rm -rf mnt/*; exec /sbin/init' \
   <dev/console >dev/console 2>&1
 
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index abe0ff13..04f10eef 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -54,7 +54,7 @@ binfinder()
 {
   local PROGRAM="$1"
   local RET=1
-  for ELEMENT in sbin bin usr/bin usr/local/bin usr/bin/X11; do
+  for ELEMENT in sbin bin usr/bin usr/sbin usr/local/bin usr/bin/X11; do
     if [ -f "${ROOTDIR}/$ELEMENT/$PROGRAM" ] && [ -x "${ROOTDIR}/$ELEMENT/$PROGRAM" ]; then
       printf '%s\n' "${ROOTDIR}/$ELEMENT/$PROGRAM"
       RET=0
@@ -296,9 +296,9 @@ if [ -z "${DISTRO}" ] ; then
   if [ -e ${ROOTDIR}/etc/SuSE-release ] ; then
     DISTRO=suse
     DISTRO_VER=`grep "VERSION" ${ROOTDIR}/etc/SuSE-release | sed "s/.*= //"`
-  elif [ -e ${ROOTDIR}/etc/debian-version ] ; then
+  elif [ -e ${ROOTDIR}/etc/debian_version ] ; then
     DISTRO=debian
-    DISTRO_VER=`cat ${ROOTDIR}/etc/debian-version`
+    DISTRO_VER=`cat ${ROOTDIR}/etc/debian_version`
   fi
 fi
 
@@ -459,6 +459,14 @@ for module in af_packet ${NWMODULES} ${FSMODULES}; do
         cp ${ROOTDIR}/lib/modules/${KERNVER}/kernel/drivers/net/mii.ko \
           ${INSTDIR}/lib/modules/${KERNVER}/kernel/drivers/net &>/dev/null
       ;;
+      nfs)
+	mkdir -p ${INSTDIR}/lib/modules/${KERNVER}/kernel/net/sunrpc/
+	mkdir -p ${INSTDIR}/lib/modules/${KERNVER}/kernel/fs/lockd
+        cp ${ROOTDIR}/lib/modules/${KERNVER}/kernel/net/sunrpc/sunrpc.ko \
+	 ${INSTDIR}/lib/modules/${KERNVER}/kernel/net/sunrpc/ # &>/dev/null
+	cp ${ROOTDIR}/lib/modules/${KERNVER}/kernel/fs/lockd/lockd.ko \
+         ${INSTDIR}/lib/modules/${KERNVER}/kernel/fs/lockd #&>/dev/null
+      ;;
     esac
   fi
 done