[Fai-commit] r6043 - branches/stable/3.4/bin

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:58:51 +0000 (Tue, 17 Aug 2010)
New Revision: 6043

Modified:
   branches/stable/3.4/bin/make-fai-nfsroot
Log:
bin/make-fai-nfsroot: do not divert update-initramfs by default any longer

The FAI generated /etc/kernel-img.conf avoids generation
of the initrd by the kernel by default. The divertion
mechanism from make-fai-nfsroot avoids registration of
the kernel for initramfs-tools and therefor generating
the initrd will not work anymore without specifying the
exact kernel version (instead of just using update-initramfs
with "-k all"). If we avoid the divertion by default
the initrd might be build twice during the setup procedure
but we do not break it, so this should be a good tradeoff.

The -U option ("do not divert") doesn't change the behaviour
anymore but is still available for backward compability
reasons.

If someone still wants to explicitely divert the update-initramfs
script we could introduce a new variable to support that, but
for now lets KISS.

Acked-By: Thomas Lange <lange at debian.org>
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:58:45 UTC (rev 6042)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-08-17 12:58:51 UTC (rev 6043)
@@ -76,7 +76,7 @@
 
 merror="properly"
 sshpreserve=0
-divert=1
+divert=0
 
 if [ -f /etc/lsb-release ]; then
     . /etc/lsb-release
@@ -98,7 +98,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