[Fai-commit] r5368 - in trunk: bin debian lib

[Thomas Lange]

Author: lange
Date: 2009-04-20 09:54:59 +0000 (Mon, 20 Apr 2009)
New Revision: 5368

Modified:
   trunk/bin/fai
   trunk/debian/changelog
   trunk/lib/subroutines
Log:
fai,subroutines: move definition of trap clean_exit into task
dirinstall

Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2009-04-20 09:48:19 UTC (rev 5367)
+++ trunk/bin/fai	2009-04-20 09:54:59 UTC (rev 5368)
@@ -292,14 +292,6 @@
     skiptask confdir
     export FAI=$FAI_CONFIGDIR
     set -a
-    clean_exit() {
-	rm -f $stamp
-	[ -z "$FAI_ROOT" ] && return
-	[ -d $FAI_ROOT/proc/self ] && umount $FAI_ROOT/proc $FAI_ROOT/sys
-	umount $FAI_ROOT/dev/pts 2>/dev/null || true
-	[ -f /etc/init.d/udev ] && umount $FAI_ROOT/dev
-    }
-    trap 'clean_exit' EXIT
 fi
 
 # remove this crap, use old thing

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-20 09:48:19 UTC (rev 5367)
+++ trunk/debian/changelog	2009-04-20 09:54:59 UTC (rev 5368)
@@ -1,4 +1,4 @@
-fai (3.2.18~beta4) unstable; urgency=low
+fai (3.2.18~beta5) unstable; urgency=low
 
   [ Thomas Lange ]
   * control: add depends on net-tools for fai-client (closes: #521027)
@@ -52,6 +52,8 @@
   * mount2dir: add commands to create /var/lock and /var/run on the
     filesystem mounted at / (closes: #464541)
   * make-fai-nfsroot.8: adjust informationen about -U (closes: #520257)
+  * fai,subroutines: move definition of trap clean_exit into task
+    dirinstall
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -121,7 +123,7 @@
     be created (i.e., it will not be preserved)
   * fai-gude.sgml: add hint how to avoid this bug (closes: #265973)
 
- -- Thomas Lange <lange at debian.org>  Fri, 17 Apr 2009 18:21:48 +0200
+ -- Thomas Lange <lange at debian.org>  Mon, 20 Apr 2009 11:54:09 +0200
 
 fai (3.2.17) unstable; urgency=medium
 

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2009-04-20 09:48:19 UTC (rev 5367)
+++ trunk/lib/subroutines	2009-04-20 09:54:59 UTC (rev 5368)
@@ -507,7 +507,17 @@
     xstamp=${FAI_ROOT//\//=}
     stamp=/var/run/fai/dirinstall-$xstamp
     unset xstamp
+    clean_exit() {
+	rm -f $stamp
+	[ -z "$FAI_ROOT" ] && return
+	[ -d $FAI_ROOT/proc/self ] && umount $FAI_ROOT/proc $FAI_ROOT/sys
+	umount $FAI_ROOT/dev/pts 2>/dev/null || true
+	[ -f /etc/init.d/udev ] && umount $FAI_ROOT/dev
+    }
+    trap 'clean_exit' INT QUIT EXIT
 
+
+
     [ -f "$stamp" ] && {
        echo -n "fai dirinstall into directory $FAI_ROOT already running or was aborted before. PID: "
        cat $stamp