[Fai-commit] r6094 - branches/stable/3.4/bin
Michael Prokop
mika at alioth.debian.org
Fri Oct 1 17:31:10 UTC 2010
Author: mika
Date: 2010-10-01 17:31:10 +0000 (Fri, 01 Oct 2010)
New Revision: 6094
Modified:
branches/stable/3.4/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
Conflicts:
3.4/bin/make-fai-nfsroot
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-10-01 16:39:46 UTC (rev 6093)
+++ branches/stable/3.4/bin/make-fai-nfsroot 2010-10-01 17:31:10 UTC (rev 6094)
@@ -54,7 +54,7 @@
set +e
# simple test, to see if important thing are available inside the nfsroot
- [ -d $NFSROOT/usr/share/live-initramfs ] || die "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 "No initrd installed."
egrep -q "^ERROR: " /var/log/fai/make-fai-nfsroot.log && bad_exit
More information about the Fai-commit
mailing list