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

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-07-11 12:36:56 +0000 (Tue, 11 Jul 2006)
New Revision: 3541

Modified:
   trunk/bin/faireboot
   trunk/debian/changelog
Log:
apply NMUs patches. Please never do NMUs again this way!


Modified: trunk/bin/faireboot
===================================================================
--- trunk/bin/faireboot	2006-07-10 05:15:33 UTC (rev 3540)
+++ trunk/bin/faireboot	2006-07-11 12:36:56 UTC (rev 3541)
@@ -22,6 +22,7 @@
 [ "X" == "X$SSH_CLIENT" -a  "$TERM" != "dumb" ] && killall -q sshd
 
 fai-divert -R
+rm -f $FAI_ROOT/etc/apt/apt.conf.d/10fai $FAI_ROOT/etc/apt/apt.conf.d/90fai
 
 umount $FAI_ROOT/proc $FAI_ROOT/dev/pts
 umount -ar

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-10 05:15:33 UTC (rev 3540)
+++ trunk/debian/changelog	2006-07-11 12:36:56 UTC (rev 3541)
@@ -1,3 +1,32 @@
+fai (2.10.5) unstable; urgency=low
+
+  * make-fai-nfsroot: print debootstrap version
+  * add package lftp to nfsroot
+  * create_ramdisk: make more directories writeable
+  * 20hwdetect.source: add some usb modules
+  * dhcpd.conf: next-server is needed in dhcpd3 >=3.0.3
+  
+ -- Thomas Lange <lange at debian.org>  Wed,  5 Jul 2006 21:37:23 +0200
+
+fai (2.10.4) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix previous patch; it should remove files from $FAI_ROOT/etc, not
+    /etc, as faireboot is not run inside the chroot. (Really
+    Closes: #373955)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sun,  9 Jul 2006 18:59:55 +0200
+
+
+fai (2.10.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Remove /etc/apt/apt.conf.d/{10,90}fai in faireboot, since the settings
+    used during install_packages are not appropriate for the finished
+    system. (Closes: #373955)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sun,  9 Jul 2006 15:54:55 +0200
+
 fai (2.10.2) unstable; urgency=medium
 
   * lib/get-boot-info: call dhclient with different configuration and