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

[Thomas Lange]

Author: lange
Date: 2010-01-18 10:44:04 +0000 (Mon, 18 Jan 2010)
New Revision: 5698

Modified:
   trunk/bin/fai-debconf
   trunk/debian/changelog
   trunk/lib/updatebase
Log:
lib/updatebase, fai-debconf: exit if mktemp fails, for e.g. when
TMPDIR is set to nonexisting directory (Thanks to Michael Prokop for
the hint)

Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2010-01-15 11:27:35 UTC (rev 5697)
+++ trunk/bin/fai-debconf	2010-01-18 10:44:04 UTC (rev 5698)
@@ -5,7 +5,7 @@
 # fai-debconf - set debconf values using classes
 #
 # This script is part of FAI (Fully Automatic Installation)
-# (c) 2005-2006 by Thomas Lange, lange at informatik.uni-koeln.de
+# (c) 2005-2010 by Thomas Lange, lange at informatik.uni-koeln.de
 # Universitaet zu Koeln
 #
 #*********************************************************************
@@ -26,7 +26,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.3, 8-september-2006"
+version="version 1.3.1, 18-january-2010"
 
 # variables needed: $classes, $ROOTCMD, $LOGDIR, $target
     
@@ -69,7 +69,7 @@
      fi
      packages=$(awk '{print $1}' $LOGDIR/debconf.data | sort | uniq)
      # backup database
-     tmpdb=$($ROOTCMD mktemp -t fai-debconf.XXXXXXXXXX)
+     tmpdb=$($ROOTCMD mktemp -t fai-debconf.XXXXXXXXXX) || exit 10
      $ROOTCMD debconf-copydb configdb faidb --config=Name:faidb --config=Driver:File --config=Filename:$tmpdb
      for p in $packages; do
 	 # test if package is installed

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-15 11:27:35 UTC (rev 5697)
+++ trunk/debian/changelog	2010-01-18 10:44:04 UTC (rev 5698)
@@ -7,6 +7,9 @@
     modified version of mkrw from FAI 3.1.8.
   * upstart.conf: fix timing issue (thanks to Waldemar Brodkorb for the
     patch)
+  * lib/updatebase, fai-debconf: exit if mktemp fails, for e.g. when
+    TMPDIR is set to nonexisting directory (Thanks to Michael Prokop for
+    the hint)
   
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.2
@@ -23,7 +26,7 @@
   * disk-info, setup-storage/Init.pm: Also accept Xen's xvd[a-t] as valid disk
     name (thanks Rudy Gevaert for the patch). (closes: #561489)
 
- -- Thomas Lange <lange at debian.org>  Fri, 15 Jan 2010 12:27:11 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 18 Jan 2010 11:43:53 +0100
 
 fai (3.3.2) unstable; urgency=low
 

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2010-01-15 11:27:35 UTC (rev 5697)
+++ trunk/lib/updatebase	2010-01-18 10:44:04 UTC (rev 5698)
@@ -41,7 +41,7 @@
 
 $ROOTCMD aptitude $aptopt -f -y dist-upgrade </dev/null
 # update dpkg info which packages are available
-tmp=$($ROOTCMD mktemp)
+tmp=$($ROOTCMD mktemp) || exit 88
 $ROOTCMD apt-cache dumpavail > $FAI_ROOT/$tmp
 $ROOTCMD dpkg --update-avail $tmp
 rm -f $FAI_ROOT/$tmp