[Fai-commit] r6053 - trunk/bin

[Michael Prokop]

Author: mika
Date: 2010-09-15 19:54:01 +0000 (Wed, 15 Sep 2010)
New Revision: 6053

Modified:
   trunk/bin/make-fai-nfsroot
Log:
bin/make-fai-nfsroot: change check for /usr/share/live-initramfs to /usr/share/initramfs-tools/scripts/live

The check for directory $NFSROOT/usr/share/live-initramfs fails
starting with live-boot 2.0.0-1 due to renamed directories.

Checking for executable file /usr/share/initramfs-tools/scripts/live
works indepent from the live-initramfs/live-boot[-initramfs-tools]
version.

Closes: #595365



Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-09-15 13:54:21 UTC (rev 6052)
+++ trunk/bin/make-fai-nfsroot	2010-09-15 19:54:01 UTC (rev 6053)
@@ -56,7 +56,7 @@
 
     set +e
     # simple test, to see if important thing are available inside the nfsroot
-    [ -d $NFSROOT/usr/share/live-initramfs ] || die 1 "live-initramfs was not installed inside the nfsroot."
+    [ -x $NFSROOT/usr/share/initramfs-tools/scripts/live ] || die 1 "live-initramfs was not installed inside the nfsroot."
     local files=$(ls $NFSROOT/boot/initrd* 2>/dev/null)
     [ -z "$files" ] && die 1 "No initrd installed."
     egrep -q "^ERROR: " /var/log/fai/make-fai-nfsroot.log && bad_exit