[Fai-commit] r4552 - in trunk: bin man

[lange at alioth.debian.org]

Author: lange
Date: 2007-09-06 12:14:43 +0000 (Thu, 06 Sep 2007)
New Revision: 4552

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/man/make-fai-nfsroot.8
Log:
add option -U, do not divert update-initramfs (added because of a
Ubuntu bug)


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-09-03 14:44:24 UTC (rev 4551)
+++ trunk/bin/make-fai-nfsroot	2007-09-06 12:14:43 UTC (rev 4552)
@@ -53,8 +53,9 @@
 kfile="vmlinuz" # some architectures use different names
 merror="properly"
 sshpreserve=0
+divert=0
 # option e currently does nothing
-while getopts hervC:f:kKp opt ; do
+while getopts hervC:f:kKpU opt ; do
     case "$opt" in
         C) cfdir=$OPTARG ;;
         v) verbose=1 ; v=-v ;;
@@ -65,6 +66,7 @@
         h) usage ;;
         e) expert=1 ;; # a dummy option, that only fai-setup uses
         p) sshpreserve=1 ;;
+        U) divert=0 ;;
         ?) exit 5 ;; # error in option parsing
     esac
 done
@@ -145,9 +147,11 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 install_kernel_nfsroot() {
 
-    rm $NFSROOT/usr/sbin/update-initramfs
-    LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-initramfs
-    $ROOTCMD update-initramfs -k all -t -u
+    if [ $divert = 1 ]; then
+	rm $NFSROOT/usr/sbin/update-initramfs
+	LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-initramfs
+	$ROOTCMD update-initramfs -k all -t -u
+    fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 setup_ssh() {
@@ -304,10 +308,13 @@
     rm -rf $NFSROOT/etc/apm
     mount -t proc /proc $NFSROOT/proc
 
-    fdivert /sbin/start-stop-daemon /sbin/discover-modprobe /usr/sbin/update-initramfs
+    if [ $divert = 1 ]; then
+	fdivert /usr/sbin/update-initramfs
+	ln -s /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
     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
-    ln -s /bin/true $NFSROOT/usr/sbin/update-initramfs
     $ROOTCMD apt-get -y dist-upgrade
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -426,8 +433,10 @@
 [ -n "$kinstall" ] && {
     trap "true" EXIT
     echo "Installing new kernel into the nfsroot."
-    fdivert /usr/sbin/update-initramfs
-    ln -s /bin/true $NFSROOT/usr/sbin/fai
+    if [ $divert = 1 ]; then
+	fdivert /usr/sbin/update-initramfs
+	ln -s /bin/true $NFSROOT/usr/sbin/fai
+    fi
     LC_ALL=C add_packages_nfsroot
     kernel_install
     exit

Modified: trunk/man/make-fai-nfsroot.8
===================================================================
--- trunk/man/make-fai-nfsroot.8	2007-09-03 14:44:24 UTC (rev 4551)
+++ trunk/man/make-fai-nfsroot.8	2007-09-06 12:14:43 UTC (rev 4552)
@@ -1,7 +1,7 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .if \n(zZ=1 .ig zZ
 .if \n(zY=1 .ig zY
-.TH make-fai-nfsroot 8 "17 july 2007" "FAI 3.2"
+.TH make-fai-nfsroot 8 "6 september 2007" "FAI 3.2"
 .de }1
 .ds ]X \&\\*(]B\\
 .nr )E 0
@@ -55,6 +55,11 @@
 Preserve ssh keys. This will preserve the whole .ssh directory of the
 root account inside the nfsroot.
 .TP
+.B \-U
+Do not divert update-initramfs during build of the nfsroot. This
+will slow down the creation process a bit. It was only added because
+Ubuntu will fail if the diversion exists.
+.TP
 .B \-v
 Create verbose output on stdout.
 .TP