[Fai-commit] r6022 - in branches/stable/3.4: bin debian

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:57:10 +0000 (Tue, 17 Aug 2010)
New Revision: 6022

Modified:
   branches/stable/3.4/bin/make-fai-nfsroot
   branches/stable/3.4/debian/changelog
Log:
make-fai-nfsroot: force creating of symlinks (closes: #588009)


Conflicts:

	debian/changelog

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:57:06 UTC (rev 6021)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:57:10 UTC (rev 6022)
@@ -395,7 +395,7 @@
 
     if [ $divert = 1 ]; then
 	fdivert /usr/sbin/update-initramfs
-	ln -s /bin/true $NFSROOT/usr/sbin/update-initramfs
+	ln -sf /bin/true $NFSROOT/usr/sbin/update-initramfs
     fi
     fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin
@@ -495,7 +495,7 @@
     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
+	ln -sf /bin/true $NFSROOT/usr/sbin/fai
     fi
     $ROOTCMD apt-get update
     $ROOTCMD apt-get -y dist-upgrade

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:57:06 UTC (rev 6021)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:57:10 UTC (rev 6022)
@@ -1,4 +1,4 @@
-fai (3.4~beta9) unstable; urgency=low
+fai (3.4~beta10) unstable; urgency=low
 
   [ Thomas Lange ]
   * get-config-dir-http: new script to get a tarball of the config space
@@ -79,6 +79,13 @@
   * fai-chboot, fai-chboot.8: support for MAC address, same as host name
     (thanks to Torge Gipp for the initial patch)
   * THANKS: add Torge
+  * fai-cd: add checks if package download succeeded
+  * fai-cd: fix, use grub.cfg for grub2
+  * fai-vol_id: cleanup code
+  * fai-mirror, fai-mirror.8: add option -m
+  * disk_config: use UUID's in fstab
+  * fai: cleanup code
+  * make-fai-nfsroot: force creating of symlinks (closes: #588009)
     
   [ Michael Tautschnig ]
   * control: Move setup-storage to its own package (fai-setup-storage). Thanks
@@ -96,11 +103,6 @@
     inside $FAI_ROOT but are still registered in /etc/mtab outside of
     $FAI_ROOT, so let's get rid of them outside the chroot as well iff
     they are present
-  * fai-cd: add checks if package download succeeded
-  * fai-cd: fix, use grub.cfg for grub2
-  * fai-vol_id: cleanup code
-  * fai-mirror, fai-mirror.8: add option -m
-  * disk_config: use UUID's in fstab
   
  -- Thomas Lange <lange at debian.org>  Wed, 28 Jul 2010 16:28:51 -0400