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

[Thomas Lange]

Author: lange
Date: 2009-04-09 12:11:54 +0000 (Thu, 09 Apr 2009)
New Revision: 5304

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
-k now also upgrades all packages inside the nfsroot

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2009-04-09 12:04:16 UTC (rev 5303)
+++ trunk/bin/make-fai-nfsroot	2009-04-09 12:11:54 UTC (rev 5304)
@@ -470,12 +470,13 @@
 # just install a new kernel to the nfsroot
 [ -n "$kinstall" ] && {
     trap "true" EXIT
-    echo "Installing new kernel into the nfsroot."
+    echo "Upgrading nfsroot and installing new packages into the nfsroot."
     if [ $divert = 1 ]; then
 	fdivert /usr/sbin/update-initramfs
 	ln -s /bin/true $NFSROOT/usr/sbin/fai
     fi
     $ROOTCMD apt-get update
+    $ROOTCMD apt-get -y dist-upgrade
     LC_ALL=C add_packages_nfsroot
     kernel_install
     run_hooks

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-09 12:04:16 UTC (rev 5303)
+++ trunk/debian/changelog	2009-04-09 12:11:54 UTC (rev 5304)
@@ -5,7 +5,8 @@
   * fai-cd: use a pipe when sending commands to grub
   * ftar, fcopy: add info about the other tool
   * new file live.conf will disable some messages during booting
-  * make-fai-nfsroot: call apt-get update when using -k (closes: #507892)
+  * make-fai-nfsroot: call apt-get update when using -k (closes: #507892),
+    -k now also upgrades all packages inside the nfsroot
 
   [ Michael Tautschnig ]
   * setup-storage: Bumped version number to 1.0.4
@@ -56,7 +57,7 @@
     initialization of encrypted partitions configurable
   * setup-storage.8: Document new encryption possibilities
 
- -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:04:00 +0200
+ -- Thomas Lange <lange at debian.org>  Thu, 09 Apr 2009 14:11:42 +0200
 
  (3.2.17) unstable; urgency=medium