diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-12-01 21:38:13 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-12-01 21:38:13 +0000 |
| commit | bed24ce12ba920ff518d264eca8450714a15e268 (patch) | |
| tree | a32898cb65d23eb797c68f29e0f37e878d68570c /scripts | |
| parent | 3d6da10d0f0d0787cc61618f6c6fffe305411b3b (diff) | |
| download | anaconda-bed24ce12ba920ff518d264eca8450714a15e268.tar.gz anaconda-bed24ce12ba920ff518d264eca8450714a15e268.tar.xz anaconda-bed24ce12ba920ff518d264eca8450714a15e268.zip | |
2005-12-01 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Fix argument order for mksquashfs, chmod images
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 2a691bfda..364d5b394 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -690,8 +690,9 @@ makeinstimage () { echo "Running mkcramfs $CRAMBS $tmpdir $INSTIMGPATH/${imagename}2.img" mkfs.cramfs $CRAMBS $tmpdir /tmp/${imagename}2.img.$$ elif [ "$type" = "squashfs" ]; then - echo "Running mksquashfs -all-root $tmpdir /tmp/${imagename}2.img" - mksquashfs -all-root $tmpdir /tmp/${imagename}2.img.$$ + echo "Running mksquashfs $tmpdir /tmp/${imagename}2.img -all-root" + mksquashfs $tmpdir /tmp/${imagename}2.img.$$ -all-root + chmod 0644 /tmp/${imagename}2.img.$$ fi cp /tmp/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img size=$(ls -l $INSTIMGPATH/${imagename}2.img | awk '{print $5}') @@ -727,8 +728,9 @@ makemainimage () { rmdir $mmi_mntpoint elif [ $type = "squashfs" ]; then makeproductfile $IMGPATH - echo "Running mksquashfs -all-root $IMGPATH $mmi_tmpimage" - mksquashfs -all-root $IMGPATH $mmi_tmpimage + echo "Running mksquashfs $IMGPATH $mmi_tmpimage -all-root" + mksquashfs $IMGPATH $mmi_tmpimage -all-root + chmod 0644 $mmi_tmpimage SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024) elif [ $type = "cramfs" ]; then makeproductfile $IMGPATH @@ -747,7 +749,7 @@ makemainimage () { makeSecondStage() { echo "Building minstg.img" - makeinstimage "minstg" + makeinstimage "minstg" "squashfs" [ $? = 0 ] || exit 1 echo "Building stage2.img" makemainimage "stage2" "squashfs" |