Subject: [PATCH 4/7] move syslinux and isolinux directories
under /boot - msg#00174

Previous Message by Date:

[PATCH 5/7] rename os.img to ext3fs.img for consistency

This is a multi-part message in MIME format.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

Next Message by Date:

[PATCH 6/7] rename ext3fs.img to ext3.img for consistency

This is a multi-part message in MIME format.This patch renames the ext3fs.img file to ext3.img, to conform to a syntax of <fstype>.img, along with the existing squashfs.img. This may be useful for future code simplification. I like it. -dmc diff -Naur livecd.5.os_to_ext3fs/creator/isotostick.sh livecd.6.ext3fs_to_ext3/creator/isotostick.sh --- livecd.5.os_to_ext3fs/creator/isotostick.sh 2007-09-21 07:28:18.000000000 +0000 +++ livecd.6.ext3fs_to_ext3/creator/isotostick.sh 2007-09-21 08:14:46.000000000 +0000 @@ -203,13 +203,15 @@ echo "Copying live image to USB stick" if [ ! -d $USBMNT/$SYSLINUXPATH ]; then mkdir -p $USBMNT/$SYSLINUXPATH ; fi if [ ! -d $USBMNT/LiveOS ]; then mkdir $USBMNT/LiveOS ; fi -# cases without /LiveOS are legacy detection, remove for F10 +# cases without /LiveOS and ext3fs are legacy detection, remove for F10 if [ -f $CDMNT/LiveOS/squashfs.img ]; then cp $CDMNT/LiveOS/squashfs.img $USBMNT/LiveOS/squashfs.img || exitclean elif [ -f $CDMNT/squashfs.img ]; then cp $CDMNT/squashfs.img $USBMNT/LiveOS/squashfs.img || exitclean elif [ -f $CDMNT/LiveOS/ext3fs.img ]; then cp $CDMNT/LiveOS/ext3fs.img $USBMNT/LiveOS/ext3fs.img || exitclean +elif [ -f $CDMNT/LiveOS/ext3.img ]; then + cp $CDMNT/LiveOS/ext3.img $USBMNT/LiveOS/ext3.img || exitclean elif [ -f $CDMNT/ext3fs.img ]; then cp $CDMNT/ext3fs.img $USBMNT/LiveOS/ext3fs.img || exitclean fi diff -Naur livecd.5.os_to_ext3fs/creator/livecd-creator livecd.6.ext3fs_to_ext3/creator/livecd-creator --- livecd.5.os_to_ext3fs/creator/livecd-creator 2007-09-21 07:49:01.000000000 +0000 +++ livecd.6.ext3fs_to_ext3/creator/livecd-creator 2007-09-21 08:16:21.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/ext3fs.img"): - os_image = self.build_dir + "/base_on_squashfs/LiveOS/ext3fs.img" + elif os.path.exists(self.build_dir + "/base_on_squashfs/LiveOS/ext3.img"): + os_image = self.build_dir + "/base_on_squashfs/LiveOS/ext3.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/ext3fs.img") + shutil.copyfile(os_image, self.build_dir + "/data/LiveOS/ext3.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/ext3fs.img" %(self.build_dir,), + self.instloop = LoopbackMount("%s/data/LiveOS/ext3.img" %(self.build_dir,), "%s/install_root" %(self.build_dir,)) else: - self.instloop = SparseExt3LoopbackMount("%s/data/LiveOS/ext3fs.img" + self.instloop = SparseExt3LoopbackMount("%s/data/LiveOS/ext3.img" %(self.build_dir,), "%s/install_root" %(self.build_dir,), @@ -931,8 +931,8 @@ if ret != 0: raise InstallationError("mksquashfs exited with error (%d)" %(ret,)) else: - shutil.move("%s/data/LiveOS/ext3fs.img" %(self.build_dir,), - "%s/out/LiveOS/ext3fs.img" %(self.build_dir,)) + shutil.move("%s/data/LiveOS/ext3.img" %(self.build_dir,), + "%s/out/LiveOS/ext3.img" %(self.build_dir,)) def _getBlockCountOfExt2FS(self, filesystem): def parseField(output, field): @@ -981,7 +981,7 @@ # resize2fs-to-uncompressed-size (with implicit resparsification) # def cleanupDeleted(self): - image = "%s/data/LiveOS/ext3fs.img" %(self.build_dir,) + image = "%s/data/LiveOS/ext3.img" %(self.build_dir,) subprocess.call(["/sbin/e2fsck", "-f", "-y", image]) @@ -1002,8 +1002,8 @@ # # genMinInstDelta: generates an osmin overlay file to sit alongside - # ext3fs.img. liveinst may then detect the existence of - # osmin, and use it to create a minimized ext3fs.img + # ext3.img. liveinst may then detect the existence of + # osmin, and use it to create a minimized ext3.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/ext3fs.img" %(self.build_dir,), \ + osloop = LoopbackMount("%s/data/LiveOS/ext3.img" %(self.build_dir,), \ "None") osloop.loopsetup() @@ -1041,7 +1041,7 @@ "/dev/mapper/livecd-creator-%d" %(os.getpid(),), "%dK" %(self.minimized_image_size,)]) if rc != 0: - raise InstallationError("Could not shrink ext3fs image") + raise InstallationError("Could not shrink ext3 image") # calculate how much delta data to keep dmsetupOutput = subprocess.Popen(['/sbin/dmsetup', 'status', diff -Naur livecd.5.os_to_ext3fs/creator/mayflower livecd.6.ext3fs_to_ext3/creator/mayflower --- livecd.5.os_to_ext3fs/creator/mayflower 2007-09-21 07:46:02.000000000 +0000 +++ livecd.6.ext3fs_to_ext3/creator/mayflower 2007-09-21 08:15:09.000000000 +0000 @@ -654,8 +654,8 @@ # we might have an uncompressed embedded ext3 to use as rootfs (uncompressed live) # -if [ -e /sysroot/LiveOS/ext3fs.img ]; then - EXT3FS="/sysroot/LiveOS/ext3fs.img" +if [ -e /sysroot/LiveOS/ext3.img ]; then + EXT3FS="/sysroot/LiveOS/ext3.img" fi if [ -n "\$EXT3FS" ] ; then @@ -706,7 +706,7 @@ mount -n -t squashfs -o ro \$SQUASHED_LOOPDEV /squashfs BASE_LOOPDEV=\$( losetup -f ) - losetup \$BASE_LOOPDEV /squashfs/LiveOS/ext3fs.img + losetup \$BASE_LOOPDEV /squashfs/LiveOS/ext3.img umount -l /squashfs if [ "\$live_ram" == "0" ] ; then

Previous Message by Thread:

[PATCH 5/7] rename os.img to ext3fs.img for consistency

This is a multi-part message in MIME format.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

Next Message by Thread:

Re: [PATCH 4/7] move syslinux and isolinux directories under /boot

En/na Douglas McClendon ha escrit: This patch moves the /isolinux directory on the livecd to /boot/isolinux, and the /syslinux directory on liveusb to /boot/syslinux. I think that this will be make the livecd appear less intimidating to new non-linux-guru users. Aesthetics. Since I don't use ppc myself, I didn't attempt to also move the /ppc dir to /boot/ppc on the ppc side. But I would recommend that as well if possible. -dmc Why not to put both the isolinux and ppc files directly into the /boot directory? I don't see the sense of having the /boot directory containig only a subdirectory. You already know the boot directory holds boot manager files, and configuration filenames tells you what boot manager it uses. Cheers, Àlex