Browse files

Merge pull request #55 from daniel-pittman/feature/master/better-fake…


Inform users and abort when we can't unpack the ISO image
  • Loading branch information...
slippycheeze committed Feb 7, 2013
2 parents 76df43b + 9bd0f1c commit 2d84e612e1f6e112f028d4b466afabe5931fd426
Showing with 8 additions and 2 deletions.
  1. +8 −2 iso-build-files/
@@ -1,4 +1,4 @@
. ./
if ! test -f Core-current.iso; then
@@ -23,11 +23,17 @@ mkdir original-iso-files
# get a copy of the files from the original ISO
if exists 7z; then
7z -o"original-iso-files" x Core-current.iso
+elif test x"${FAKEROOTKEY}" = x""; then
test -d /tmp/cdrom || mkdir -p /tmp/cdrom
mount Core-current.iso /tmp/cdrom -o loop
cp -a /tmp/cdrom/boot original-iso-files/
umount /tmp/cdrom
+ echo "It looks like you are running with fakeroot, but you don't"
+ echo "have the 7z command (p7zip or p7zip-full) available. This"
+ echo "means we can't unpack the ISO image; either install that tool"
+ echo "or run this as real root instead."
+ exit 1
# extract the boot/core.gz file from that directory

0 comments on commit 2d84e61

Please sign in to comment.