[Fai-commit] r4448 - in trunk: . bin debian lib

[lange at alioth.debian.org]

Author: lange
Date: 2007-07-16 16:59:47 +0000 (Mon, 16 Jul 2007)
New Revision: 4448

Added:
   trunk/lib/S01fai-abort
Modified:
   trunk/Makefile
   trunk/bin/make-fai-nfsroot
   trunk/debian/fai-nfsroot.dirs
   trunk/debian/fai-nfsroot.install
Log:
do not create shell script in make-fai-nfsroot, new script called S01fai-abort 


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-07-16 16:44:04 UTC (rev 4447)
+++ trunk/Makefile	2007-07-16 16:59:47 UTC (rev 4448)
@@ -8,7 +8,7 @@
 
 USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl
 
-libfiles=$(wildcard lib/[a-z]*)  # do not include CVS dir
+libfiles=$(wildcard lib/[a-z]*)  # do not include .svn dir and S01
 
 # files with variable KERNLEVERSION in it; this string will be substituted
 KVERSION_FILES =  $(DESTDIR)/etc/fai/make-fai-nfsroot.conf
@@ -26,6 +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
 	install man/* $(DESTDIR)/man
 	$(MAKE) -C doc install
 	-install $(libfiles) $(LIBDIR)
@@ -40,6 +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
 	perl -pi -e 's/_KERNELVERSION_/$(KERNELVERSION)/' $(KVERSION_FILES)
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
 	cp -a examples $(DOCDIR)

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-07-16 16:44:04 UTC (rev 4447)
+++ trunk/bin/make-fai-nfsroot	2007-07-16 16:59:47 UTC (rev 4448)
@@ -293,19 +293,6 @@
 EOF
 
     call_verbose call_with_stamp setup_ssh
-
-    cat >$NFSROOT/etc/rc2.d/S01fai_abort <<-EOF
-        #!/bin/sh
-        echo FAI: installation aborted.
-        echo reboot with: faireboot
-        echo or after a logout
-        sh
-        cd /
-        umount -ar
-        reboot -dfi
-EOF
-    chmod a+rx $NFSROOT/etc/rc2.d/S01fai_abort
-
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 upgrade_nfsroot() {

Modified: trunk/debian/fai-nfsroot.dirs
===================================================================
--- trunk/debian/fai-nfsroot.dirs	2007-07-16 16:44:04 UTC (rev 4447)
+++ trunk/debian/fai-nfsroot.dirs	2007-07-16 16:59:47 UTC (rev 4448)
@@ -1,4 +1,5 @@
 etc/fai
 etc/dhcp3
+etc/rc2.d
 etc/apt/apt.conf.d
 usr/lib/fai

Modified: trunk/debian/fai-nfsroot.install
===================================================================
--- trunk/debian/fai-nfsroot.install	2007-07-16 16:44:04 UTC (rev 4447)
+++ trunk/debian/fai-nfsroot.install	2007-07-16 16:59:47 UTC (rev 4448)
@@ -10,4 +10,5 @@
 etc/dhcp3/dhclient-fai-script
 etc/dhcp3/dhclient-fai.conf
 etc/apt/apt.conf.d/90fai
+etc/rc2.d/S01fai-abort
 etc/modutils/fai_modules_off

Added: trunk/lib/S01fai-abort
===================================================================
--- trunk/lib/S01fai-abort	                        (rev 0)
+++ trunk/lib/S01fai-abort	2007-07-16 16:59:47 UTC (rev 4448)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo FAI: installation aborted.
+echo reboot with: faireboot
+echo or after a logout
+sh
+cd /
+umount -ar
+reboot -dfi