[Fai-commit] r4517 - in trunk: . debian lib

[lange at alioth.debian.org]

Author: lange
Date: 2007-08-21 09:56:06 +0000 (Tue, 21 Aug 2007)
New Revision: 4517

Added:
   trunk/lib/fai-abort
Removed:
   trunk/lib/S01fai-abort
Modified:
   trunk/Makefile
   trunk/debian/fai-nfsroot.dirs
   trunk/debian/fai-nfsroot.install
   trunk/debian/fai-nfsroot.postinst
   trunk/debian/fai-nfsroot.postrm
Log:
make S01fai-abort an init.d script


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/Makefile	2007-08-21 09:56:06 UTC (rev 4517)
@@ -26,7 +26,7 @@
 install: 
 	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
-	mkdir -p $(DESTDIR)/etc/rc2.d
+	mkdir -p $(DESTDIR)/etc/init.d
 	install man/* $(DESTDIR)/man
 	$(MAKE) -C doc install
 	-install $(libfiles) $(LIBDIR)
@@ -41,7 +41,7 @@
 	install -m644 conf/sources.list $(DESTDIR)/etc/fai/apt/
 	install -m644 conf/NFSROOT $(DESTDIR)/etc/fai
 	install -m644 conf/fai_modules_off $(DESTDIR)/etc/modutils
-	install -m755 lib/S01fai-abort $(DESTDIR)/etc/rc2.d
+	install -m755 lib/fai-abort $(DESTDIR)/etc/init.d
 	perl -pi -e 's/_KERNELVERSION_/$(KERNELVERSION)/' $(KVERSION_FILES)
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
 	cp -a examples $(DOCDIR)

Modified: trunk/debian/fai-nfsroot.dirs
===================================================================
--- trunk/debian/fai-nfsroot.dirs	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/debian/fai-nfsroot.dirs	2007-08-21 09:56:06 UTC (rev 4517)
@@ -1,5 +1,5 @@
 etc/fai
 etc/dhcp3
-etc/rc2.d
+etc/init.d
 etc/apt/apt.conf.d
 usr/lib/fai

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/debian/fai-nfsroot.install	2007-08-21 09:56:06 UTC (rev 4517)
@@ -6,9 +6,8 @@
 usr/lib/fai/fai-mount-disk
 usr/lib/fai/mount2dir
 usr/lib/fai/task_sysinfo
-usr/lib/fai/mkrw
 etc/dhcp3/dhclient-fai-script
 etc/dhcp3/dhclient-fai.conf
 etc/apt/apt.conf.d/90fai
-etc/rc2.d/S01fai-abort
+etc/init.d/fai-abort
 etc/modutils/fai_modules_off

Modified: trunk/debian/fai-nfsroot.postinst
===================================================================
--- trunk/debian/fai-nfsroot.postinst	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/debian/fai-nfsroot.postinst	2007-08-21 09:56:06 UTC (rev 4517)
@@ -4,6 +4,7 @@
     configure)
 	update-alternatives --install /usr/sbin/policy-rc.d policy-rc.d \
 	    /usr/bin/policy-rc.d.fai 100
+    update-rc.d fai-abort start 01 2 >/dev/null
 esac
 
 #DEBHELPER#

Modified: trunk/debian/fai-nfsroot.postrm
===================================================================
--- trunk/debian/fai-nfsroot.postrm	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/debian/fai-nfsroot.postrm	2007-08-21 09:56:06 UTC (rev 4517)
@@ -1,10 +1,16 @@
 #!/bin/sh -e
 
-if [ remove = "$1" ]; then
-    rm /etc/init.d/rcS
-    dpkg-divert --package fai-nfsroot --remove --rename /etc/init.d/rcS
-fi
+case "$1" in
+    remove)
+	rm /etc/init.d/rcS
+	dpkg-divert --package fai-nfsroot --remove --rename /etc/init.d/rcS
+	;;
 
+    purge)
+	update-rc.d fai-abort remove > /dev/null
+	;;
+esac
+
 #DEBHELPER#
 
 exit 0

Deleted: trunk/lib/S01fai-abort
===================================================================
--- trunk/lib/S01fai-abort	2007-08-21 08:17:49 UTC (rev 4516)
+++ trunk/lib/S01fai-abort	2007-08-21 09:56:06 UTC (rev 4517)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-echo FAI: installation aborted.
-echo reboot with: faireboot
-echo or after a logout
-sh
-cd /
-umount -ar
-reboot -dfi

Copied: trunk/lib/fai-abort (from rev 4448, trunk/lib/S01fai-abort)
===================================================================
--- trunk/lib/fai-abort	                        (rev 0)
+++ trunk/lib/fai-abort	2007-08-21 09:56:06 UTC (rev 4517)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case "$1" in
+    start) ;;
+    stop) ;;
+    restart) ;;
+    force-reload) ;;
+esac
+
+echo FAI: installation aborted.
+echo reboot with: faireboot
+echo or after a logout
+sh
+cd /
+umount -ar
+reboot -dfi