This patch renames os.img in the embedded squashfs.img to ext3fs.img, to
be consistent with the name choice of ext3fs.img in the
--skip-compression case.
-dmc
diff -Naur livecd.4.syslinux_to_boot/creator/livecd-creator livecd.5.os_to_ext3fs/creator/livecd-creator
--- livecd.4.syslinux_to_boot/creator/livecd-creator 2007-09-21 07:47:45.000000000 +0000
+++ livecd.5.os_to_ext3fs/creator/livecd-creator 2007-09-21 07:49:01.000000000 +0000
@@ -408,12 +408,12 @@
# legacy LiveOS filesystem layout support, remove for F9 or F10
if os.path.exists(self.build_dir + "/base_on_squashfs/os.img"):
os_image = self.build_dir + "/base_on_squashfs/os.img"
- elif os.path.exists(self.build_dir + "/base_on_squashfs/LiveOS/os.img"):
- os_image = self.build_dir + "/base_on_squashfs/LiveOS/os.img"
+ elif os.path.exists(self.build_dir + "/base_on_squashfs/LiveOS/ext3fs.img"):
+ os_image = self.build_dir + "/base_on_squashfs/LiveOS/ext3fs.img"
else:
raise InstallationError("'%s' is not a valid live CD ISO : os.img doesn't exist" % base_on)
- shutil.copyfile(os_image, self.build_dir + "/data/LiveOS/os.img")
+ shutil.copyfile(os_image, self.build_dir + "/data/LiveOS/ext3fs.img")
finally:
# unmount and tear down the mount points and loop devices used
squashloop.cleanup()
@@ -446,10 +446,10 @@
# get backing ext3 image if we're based this build on an existing live CD ISO
self.base_on_iso(base_on)
- self.instloop = LoopbackMount("%s/data/LiveOS/os.img" %(self.build_dir,),
+ self.instloop = LoopbackMount("%s/data/LiveOS/ext3fs.img" %(self.build_dir,),
"%s/install_root" %(self.build_dir,))
else:
- self.instloop = SparseExt3LoopbackMount("%s/data/LiveOS/os.img"
+ self.instloop = SparseExt3LoopbackMount("%s/data/LiveOS/ext3fs.img"
%(self.build_dir,),
"%s/install_root"
%(self.build_dir,),
@@ -931,7 +931,7 @@
if ret != 0:
raise InstallationError("mksquashfs exited with error (%d)" %(ret,))
else:
- shutil.move("%s/data/LiveOS/os.img" %(self.build_dir,),
+ shutil.move("%s/data/LiveOS/ext3fs.img" %(self.build_dir,),
"%s/out/LiveOS/ext3fs.img" %(self.build_dir,))
def _getBlockCountOfExt2FS(self, filesystem):
@@ -981,7 +981,7 @@
# resize2fs-to-uncompressed-size (with implicit resparsification)
#
def cleanupDeleted(self):
- image = "%s/data/LiveOS/os.img" %(self.build_dir,)
+ image = "%s/data/LiveOS/ext3fs.img" %(self.build_dir,)
subprocess.call(["/sbin/e2fsck", "-f", "-y", image])
@@ -1002,8 +1002,8 @@
#
# genMinInstDelta: generates an osmin overlay file to sit alongside
- # os.img. liveinst may then detect the existence of
- # osmin, and use it to create a minimized os.img
+ # ext3fs.img. liveinst may then detect the existence of
+ # osmin, and use it to create a minimized ext3fs.img
# which can be installed more quickly, and to smaller
# destination volumes.
#
@@ -1017,7 +1017,7 @@
os.close(fd)
# associate os image with loop device
- osloop = LoopbackMount("%s/data/LiveOS/os.img" %(self.build_dir,), \
+ osloop = LoopbackMount("%s/data/LiveOS/ext3fs.img" %(self.build_dir,), \
"None")
osloop.loopsetup()
diff -Naur livecd.4.syslinux_to_boot/creator/mayflower livecd.5.os_to_ext3fs/creator/mayflower
--- livecd.4.syslinux_to_boot/creator/mayflower 2007-09-21 07:05:02.000000000 +0000
+++ livecd.5.os_to_ext3fs/creator/mayflower 2007-09-21 07:46:02.000000000 +0000
@@ -706,7 +706,7 @@
mount -n -t squashfs -o ro \$SQUASHED_LOOPDEV /squashfs
BASE_LOOPDEV=\$( losetup -f )
- losetup \$BASE_LOOPDEV /squashfs/LiveOS/os.img
+ losetup \$BASE_LOOPDEV /squashfs/LiveOS/ext3fs.img
umount -l /squashfs
if [ "\$live_ram" == "0" ] ; then
--
Fedora-livecd-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/fedora-livecd-list
