[Fai-commit] r2983 - trunk/scripts

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-03 22:03:36 +0000 (Thu, 03 Nov 2005)
New Revision: 2983

Modified:
   trunk/scripts/make-fai-nfsroot
Log:
create /.THIS_IS_THE_FAI_NFSROOT file so preinst can detect if inside
our nfsroot, divert start-stop-daemon, copy fai-start-stop-daemon into nfsroot


Modified: trunk/scripts/make-fai-nfsroot
===================================================================
--- trunk/scripts/make-fai-nfsroot	2005-11-03 22:01:14 UTC (rev 2982)
+++ trunk/scripts/make-fai-nfsroot	2005-11-03 22:03:36 UTC (rev 2983)
@@ -211,6 +211,7 @@
     echo "Creating nfsroot for $1 using debootstrap"
     [ "$verbose" ] && echo "Calling debootstrap $1 $NFSROOT $2"
     yes '' | LC_ALL=C call_verbose debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2 || true
+    touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 create_base() {
@@ -334,7 +335,8 @@
     rm -rf $NFSROOT/etc/apm
     mount -t proc /proc $NFSROOT/proc
 
-    fdivert /sbin/discover-modprobe
+    fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
+    cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
     $ROOTCMD apt-get -y dist-upgrade
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -