summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-09-14 21:11:28 +0000
committerJeremy Katz <katzj@redhat.com>2006-09-14 21:11:28 +0000
commit65dd2f1689fc2846e0678ed7cbab29f7fa1060f4 (patch)
treeffb398693f3fce8146d96aa491c97070779297a2
parentc9ff72fbd9d72ebfd4affe416693aabddd3fd99a (diff)
downloadanaconda-65dd2f1689fc2846e0678ed7cbab29f7fa1060f4.tar.gz
anaconda-65dd2f1689fc2846e0678ed7cbab29f7fa1060f4.tar.xz
anaconda-65dd2f1689fc2846e0678ed7cbab29f7fa1060f4.zip
2006-09-14 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Use -no-fragments to mksquashfs (#206472)
-rw-r--r--ChangeLog4
-rwxr-xr-xscripts/mk-images8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b00422192..95dc0352e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-14 Jeremy Katz <katzj@redhat.com>
+
+ * scripts/mk-images: Use -no-fragments to mksquashfs (#206472)
+
2006-09-14 Peter Jones <pjones@redhat.com>
* loader2/modules.c (scsiCount): make this function actually do what
diff --git a/scripts/mk-images b/scripts/mk-images
index 36f3d552a..6b42cdda4 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -697,8 +697,8 @@ 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 $tmpdir /tmp/${imagename}2.img -all-root"
- mksquashfs $tmpdir /tmp/${imagename}2.img.$$ -all-root
+ echo "Running mksquashfs $tmpdir /tmp/${imagename}2.img -all-root -no-fragments"
+ mksquashfs $tmpdir /tmp/${imagename}2.img.$$ -all-root -no-fragments
chmod 0644 /tmp/${imagename}2.img.$$
fi
cp /tmp/${imagename}2.img.$$ $INSTIMGPATH/${imagename}2.img
@@ -735,8 +735,8 @@ makemainimage () {
rmdir $mmi_mntpoint
elif [ $type = "squashfs" ]; then
makeproductfile $IMGPATH
- echo "Running mksquashfs $IMGPATH $mmi_tmpimage -all-root"
- mksquashfs $IMGPATH $mmi_tmpimage -all-root
+ echo "Running mksquashfs $IMGPATH $mmi_tmpimage -all-root -no-fragments"
+ mksquashfs $IMGPATH $mmi_tmpimage -all-root -nofragments
chmod 0644 $mmi_tmpimage
SIZE=$(expr `cat $mmi_tmpimage | wc -c` / 1024)
elif [ $type = "cramfs" ]; then