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

[Thomas Lange]

Author: lange
Date: 2010-07-29 01:37:04 +0000 (Thu, 29 Jul 2010)
New Revision: 5902

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

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-07-29 01:08:25 UTC (rev 5901)
+++ trunk/bin/make-fai-nfsroot	2010-07-29 01:37:04 UTC (rev 5902)
@@ -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: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-07-29 01:08:25 UTC (rev 5901)
+++ trunk/debian/changelog	2010-07-29 01:37:04 UTC (rev 5902)
@@ -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
@@ -85,6 +85,7 @@
   * 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