[Fai-commit] r5957 - in trunk: bin debian
Thomas Lange
lange at alioth.debian.org
Sat Aug 7 19:11:05 UTC 2010
Author: lange
Date: 2010-08-07 19:10:59 +0000 (Sat, 07 Aug 2010)
New Revision: 5957
Modified:
trunk/bin/make-fai-nfsroot
trunk/debian/changelog
Log:
make-fai-nfsroot: do not divert update-initramfs by default any longer
Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot 2010-08-07 18:14:26 UTC (rev 5956)
+++ trunk/bin/make-fai-nfsroot 2010-08-07 19:10:59 UTC (rev 5957)
@@ -78,7 +78,7 @@
merror="properly"
sshpreserve=0
-divert=1
+divert=0
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
@@ -100,7 +100,7 @@
h) usage ;;
e) expert=1 ;; # a dummy option, that only fai-setup uses
p) sshpreserve=1 ;;
- U) divert=0 ;;
+ U) divert=0 ;; # compability option, default used to be 1 by default
?) exit 5 ;; # error in option parsing
esac
done
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-08-07 18:14:26 UTC (rev 5956)
+++ trunk/debian/changelog 2010-08-07 19:10:59 UTC (rev 5957)
@@ -119,7 +119,8 @@
* install_packages: add cupt support
* new setup-fai-test-environment script create two virtual machines for
testing
-
+ * make-fai-nfsroot: do not divert update-initramfs by default any longer
+
[ Michael Tautschnig ]
* setup-storage: Bumped version number to 1.3
* control: Move setup-storage to its own package (fai-setup-storage). Thanks
More information about the Fai-commit
mailing list