[Fai-commit] r2981 - trunk/debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-03 21:58:57 +0000 (Thu, 03 Nov 2005)
New Revision: 2981

Modified:
   trunk/debian/fai-nfsroot.install
   trunk/debian/fai-nfsroot.postrm
   trunk/debian/fai-nfsroot.preinst
   trunk/debian/fai-server.install
Log:
move start-stop-daemon from fai-nfsroot to fai-start-stop-daemon in
fai-server, check if fai-nfsroot will be installed inside the FAI nfsroot


Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2005-11-03 21:06:19 UTC (rev 2980)
+++ trunk/debian/fai-nfsroot.install	2005-11-03 21:58:57 UTC (rev 2981)
@@ -1,5 +1,4 @@
 usr/sbin/faireboot
-sbin/start-stop-daemon
 usr/lib/fai/create_ramdisk
 usr/lib/fai/create_resolv_conf
 usr/lib/fai/load_keymap_consolechars

Modified: trunk/debian/fai-nfsroot.postrm
===================================================================
--- trunk/debian/fai-nfsroot.postrm	2005-11-03 21:06:19 UTC (rev 2980)
+++ trunk/debian/fai-nfsroot.postrm	2005-11-03 21:58:57 UTC (rev 2981)
@@ -4,7 +4,6 @@
     dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient-script
     dpkg-divert --package fai-nfsroot --remove --rename /etc/dhcp3/dhclient.conf
     dpkg-divert --package fai-nfsroot --remove --rename /etc/init.d/rcS
-    dpkg-divert --package fai-nfsroot --remove --rename /sbin/start-stop-daemon
 fi
 
 #DEBHELPER#

Modified: trunk/debian/fai-nfsroot.preinst
===================================================================
--- trunk/debian/fai-nfsroot.preinst	2005-11-03 21:06:19 UTC (rev 2980)
+++ trunk/debian/fai-nfsroot.preinst	2005-11-03 21:58:57 UTC (rev 2981)
@@ -1,9 +1,13 @@
 #!/bin/sh -e
 
+if [ -f /.THIS_IS_THE_FAI_NFSROOT ];then
+    echo "I'm only installable in a FAI nfsroot."
+    exit 1
+fi
+
 dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient-script
 dpkg-divert --package fai-nfsroot --add --rename /etc/dhcp3/dhclient.conf
 dpkg-divert --package fai-nfsroot --add --rename /etc/init.d/rcS
-dpkg-divert --package fai-nfsroot --add --rename /sbin/start-stop-daemon
 
 #DEBHELPER#
 

Modified: trunk/debian/fai-server.install
===================================================================
--- trunk/debian/fai-server.install	2005-11-03 21:06:19 UTC (rev 2980)
+++ trunk/debian/fai-server.install	2005-11-03 21:58:57 UTC (rev 2981)
@@ -1,3 +1,4 @@
+sbin/fai-start-stop-daemon
 usr/sbin/fai-cd
 usr/sbin/fai-chboot
 usr/sbin/fai-setup