[Fai-commit] r5870 - in trunk: bin debian

[Thomas Lange]

Author: lange
Date: 2010-07-26 21:42:34 +0000 (Mon, 26 Jul 2010)
New Revision: 5870

Modified:
   trunk/bin/fai-debconf
   trunk/debian/changelog
Log:
fai-debconf: exit 0 all the time, change comment

Modified: trunk/bin/fai-debconf
===================================================================
--- trunk/bin/fai-debconf	2010-07-26 20:10:19 UTC (rev 5869)
+++ trunk/bin/fai-debconf	2010-07-26 21:42:34 UTC (rev 5870)
@@ -27,7 +27,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #*********************************************************************
 
-version="version 1.3.2, 18-january-2010"
+version="version 1.3.3, 18-january-2010"
 
 # variables needed: $classes, $ROOTCMD, $LOGDIR, $target
     
@@ -91,7 +91,6 @@
     local ex=$1
     cat <<-EOF
     fai-debconf $version. Copyright (C) 2005-2010 Thomas Lange
-    Report bugs to <fai at informatik.uni-koeln.de>.
 
     Usage: fai-debconf [OPTION] DIRECTORY
 EOF
@@ -112,7 +111,7 @@
 done
 shift $(($OPTIND - 1))
 [ -z "$1" ] || [ -n "$2" ] && usage 1
-debconfdir=$1 # will be /fai/debconf
+debconfdir=$1 # will be $FAI/debconf
 
 if [ "x$classes" = "x" ]; then
     echo "No classes are defined."
@@ -122,3 +121,4 @@
 [ $forcereconf -eq 0 -a -x $target/usr/bin/debconf-get-selections ] && $ROOTCMD debconf-get-selections > $LOGDIR/debconf.old
 call_conf # add data to debconf database
 [ $reconf -eq 1 ] && reconfigure_packages
+exit 0

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-26 20:10:19 UTC (rev 5869)
+++ trunk/debian/changelog	2010-07-26 21:42:34 UTC (rev 5870)
@@ -51,6 +51,7 @@
     minor code cleanup
   * task_sysinfo: remove call of sysinfo (non open source software), check
     if blkid exists before calling it
+  * fai-debconf: exit 0 all the time, change comment
 
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks