git.openpandora.org
/
pandora-libraries.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
2a0a9e5
)
Merge branch 'master' of git://git.openpandora.org/pandora-libraries
author
vimacs
<vimacs@pndtest>
Mon, 21 Dec 2009 22:39:28 +0000
(23:39 +0100)
committer
vimacs
<vimacs@pndtest>
Mon, 21 Dec 2009 22:39:28 +0000
(23:39 +0100)
testdata/scripts/pnd_make.sh
patch
|
blob
|
history
diff --git
a/testdata/scripts/pnd_make.sh
b/testdata/scripts/pnd_make.sh
index
1ccbfee
..
3a0ce2c
100755
(executable)
--- a/
testdata/scripts/pnd_make.sh
+++ b/
testdata/scripts/pnd_make.sh
@@
-41,7
+41,11
@@
if [ ! -f $PXML ]; then echo "$PXML doesnt exist"; exit 1; fi #check if pxml act
if [ ! $SQUASH ]; then
mkisofs -o $PNDNAME.iso -R $FOLDER
else
- mksquashfs $FOLDER $PNDNAME.iso
+ if [ $(mksquashfs -version | awk '{if ($3 >= 4) print 1}') = 1 ]; then
+ echo "your squashfs version is older then version 4, pleas upgrade to 4.0 or later"
+ exit 1
+ fi
+ mksquashfs -no-recovery -nopad $FOLDER $PNDNAME.iso
fi
#append pxml to iso
cat $PNDNAME.iso $PXML > $PNDNAME