[Fai-commit] r3988 - in trunk: bin lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-09-20 13:26:04 +0000 (Wed, 20 Sep 2006)
New Revision: 3988

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/lib/updatebase
Log:
fix fai-start-stop daemon problem


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2006-09-20 10:20:38 UTC (rev 3987)
+++ trunk/bin/make-fai-nfsroot	2006-09-20 13:26:04 UTC (rev 3988)
@@ -310,6 +310,7 @@
     mount -t proc /proc $NFSROOT/proc
 
     fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
+    cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin
     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
     $ROOTCMD apt-get -y dist-upgrade
 }

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2006-09-20 10:20:38 UTC (rev 3987)
+++ trunk/lib/updatebase	2006-09-20 13:26:04 UTC (rev 3988)
@@ -14,7 +14,7 @@
     # fake some more programs
     fai-divert -a /etc/init.d/nis /sbin/start-stop-daemon /usr/sbin/policy-rc.d
     # this will not work during dirinst
-    cp /sbin/start-stop-daemon $FAI_ROOT/sbin/start-stop-daemon
+    cp /sbin/fai-start-stop-daemon $FAI_ROOT/sbin/start-stop-daemon
     # never start any daemons inside chroot during installtion
     cat > $FAI_ROOT/usr/sbin/policy-rc.d <<EOF
 #!/bin/sh