From bc6a3d6a230c542588732d09cc38bddfb2fbd8e4 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sat, 23 Aug 2008 23:55:21 +0000
Subject: Several fixes, improvements: * clean the nfs mounted /tmp (Detlef
 pointed out several   problems here) * kill the debug shell if started in
 stage3, closes #261 * small fix on config_nis in suse/functions-default *
 mount /var/cache/fontconfig in SuSE10.2 too (speeds up   gdm start)

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2089 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/init | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'initramfs/stage3-stuff/init')

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 87e11ccb..4fe62596 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -143,8 +143,11 @@ in $0\ncountry=\"${COUNTRY}\"" >>/etc/initramfs-setup
       if [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] ; then
         echo "** SLX init started near $(sysup)"
       elif [ $DEBUGLEVEL -ge 3 -a $DEBUGLEVEL -le 20 ] ; then
+        # create, start a debug shell process
         echo "Debug shell started on second console (tty2)"
-        getty -i -n -l /bin/ash 38400 tty2 &
+        echo -e "#!/bin/ash\nash" >/bin/debugshell
+        chmod u+x /bin/debugshell
+        getty -i -n -l /bin/debugshell 38400 tty2 &
       fi
     ;;
     # essid for WLAN boot (experimental, might be moved to a module component
@@ -874,12 +877,16 @@ postinit
 
 runinithook '90-postinit-done'
 
-# unmount the bind mounted modules directory
+# unmount the bind mounted modules directory and nfs /tmp/scratch (if present)
 export ticks
 for ticks in 0 1 2 5 10 20 30; do
   sleep $ticks && umount -n /lib/modules/${KERNEL} 2>/dev/null && break
   error "$init_wait" nonfatal
 done
+mount 2>/dev/null | grep -q "/tmp/scratch type nfs" && \
+  for ticks in 0 1 2 5 10 20 30; do
+    sleep $ticks && umount -n /tmp/scratch 2>/dev/null && break
+  done
 
 mount 2>/dev/null | grep -q /lib/modules/${KERNEL} && error "$init_errumnt"
 # check for inittab file (might fail for new style init -> upstart)
@@ -892,13 +899,13 @@ sed -n "s,/mnt,,;/\/tmp /p" /proc/mounts >> /mnt/etc/mtab
 # preparations to leave initramfs - umounting ...
 umount -n /sys || error "$init_errsys" nonfatal
 umount -n /proc/bus/usb >/dev/null 2>&1
-chmod 1777 /mnt/dev/shm /mnt/tmp /mnt/tmp/scratch 2>/dev/null
+chmod 1777 /mnt/dev/shm /mnt/tmp 2>/dev/null
 mount -n --move /dev /mnt/dev
 
 runinithook '95-cleanup'
 
 # kill hwautocfg, servconfig
-killall -9 hwautocfg servconfig 2>/mnt/dev/null
+killall -9 hwautocfg servconfig debugshell 2>/mnt/dev/null
 # runtimer
 [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
   echo "** SLX init ended near $(sysup)"
-- 
cgit v1.2.3-55-g7522