April 2012 - livecd - Fedora mailing-lists

/dev/live, /mnt/live, LiveOS/home.img unavailable in Fedora-17
by Frederick Grose 13 May '12

13 May '12

Please note that the current Fedora-17-Beta-TC2-Live images lack some traditional Live CD/USB features. See this bug report. https://bugzilla.redhat.com/show_bug.cgi?id=740280 /dev/live was a link to the installation partition on the Live USB, such as /dev/sdc1, or /dev/sr0 on a Live CD/DVD. How would a script determine this partition without human input? /mnt/live was a convenient mounting of the installation partition filesystem. It allowed easy access to pre-existing content on the Live USB device or to the /LiveOS and /syslinux directories. The --home-size-mb NNN option of livecd-iso-to-disk produced a /LiveOS/home.img filesystem for the liveuser's home directory. This feature made possible the --encrypted-home option, which would secure the privacy of a user directory on a Live USB system. The home.img filesystem was also read/write/delete without consuming the LiveOS overlay. This is important for non-short-term Live USB deployments, such as Sugar on a Stick, where overlay exhaustion can be a significant problem. Is there a workaround for these (missing) features? --Fred

1 3

Fedora livecd-creator broken ?
by Valent Turkovic 03 May '12

03 May '12

Just tried respinning fedora-livecd-desktop.ks and fedora-live-desktop.ks on my Fedora 16 machine and they failed both :( This is the command used to respin iso image: livecd-creator -v -t /livecd/tmp/ --cache=/livecd/yum-cache/ -f Fedora-16-64bit-2012-04 -c fedora-livecd-desktop.ks and this is how it fails: Installing: ivtv-firmware ################### [1135/1137] Installing: iwl4965-firmware ################### [1136/1137] Installing: ipw2100-firmware ################### [1137/1137] 2278 blocks Removing password for user root. passwd: Success Note: Forwarding request to 'systemctl enable NetworkManager.service'. Note: Forwarding request to 'systemctl disable sshd.service'. rm '/etc/systemd/system/multi-user.target.wants/sshd.service' Unmounting directory /home/fusion-linux/temp/imgcreate-2S8P8p/install_root Losetup remove /dev/loop0 Traceback (most recent call last): File "/usr/bin/livecd-creator", line 210, in <module> sys.exit(main()) File "/usr/bin/livecd-creator", line 194, in main creator.configure() File "/usr/lib/python2.7/site-packages/imgcreate/creator.py", line 724, in configure self._create_bootconfig() File "/usr/lib/python2.7/site-packages/imgcreate/live.py", line 242, in _create_bootconfig self._generate_efiboot(self.__ensure_isodir()) File "/usr/lib/python2.7/site-packages/imgcreate/live.py", line 235, in _generate_efiboot isodir + "/isolinux/efiboot.img"]) File "/usr/lib64/python2.7/subprocess.py", line 493, in call return Popen(*popenargs, **kwargs).wait() File "/usr/lib64/python2.7/subprocess.py", line 679, in __init__ errread, errwrite) File "/usr/lib64/python2.7/subprocess.py", line 1228, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory Can somebody confirm that it works for you or that it also fails? Is this a known issue? Cheers, Valent. -- follow me - www.twitter.com/valentt & http://kernelreloaded.blog385.com linux, anime, spirituality, wireless, scuba, linuxmce smart home, zwave ICQ: 2125241, Skype: valent.turkovic, MSN: valent.turkovic(a)hotmail.com

4 6

Fedora livecd 16
by Teresa Millan Fernandez 01 May '12

01 May '12

Hi, I have to update the firmware on an HP server where there is currently a virtunalization product installed. I was told I should install RedHat 6 update 2, update the firmware, and then reinstall the virtualization environment. This solution is not viable. All this, because a RedHat or Oracle Linux livecd is nowhere to be found. I was wondering if the Fedora livecd v.16 contains the ld-linux.so.2 library, which is where the Oracle Linux 6 update 2 "boot disk" is failing currently. How compatible is Fedora with Red Hat and (Oracle Linux)? I guess it is worth a try, but wanted an opinion from you experts. :o) Thanks! T.

4 5

Re: [Fedora-livecd-list] A note about /etc/skel
by J.Heather＠surrey.ac.uk 30 Apr '12

30 Apr '12

Is this on a USB stick with persistent /home? If so, then you'll also hit problems if the file is too big to fit into there. But the most likely is that the in-memory overlay is being exhausted. Fedora will create a temporary overlay in memory to handle writes to the filesystem. James Bruno Wolff III <bruno(a)wolff.to> wrote: On Sun, Apr 29, 2012 at 07:49:55 -0400, john <selmys(a)lotuspond.ca> wrote: >Hello > >I noticed that when I copy a large file into /etc/skel during %post >my ISO is created correctly but crashes on boot up. The crash happens >when liveuser is being created and the large file in /etc/skel is >copied to /home/liveuser. If I boot into single user mode first and >delete the large file from /etc/skel and then "telinit 5", liveuser >is created and everything works correctly. I tried to rebuild the ISO >using a larger root partition but still got the same problem. If I >copy the large file to /usr/local there is no problem. >Does anyone know if there is some sort of size restrictions on files >added to /etc/skel ? If the file is so large that copying it runs you out of memory, that could potentially be your problem. -- livecd mailing list livecd(a)lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/livecd

2 1

fsck after resize returned an error
by john 27 Apr '12

27 Apr '12

Hello I'm using F17 Beta (i686) inside a VM with Virtual box. My host is F16 (x86_64). I'm trying to build a remix for Android development with Eclipse. But creating an ISO fails just after resizing the file system. fsck returns an error. I set my root partition to 10GB which should be enough but still get the error. If I reduce the number of files I add during the POST it works so this suggests that my file system is too small but I suspect this is misleading. I've looked at other spins that generated an ISO over 2GB and they used 10GB for root. My ISO, when it works, is usually around 1.3GB. When it goes over that it fails with the fsck check. This has happened, and continues to happen, even using F16 as my build system. I have attached the log file and my kickstart. Any pointers for a newbie would be appreciated. John ====

3 6

Changes to 'refs/tags/livecd-tools-16.14'
by Brian C. Lane 26 Apr '12

26 Apr '12

Tag 'livecd-tools-16.14' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-26 22:13 +0000 Tag as livecd-tools-16.14 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT5nIlxF+jBaO/jp/AQLqZwf/TSEDGFobv4EQzrbE4r7jyR6znfIuKFAv fBGZc1OTU4Q74y8Ap1PEgR0ujlTQFMOff8gMGl3Ef+VzrRRGPFnDFtr9+AzAt4zC 6lg/c6Y7cyQ960HSiDoyET/atHEAsTXjFRiJjZVk+Oz19JBFg3lzAGHwM5iWb9PZ ZTUPGnyvahJkiB5g1271GsriIXU/FckjPDnC+eJkersYQ79n5X/eU7V+NKyymSkW /LN3xEIJBaWP4o7hITtdpDck6vTMjf67AX2OozcMUAKQIEC5OcuyGm/IZ9xAtYo/ eYBdjssjqRXzW8lDUsAjdtSEKWTs/eVGt0jcRT/EBzZk3lQRsixCHA== =5Gt6 -----END PGP SIGNATURE----- Changes since livecd-tools-16.13: Brian C. Lane (2): copy repo data to USB for F17 (#806166) Version 16.14 --- Makefile | 2 tools/livecd-iso-to-disk.sh | 170 +++++++++++--------------------------------- 2 files changed, 44 insertions(+), 128 deletions(-) ---

1 0

Branch 'f16-branch' - 2 commits - Makefile tools/livecd-iso-to-disk.sh
by Brian C. Lane 26 Apr '12

26 Apr '12

Makefile | 2 tools/livecd-iso-to-disk.sh | 170 +++++++++++--------------------------------- 2 files changed, 44 insertions(+), 128 deletions(-) New commits: commit 1b6c8fa6d39cae100fe382ea6940560587ef9307 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 26 15:13:39 2012 -0700 Version 16.14 diff --git a/Makefile b/Makefile index f9a927e..52821b8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 16.13 +VERSION = 16.14 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit c3c1a01674c2a734ea057658f90a20a2f270e4fc Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 26 14:43:41 2012 -0700 copy repo data to USB for F17 (#806166) Fedora 17 runs from the media so repo= cannot be used to mount the same device for access to the repo so we now copy the repodata from the iso over to the / of the USB. This requires anaconda-17.23-1 or later. For releases before F17 the iso is still copied and repo= is setup to point to it. This reverts the use of 2 partitions that was used to work around this. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 37abae0..15de42d 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -276,14 +276,11 @@ cleanup() { sleep 2 [ -d "$SRCMNT" ] && umount $SRCMNT && rmdir $SRCMNT [ -d "$TGTMNT" ] && umount $TGTMNT && rmdir $TGTMNT - if [ -n "$REPOMNT" ]; then - [ -d "$REPOMNT" ] && umount $REPOMNT && rmdir $REPOMNT - fi } exitclean() { RETVAL=$? - if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ] || [ -n "$REPOMNT" ]; + if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ]; then [ "$RETVAL" = 0 ] || echo "Cleaning up to exit..." cleanup @@ -423,16 +420,7 @@ createGPTLayout() { /sbin/parted --script $device mklabel gpt partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -442,11 +430,6 @@ createGPTLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart '"EFI System Partition"' fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart '"LIVE REPO"' fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -455,12 +438,6 @@ createGPTLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createMSDOSLayout() { @@ -475,16 +452,7 @@ createMSDOSLayout() { /sbin/parted --script $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -494,11 +462,6 @@ createMSDOSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -511,12 +474,6 @@ createMSDOSLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createEXTFSLayout() { @@ -531,16 +488,7 @@ createEXTFSLayout() { /sbin/parted -s $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted -s -m $device "u MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -550,11 +498,6 @@ createEXTFSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary ext2 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary ext2 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -570,12 +513,6 @@ createEXTFSLayout() { fi $mkfs -L LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - $mkfs -L LIVE-REPO $REPODEV - fi } checkGPT() { @@ -650,25 +587,6 @@ checkFilesystem() { fi } -# Check partition 2 to see if it has been setup as LIVE-REPO -# Setup REPODEV for later use -findLIVEREPO() { - dev=$1 - getdisk $dev - - if [ -b ${device}2 ]; then - label=$(/sbin/blkid -s LABEL -o value ${device}2) - if [ "$label" == "LIVE-REPO" ]; then - echo "Found LIVE-REPO on ${device}2" - REPODEV=${device}2 - return - fi - fi - echo "DVD installs need a second partition labeled LIVE-REPO." - echo "This is setup when you use --format" - exitclean -} - checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -710,9 +628,7 @@ fi detectsrctype() { if [[ -e "$SRCMNT/Packages" ]]; then - # This will cause the source .iso to be copied to a second partiton - # on the target and the boot args to have repo=... pointing to the iso - echo "/Packages found, will copy source .iso to target" + echo "/Packages found, will copy source packages to target" packages=1 fi if [[ -e "$SRCMNT/LiveOS/squashfs.img" ]]; then @@ -947,9 +863,6 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi -elif [ -n "$packages" ]; then - # Need the LIVE-REPO partition to copy the .iso to - findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -993,11 +906,6 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean -if [ -n "$REPODEV" ]; then - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" - REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) - mount $mountopts $REPODEV $REPOMNT || exitclean -fi trap exitclean SIGINT SIGTERM @@ -1163,27 +1071,6 @@ if [ "$srctype" = "live" -a -z "$skipcopy" ]; then sync fi -# DVD installer copy -# Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then - echo "Copying DVD image to target device." - mkdir -p $TGTMNT/images/ - if [ "$imgtype" = "install" ]; then - for img in install.img updates.img product.img; do - if [ -e $SRCMNT/images/$img ]; then - copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean - fi - done - fi -fi - -# Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then - echo "Copying $SRC" - copyFile "$SRC" $REPOMNT/ - sync -fi - # Adjust syslinux sources for replication of installed images # between filesystem types. if [[ -d $SRCMNT/isolinux/ ]]; then @@ -1201,6 +1088,7 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg # Set this to nothing so sed doesn't care BOOTCONFIG_EFI= if [ -n "$efi" ]; then + echo "Setting up $EFI_BOOT" cp $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT # FIXME @@ -1240,7 +1128,43 @@ if [ -n "$efi" ]; then fi fi -if [[ live == $srctype ]]; then +# DVD installer copy +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then + echo "Copying DVD image to target device." + mkdir -p $TGTMNT/images/ + if [ "$imgtype" = "install" ]; then + for img in install.img updates.img product.img; do + if [ -e $SRCMNT/images/$img ]; then + copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean + fi + done + fi +fi + +# Copy packages over. +# Before Fedora17 we could copy the .iso and setup a repo= +# F17 and later look for repodata on the source media. +# The presence of packages and LiveOS indicates F17 or later. +if [ -n "$packages" -a -z "$skipcopy" ]; then + if [ "$srctype" != "live" ]; then + echo "Copying $SRC to device" + copyFile "$SRC" "$TGTMNT/" + + # Setup a repo= to point to the .iso + sed -i -e "s;initrd.img;initrd.img repo=hd:$TGTLABEL:/;g" $BOOTCONFIG + if [ -n "$efi" ]; then + sed -i -e "s;vmlinuz;vmlinuz repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + fi + else + echo "Copying package data from $SRC to device" + rsync --inplace -rLDP --exclude EFI/ --exclude images/ --exclude isolinux/ \ + --exclude TRANS.TBL --exclude LiveOS/ "$SRCMNT/" "$TGTMNT/" + fi + echo "Waiting for device to finish writing" + sync +fi + +if [ "$srctype" = "live" ]; then # Copy this installer script. cp -fT "$thisScriptpath" $TGTMNT/$LIVEOS/livecd-iso-to-disk chmod +x $TGTMNT/$LIVEOS/livecd-iso-to-disk &> /dev/null || : @@ -1278,14 +1202,6 @@ if [ -n "$efi" ]; then sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi -# Add repo= to point to the source .iso with the packages -if [[ -n "$packages" ]]; then - sed -i -e "s;initrd.img;initrd.img repo=hd:$REPOLABEL:/;g" $BOOTCONFIG - if [ -n "$efi" ]; then - sed -i -e "s;vmlinuz;vmlinuz repo=hd:$REPOLABEL:/;g" $BOOTCONFIG_EFI - fi -fi - # DVD Installer for netinst if [ "$srctype" != "live" ]; then if [ "$imgtype" = "install" ]; then

1 0

Changes to 'refs/tags/livecd-tools-17.10'
by Brian C. Lane 26 Apr '12

26 Apr '12

Tag 'livecd-tools-17.10' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-26 21:57 +0000 Tag as livecd-tools-17.10 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT5nEwBF+jBaO/jp/AQI/iAf9FQBiNXRRpwdAhYi7J3AklMlUKUNH7lwD RBYI4GbJYDvLstdzBl74vhRxUuVFVqgxGZk/9MmR1EdNXVKJL+MaQeQHnjFAYyb0 pXaZlEKtnKYKvLxtm4GKR+XYlZRlr+xdA46vAwbgYvKT36ew9OEAFGn7VF9AEhAF pvN7cP0kJ9eNBOqJSxyuhbUIZrFCmbwBMabguyzTyYWPW8A94LMOfh/gEdtcXcRk JWVkRttHy6sALFx4ktqwenGJMF5/vx50l0gfRBS51hJ25NIh0iTYxFQmAN/MejE7 1TNrAHobQK9qxMOk/Y5aBqsXc7CJNYUdJCWaUa0XnHW3/MQ2sM8UZw== =lvKv -----END PGP SIGNATURE----- Changes since livecd-tools-17.9: Brian C. Lane (2): copy repo data to USB for F17 (#806166) Version 17.10 --- Makefile | 2 tools/livecd-iso-to-disk.sh | 170 +++++++++++--------------------------------- 2 files changed, 44 insertions(+), 128 deletions(-) ---

1 0

Branch 'f17-branch' - Makefile
by Brian C. Lane 26 Apr '12

26 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7cd22cda37b7e52114cda6cccbc1c9024fada4d8 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 26 14:57:01 2012 -0700 Version 17.10 diff --git a/Makefile b/Makefile index 0667a0b..4f2ddfe 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 17.9 +VERSION = 17.10 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

Branch 'f17-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 26 Apr '12

26 Apr '12

tools/livecd-iso-to-disk.sh | 170 +++++++++++--------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) New commits: commit 2a85f65f0988a30ff5f869aa5410f9b3af148241 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 26 14:43:41 2012 -0700 copy repo data to USB for F17 (#806166) Fedora 17 runs from the media so repo= cannot be used to mount the same device for access to the repo so we now copy the repodata from the iso over to the / of the USB. This requires anaconda-17.23-1 or later. For releases before F17 the iso is still copied and repo= is setup to point to it. This reverts the use of 2 partitions that was used to work around this. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 95f0fae..7df49c2 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -276,14 +276,11 @@ cleanup() { sleep 2 [ -d "$SRCMNT" ] && umount $SRCMNT && rmdir $SRCMNT [ -d "$TGTMNT" ] && umount $TGTMNT && rmdir $TGTMNT - if [ -n "$REPOMNT" ]; then - [ -d "$REPOMNT" ] && umount $REPOMNT && rmdir $REPOMNT - fi } exitclean() { RETVAL=$? - if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ] || [ -n "$REPOMNT" ]; + if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ]; then [ "$RETVAL" = 0 ] || echo "Cleaning up to exit..." cleanup @@ -423,16 +420,7 @@ createGPTLayout() { /sbin/parted --script $device mklabel gpt partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -442,11 +430,6 @@ createGPTLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart '"EFI System Partition"' fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart '"LIVE REPO"' fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -455,12 +438,6 @@ createGPTLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createMSDOSLayout() { @@ -475,16 +452,7 @@ createMSDOSLayout() { /sbin/parted --script $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -494,11 +462,6 @@ createMSDOSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -511,12 +474,6 @@ createMSDOSLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createEXTFSLayout() { @@ -531,16 +488,7 @@ createEXTFSLayout() { /sbin/parted -s $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted -s -m $device "u MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -550,11 +498,6 @@ createEXTFSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary ext2 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary ext2 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -570,12 +513,6 @@ createEXTFSLayout() { fi $mkfs -L LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - $mkfs -L LIVE-REPO $REPODEV - fi } checkGPT() { @@ -650,25 +587,6 @@ checkFilesystem() { fi } -# Check partition 2 to see if it has been setup as LIVE-REPO -# Setup REPODEV for later use -findLIVEREPO() { - dev=$1 - getdisk $dev - - if [ -b ${device}2 ]; then - label=$(/sbin/blkid -s LABEL -o value ${device}2) - if [ "$label" == "LIVE-REPO" ]; then - echo "Found LIVE-REPO on ${device}2" - REPODEV=${device}2 - return - fi - fi - echo "DVD installs need a second partition labeled LIVE-REPO." - echo "This is setup when you use --format" - exitclean -} - checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -710,9 +628,7 @@ fi detectsrctype() { if [[ -e "$SRCMNT/Packages" ]]; then - # This will cause the source .iso to be copied to a second partiton - # on the target and the boot args to have repo=... pointing to the iso - echo "/Packages found, will copy source .iso to target" + echo "/Packages found, will copy source packages to target" packages=1 fi if [[ -e "$SRCMNT/LiveOS/squashfs.img" ]]; then @@ -947,9 +863,6 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi -elif [ -n "$packages" ]; then - # Need the LIVE-REPO partition to copy the .iso to - findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -993,11 +906,6 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean -if [ -n "$REPODEV" ]; then - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" - REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) - mount $mountopts $REPODEV $REPOMNT || exitclean -fi trap exitclean SIGINT SIGTERM @@ -1163,27 +1071,6 @@ if [ "$srctype" = "live" -a -z "$skipcopy" ]; then sync fi -# DVD installer copy -# Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then - echo "Copying DVD image to target device." - mkdir -p $TGTMNT/images/ - if [ "$imgtype" = "install" ]; then - for img in install.img updates.img product.img; do - if [ -e $SRCMNT/images/$img ]; then - copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean - fi - done - fi -fi - -# Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then - echo "Copying $SRC" - copyFile "$SRC" $REPOMNT/ - sync -fi - # Adjust syslinux sources for replication of installed images # between filesystem types. if [[ -d $SRCMNT/isolinux/ ]]; then @@ -1201,6 +1088,7 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg # Set this to nothing so sed doesn't care BOOTCONFIG_EFI= if [ -n "$efi" ]; then + echo "Setting up $EFI_BOOT" cp $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT # FIXME @@ -1240,7 +1128,43 @@ if [ -n "$efi" ]; then fi fi -if [[ live == $srctype ]]; then +# DVD installer copy +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then + echo "Copying DVD image to target device." + mkdir -p $TGTMNT/images/ + if [ "$imgtype" = "install" ]; then + for img in install.img updates.img product.img; do + if [ -e $SRCMNT/images/$img ]; then + copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean + fi + done + fi +fi + +# Copy packages over. +# Before Fedora17 we could copy the .iso and setup a repo= +# F17 and later look for repodata on the source media. +# The presence of packages and LiveOS indicates F17 or later. +if [ -n "$packages" -a -z "$skipcopy" ]; then + if [ "$srctype" != "live" ]; then + echo "Copying $SRC to device" + copyFile "$SRC" "$TGTMNT/" + + # Setup a repo= to point to the .iso + sed -i -e "s;initrd.img;initrd.img repo=hd:$TGTLABEL:/;g" $BOOTCONFIG + if [ -n "$efi" ]; then + sed -i -e "s;vmlinuz;vmlinuz repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + fi + else + echo "Copying package data from $SRC to device" + rsync --inplace -rLDP --exclude EFI/ --exclude images/ --exclude isolinux/ \ + --exclude TRANS.TBL --exclude LiveOS/ "$SRCMNT/" "$TGTMNT/" + fi + echo "Waiting for device to finish writing" + sync +fi + +if [ "$srctype" = "live" ]; then # Copy this installer script. cp -fT "$thisScriptpath" $TGTMNT/$LIVEOS/livecd-iso-to-disk chmod +x $TGTMNT/$LIVEOS/livecd-iso-to-disk &> /dev/null || : @@ -1278,14 +1202,6 @@ if [ -n "$efi" ]; then sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi -# Add repo= to point to the source .iso with the packages -if [[ -n "$packages" ]]; then - sed -i -e "s;initrd.img;initrd.img repo=hd:$REPOLABEL:/;g" $BOOTCONFIG - if [ -n "$efi" ]; then - sed -i -e "s;vmlinuz;vmlinuz repo=hd:$REPOLABEL:/;g" $BOOTCONFIG_EFI - fi -fi - # DVD Installer for netinst if [ "$srctype" != "live" ]; then if [ "$imgtype" = "install" ]; then

1 0

tools/livecd-iso-to-disk.sh
by Brian C. Lane 26 Apr '12

26 Apr '12

tools/livecd-iso-to-disk.sh | 170 +++++++++++--------------------------------- 1 file changed, 43 insertions(+), 127 deletions(-) New commits: commit 93310a734449754203b1653ac82d072259e7ff67 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 26 14:43:41 2012 -0700 copy repo data to USB for F17 (#806166) Fedora 17 runs from the media so repo= cannot be used to mount the same device for access to the repo so we now copy the repodata from the iso over to the / of the USB. This requires anaconda-17.23-1 or later. For releases before F17 the iso is still copied and repo= is setup to point to it. This reverts the use of 2 partitions that was used to work around this. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 95f0fae..7df49c2 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -276,14 +276,11 @@ cleanup() { sleep 2 [ -d "$SRCMNT" ] && umount $SRCMNT && rmdir $SRCMNT [ -d "$TGTMNT" ] && umount $TGTMNT && rmdir $TGTMNT - if [ -n "$REPOMNT" ]; then - [ -d "$REPOMNT" ] && umount $REPOMNT && rmdir $REPOMNT - fi } exitclean() { RETVAL=$? - if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ] || [ -n "$REPOMNT" ]; + if [ -d "$SRCMNT" ] || [ -d "$TGTMNT" ]; then [ "$RETVAL" = 0 ] || echo "Cleaning up to exit..." cleanup @@ -423,16 +420,7 @@ createGPTLayout() { /sbin/parted --script $device mklabel gpt partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -442,11 +430,6 @@ createGPTLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart '"EFI System Partition"' fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart '"LIVE REPO"' fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -455,12 +438,6 @@ createGPTLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createMSDOSLayout() { @@ -475,16 +452,7 @@ createMSDOSLayout() { /sbin/parted --script $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -494,11 +462,6 @@ createMSDOSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary fat32 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary fat32 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -511,12 +474,6 @@ createMSDOSLayout() { umount $TGTDEV &> /dev/null || : /sbin/mkdosfs -n LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - /sbin/mkdosfs -n LIVE-REPO $REPODEV - fi } createEXTFSLayout() { @@ -531,16 +488,7 @@ createEXTFSLayout() { /sbin/parted -s $device mklabel msdos partinfo=$(LC_ALL=C /sbin/parted -s -m $device "u MB print" |grep ^$device:) dev_size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/MB$//') - - # Is a 2nd partition needed for package iso? - if [ -n "$packages" ]; then - src_size=$(du -s -B 1MB "$SRC" | awk {'print $1;'}) - # iso size + 7% of slop for filesystem metadata - p2_size=$(($src_size * 107 / 100)) - else - p2_size=0 - fi - p1_size=$(($dev_size - 3 - $p2_size)) + p1_size=$(($dev_size - 3)) if [ $p1_size -le 0 ]; then echo "Your device isn't big enough to hold $SRC" @@ -550,11 +498,6 @@ createEXTFSLayout() { p1_start=1 p1_end=$(($p1_size + 1)) /sbin/parted -s $device u MB mkpart primary ext2 $p1_start $p1_end set 1 boot on - if [ $p2_size -gt 0 ]; then - p2_start=$p1_end - p2_end=$(($p2_size + $p2_start)) - /sbin/parted -s $device u MB mkpart primary ext2 $p2_start $p2_end - fi # Sometimes automount can be _really_ annoying. echo "Waiting for devices to settle..." /sbin/udevadm settle @@ -570,12 +513,6 @@ createEXTFSLayout() { fi $mkfs -L LIVE $TGTDEV TGTLABEL="UUID=$(/sbin/blkid -s UUID -o value $TGTDEV)" - - if [ $p2_size -gt 0 ]; then - REPODEV=${device}2 - umount $REPODEV &> /dev/null || : - $mkfs -L LIVE-REPO $REPODEV - fi } checkGPT() { @@ -650,25 +587,6 @@ checkFilesystem() { fi } -# Check partition 2 to see if it has been setup as LIVE-REPO -# Setup REPODEV for later use -findLIVEREPO() { - dev=$1 - getdisk $dev - - if [ -b ${device}2 ]; then - label=$(/sbin/blkid -s LABEL -o value ${device}2) - if [ "$label" == "LIVE-REPO" ]; then - echo "Found LIVE-REPO on ${device}2" - REPODEV=${device}2 - return - fi - fi - echo "DVD installs need a second partition labeled LIVE-REPO." - echo "This is setup when you use --format" - exitclean -} - checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -710,9 +628,7 @@ fi detectsrctype() { if [[ -e "$SRCMNT/Packages" ]]; then - # This will cause the source .iso to be copied to a second partiton - # on the target and the boot args to have repo=... pointing to the iso - echo "/Packages found, will copy source .iso to target" + echo "/Packages found, will copy source packages to target" packages=1 fi if [[ -e "$SRCMNT/LiveOS/squashfs.img" ]]; then @@ -947,9 +863,6 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi -elif [ -n "$packages" ]; then - # Need the LIVE-REPO partition to copy the .iso to - findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -993,11 +906,6 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean -if [ -n "$REPODEV" ]; then - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" - REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) - mount $mountopts $REPODEV $REPOMNT || exitclean -fi trap exitclean SIGINT SIGTERM @@ -1163,27 +1071,6 @@ if [ "$srctype" = "live" -a -z "$skipcopy" ]; then sync fi -# DVD installer copy -# Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then - echo "Copying DVD image to target device." - mkdir -p $TGTMNT/images/ - if [ "$imgtype" = "install" ]; then - for img in install.img updates.img product.img; do - if [ -e $SRCMNT/images/$img ]; then - copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean - fi - done - fi -fi - -# Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then - echo "Copying $SRC" - copyFile "$SRC" $REPOMNT/ - sync -fi - # Adjust syslinux sources for replication of installed images # between filesystem types. if [[ -d $SRCMNT/isolinux/ ]]; then @@ -1201,6 +1088,7 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg # Set this to nothing so sed doesn't care BOOTCONFIG_EFI= if [ -n "$efi" ]; then + echo "Setting up $EFI_BOOT" cp $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT # FIXME @@ -1240,7 +1128,43 @@ if [ -n "$efi" ]; then fi fi -if [[ live == $srctype ]]; then +# DVD installer copy +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then + echo "Copying DVD image to target device." + mkdir -p $TGTMNT/images/ + if [ "$imgtype" = "install" ]; then + for img in install.img updates.img product.img; do + if [ -e $SRCMNT/images/$img ]; then + copyFile $SRCMNT/images/$img $TGTMNT/images/$img || exitclean + fi + done + fi +fi + +# Copy packages over. +# Before Fedora17 we could copy the .iso and setup a repo= +# F17 and later look for repodata on the source media. +# The presence of packages and LiveOS indicates F17 or later. +if [ -n "$packages" -a -z "$skipcopy" ]; then + if [ "$srctype" != "live" ]; then + echo "Copying $SRC to device" + copyFile "$SRC" "$TGTMNT/" + + # Setup a repo= to point to the .iso + sed -i -e "s;initrd.img;initrd.img repo=hd:$TGTLABEL:/;g" $BOOTCONFIG + if [ -n "$efi" ]; then + sed -i -e "s;vmlinuz;vmlinuz repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + fi + else + echo "Copying package data from $SRC to device" + rsync --inplace -rLDP --exclude EFI/ --exclude images/ --exclude isolinux/ \ + --exclude TRANS.TBL --exclude LiveOS/ "$SRCMNT/" "$TGTMNT/" + fi + echo "Waiting for device to finish writing" + sync +fi + +if [ "$srctype" = "live" ]; then # Copy this installer script. cp -fT "$thisScriptpath" $TGTMNT/$LIVEOS/livecd-iso-to-disk chmod +x $TGTMNT/$LIVEOS/livecd-iso-to-disk &> /dev/null || : @@ -1278,14 +1202,6 @@ if [ -n "$efi" ]; then sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi -# Add repo= to point to the source .iso with the packages -if [[ -n "$packages" ]]; then - sed -i -e "s;initrd.img;initrd.img repo=hd:$REPOLABEL:/;g" $BOOTCONFIG - if [ -n "$efi" ]; then - sed -i -e "s;vmlinuz;vmlinuz repo=hd:$REPOLABEL:/;g" $BOOTCONFIG_EFI - fi -fi - # DVD Installer for netinst if [ "$srctype" != "live" ]; then if [ "$imgtype" = "install" ]; then

1 0

Changes to 'refs/tags/livecd-tools-16.13'
by Brian C. Lane 25 Apr '12

25 Apr '12

Tag 'livecd-tools-16.13' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-25 17:55 +0000 Tag as livecd-tools-16.13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT5g6dBF+jBaO/jp/AQJ/Agf9EwYOluiHbhg+zydCLSIupY8Z8ecRTJVz yXqHjX9zsCpwIsaToNsF8hXr5UzugLzyr7TBtzwVG3FYB+o1thc5vjubskmBuniQ AO+BeoSaXp9KyKcAiwssrxjRfTAbwYj+sai04SH0mg1z7vdzj6ShvN21bG1OWk+E +VsYGdkY8Ji5idNexFzIwqdg23JM4StNyxyR5rBo8xWBsZR9Y/D+YhS3+dDh1QvZ NRr4Dae9NRP65d9kBR8R4aOC9EFijqZGfOxFQbrYejPsVnM+HumsJAnO82+9oQL5 FNAmlz0V8IEKBZIOKWYXDxz1t513fd/HGCTYSS9d3OhJ0+OsMvMzYA== =PwLJ -----END PGP SIGNATURE----- Changes since livecd-tools-16.12: Bill Nottingham (1): allow for use of yum plugins during livecd creation Brian C. Lane (3): check for LIVE-REPO partition when writing DVD (#813905) fix quoting with basename and SRC (#814174) Version 16.13 Matthew Garrett (2): Add tighter Mac boot image integration Capitalise EFI names --- Makefile | 2 +- imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ tools/livecd-iso-to-disk.sh | 34 +++++++++++++++++++++++++++------- 6 files changed, 52 insertions(+), 18 deletions(-) ---

1 0

Branch 'f16-branch' - 4 commits - imgcreate/creator.py imgcreate/live.py imgcreate/yuminst.py Makefile tools/livecd-creator
by Brian C. Lane 25 Apr '12

25 Apr '12

Makefile | 2 +- imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ 5 files changed, 25 insertions(+), 11 deletions(-) New commits: commit 96c201fb1ab268e777b145eb90c33294d32f3a60 Author: Brian C. Lane <bcl(a)redhat.com> Date: Wed Apr 25 10:54:44 2012 -0700 Version 16.13 diff --git a/Makefile b/Makefile index 7922b65..f9a927e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 16.12 +VERSION = 16.13 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 674575e7582e04f63239a521462605d242aedefe Author: Bill Nottingham <notting(a)redhat.com> Date: Mon Apr 23 18:31:22 2012 -0400 allow for use of yum plugins during livecd creation https://bugzilla.redhat.com/show_bug.cgi?id=813429 This adds an option ("-p", or "--plugins") to livecd-creator to allow for the use of yum plugins during image creation. The initial usage case is for localized live images that want to use yum-langpacks when creating their live image so that they include the proper language packs for their locale. Aside from the noise of propagating the commandline options down to the yum instance, there is a bugfix where we re-call repository setup after we've actually added the repositories; this is required so that plugins operate properly. Bill diff --git a/imgcreate/creator.py b/imgcreate/creator.py index 35fe777..d8249cb 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -51,7 +51,7 @@ class ImageCreator(object): """ - def __init__(self, ks, name, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize an ImageCreator instance. ks -- a pykickstart.KickstartParser instance; this instance will be @@ -72,6 +72,7 @@ class ImageCreator(object): """A name for the image.""" self.releasever = releasever + self.useplugins = useplugins self.tmpdir = tmpdir """The directory in which all temporary files will be created.""" @@ -617,7 +618,7 @@ class ImageCreator(object): """ yum_conf = self._mktemp(prefix = "yum.conf-") - ayum = LiveCDYum(releasever=self.releasever) + ayum = LiveCDYum(releasever=self.releasever, useplugins=self.useplugins) ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): @@ -632,6 +633,7 @@ class ImageCreator(object): yr.proxy = proxy if cost is not None: yr.cost = cost + ayum.setup(yum_conf, self._instroot) if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") @@ -778,7 +780,7 @@ class LoopImageCreator(ImageCreator): """ - def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize a LoopImageCreator instance. This method takes the same arguments as ImageCreator.__init__() with @@ -787,7 +789,7 @@ class LoopImageCreator(ImageCreator): fslabel -- A string used as a label for any filesystems created. """ - ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir) + ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir, useplugins=useplugins) self.__fslabel = None self.fslabel = fslabel diff --git a/imgcreate/live.py b/imgcreate/live.py index c468d41..b9867a5 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -40,7 +40,7 @@ class LiveImageCreatorBase(LoopImageCreator): """ def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", - title="Linux", product="Linux"): + title="Linux", product="Linux", useplugins=False): """Initialise a LiveImageCreator instance. This method takes the same arguments as LoopImageCreator.__init__(). @@ -49,7 +49,8 @@ class LiveImageCreatorBase(LoopImageCreator): LoopImageCreator.__init__(self, ks, name, fslabel=fslabel, releasever=releasever, - tmpdir=tmpdir) + tmpdir=tmpdir, + useplugins=useplugins) self.compress_type = "xz" """mksquashfs compressor to use.""" diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py index d835d9f..5605eea 100644 --- a/imgcreate/yuminst.py +++ b/imgcreate/yuminst.py @@ -45,12 +45,13 @@ class TextProgress(object): self.emit(logging.INFO, "...OK\n") class LiveCDYum(yum.YumBase): - def __init__(self, releasever=None): + def __init__(self, releasever=None, useplugins=False): """ releasever = optional value to use in replacing $releasever in repos """ yum.YumBase.__init__(self) self.releasever = releasever + self.useplugins = useplugins def doFileLogSetup(self, uid, logfile): # don't do the file log for the livecd as it can lead to open fds @@ -71,7 +72,10 @@ class LiveCDYum(yum.YumBase): conf = "[main]\n" conf += "installroot=%s\n" % installroot conf += "cachedir=/var/cache/yum\n" - conf += "plugins=0\n" + if self.useplugins: + conf += "plugins=1\n" + else: + conf += "plugins=0\n" conf += "reposdir=\n" conf += "failovermethod=priority\n" conf += "keepcache=1\n" diff --git a/tools/livecd-creator b/tools/livecd-creator index 6b2c799..8bb81aa 100755 --- a/tools/livecd-creator +++ b/tools/livecd-creator @@ -49,6 +49,9 @@ def parse_options(args): # Provided for img-create compatibility imgopt.add_option("-n", "--name", type="string", dest="fslabel", help=optparse.SUPPRESS_HELP) + imgopt.add_option("-p", "--plugins", action="store_true", dest="plugins", + help="Use yum plugins during image creation", + default=False) imgopt.add_option("", "--image-type", type="string", dest="image_type", help=optparse.SUPPRESS_HELP) imgopt.add_option("", "--compression-type", type="string", dest="compress_type", @@ -171,11 +174,13 @@ def main(): fslabel=fslabel, releasever=options.releasever, tmpdir=os.path.abspath(options.tmpdir), + useplugins=options.plugins, title=title, product=product) elif options.image_type == 'image': creator = imgcreate.LoopImageCreator(ks, name, fslabel=fslabel, releasever=options.releasever, + useplugins=options.plugins, tmpdir=os.path.abspath(options.tmpdir)) else: # Cannot happen, we validate this when parsing options. commit 387c37260c063fa70d998dee8e882aad95ed65cf Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 10:41:48 2012 -0400 Capitalise EFI names The spec says these are mixed case, but the implementation has them as upper case. This is fine on vfat, but breaks on iso9660. Make them upper case. diff --git a/imgcreate/live.py b/imgcreate/live.py index 167ac94..c468d41 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -773,7 +773,7 @@ hiddenmenu os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT.conf") # for most things, we want them named boot$efiarch - efiarch = {"i386": "ia32", "x86_64": "x64"} + efiarch = {"i386": "IA32", "x86_64": "X64"} efiname = efiarch[rpmUtils.arch.getBaseArch()] os.rename(isodir + "/EFI/BOOT/grub.efi", isodir + "/EFI/BOOT/BOOT%s.efi" %(efiname,)) os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT%s.conf" %(efiname,)) commit cd63accd3fc0c5c25af2fd83361ac3b9edfe3338 Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 09:47:31 2012 -0400 Add tighter Mac boot image integration Make sure that the Mac boot image ends up with an icon and has the product info set correctly. diff --git a/imgcreate/live.py b/imgcreate/live.py index 656f49c..167ac94 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -234,7 +234,9 @@ class LiveImageCreatorBase(LoopImageCreator): subprocess.call(["mkefiboot", isodir + "/EFI/BOOT", isodir + "/isolinux/efiboot.img"]) subprocess.call(["mkefiboot", "-a", isodir + "/EFI/BOOT", - isodir + "/isolinux/macboot.img"]) + isodir + "/isolinux/macboot.img", "-l", self.product, + "-i", "/usr/share/pixmaps/bootloader/fedora.icns", + "-p", self.product]) def _create_bootconfig(self): """Configure the image so that it's bootable."""

1 0

Changes to 'refs/tags/livecd-tools-17.9'
by Brian C. Lane 24 Apr '12

24 Apr '12

Tag 'livecd-tools-17.9' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-24 21:55 +0000 Tag as livecd-tools-17.9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT5chQRF+jBaO/jp/AQIZagf+NHtRCwZYBD53uZ5xNvy3jXlEgfTNQaOr 6KAnJfBXNftkSqIOf7S/n3esSJ/4+r6xl1x/i5TYNgTcegwvnmdOJ1Vt3UcRg+Q4 KRxpfAiIdD5QeL3fRd16i2MLZjaSc5XH7rMD4TooLtiIW1v2isCXOlazBhg2MkSx RMfG3HsEGtpbXIKh10qBEZnedHv0nYpYRDpxPsmZN9Hsk5niIgXHDmhxtY1NHe4u 5aEqcyuxXq6q94HIoEMPQYYzdcBs4W5KKPVBBiEdQTBdEU5bVXSu507XAye8QBxJ qt2M4O8YHfhd7w14cuZUCX1eJhAxZaX/oPNQ/lIs16dGDPF9fM4INA== =m73P -----END PGP SIGNATURE----- Changes since livecd-tools-17.8: Bill Nottingham (1): allow for use of yum plugins during livecd creation Brian C. Lane (3): check for LIVE-REPO partition when writing DVD (#813905) fix quoting with basename and SRC (#814174) Version 17.9 Matthew Garrett (2): Add tighter Mac boot image integration Capitalise EFI names --- Makefile | 2 +- imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ tools/livecd-iso-to-disk.sh | 34 +++++++++++++++++++++++++++------- 6 files changed, 52 insertions(+), 18 deletions(-) ---

1 0

Branch 'f17-branch' - Makefile
by Brian C. Lane 24 Apr '12

24 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30c7b17ed5305655a1f419f77ab58e3747364927 Author: Brian C. Lane <bcl(a)redhat.com> Date: Tue Apr 24 14:55:05 2012 -0700 Version 17.9 diff --git a/Makefile b/Makefile index 1f504e1..0667a0b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 17.8 +VERSION = 17.9 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

Changes to 'refs/tags/livecd-tools-18.4'
by Brian C. Lane 24 Apr '12

24 Apr '12

Tag 'livecd-tools-18.4' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-24 21:54 +0000 Tag as livecd-tools-18.4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT5chAhF+jBaO/jp/AQJ52wf/WNv29WIc6a/lS8QQuw5HuOUz3TgVlRt2 7dvhbjboB4TELlirxMKm4xuHPgH+AGhSWf9xJsMwTp4nIjIRWSimK4RU+l44emXC S1REIHu0dScr6Ouk/lrrfSUgklL3oCpr4CEEPpGsD9Igf22cZ+zqIyzMnWe/8lKL eCjyaBsOKYGNGMwJZtXcXcxpfhEgYp41WK0dC+PPmZ4wLcZvCLdKZKZMgIzRNsUo SfI7hxK4387bUJX5mwEB4sFsk5yJ559GSOjjE/LQlyVGudh+HuUj2UiFK0X6Js3S Ajxg1C8ttLSVoB697sIZgooU5kPXlqrnkLBw0Nb5gIsEiTsYX89ajA== =gdPu -----END PGP SIGNATURE----- Changes since livecd-tools-18.3: Bill Nottingham (1): allow for use of yum plugins during livecd creation Brian C. Lane (3): check for LIVE-REPO partition when writing DVD (#813905) fix quoting with basename and SRC (#814174) Version 18.4 Matthew Garrett (2): Add tighter Mac boot image integration Capitalise EFI names --- Makefile | 2 +- imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ tools/livecd-iso-to-disk.sh | 34 +++++++++++++++++++++++++++------- 6 files changed, 52 insertions(+), 18 deletions(-) ---

1 0

Makefile
by Brian C. Lane 24 Apr '12

24 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e2b586ae20288d1b1ba4dae7e9e341d77f9b78b Author: Brian C. Lane <bcl(a)redhat.com> Date: Tue Apr 24 14:53:55 2012 -0700 Version 18.4 diff --git a/Makefile b/Makefile index c1ed0ac..fa54bf0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 18.3 +VERSION = 18.4 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

3 commits - imgcreate/creator.py imgcreate/live.py imgcreate/yuminst.py tools/livecd-creator
by Brian C. Lane 24 Apr '12

24 Apr '12

imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ 4 files changed, 24 insertions(+), 10 deletions(-) New commits: commit 29303d0b2547c2da87a437c517267417d84581de Author: Bill Nottingham <notting(a)redhat.com> Date: Mon Apr 23 18:31:22 2012 -0400 allow for use of yum plugins during livecd creation https://bugzilla.redhat.com/show_bug.cgi?id=813429 This adds an option ("-p", or "--plugins") to livecd-creator to allow for the use of yum plugins during image creation. The initial usage case is for localized live images that want to use yum-langpacks when creating their live image so that they include the proper language packs for their locale. Aside from the noise of propagating the commandline options down to the yum instance, there is a bugfix where we re-call repository setup after we've actually added the repositories; this is required so that plugins operate properly. Bill diff --git a/imgcreate/creator.py b/imgcreate/creator.py index 35fe777..d8249cb 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -51,7 +51,7 @@ class ImageCreator(object): """ - def __init__(self, ks, name, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize an ImageCreator instance. ks -- a pykickstart.KickstartParser instance; this instance will be @@ -72,6 +72,7 @@ class ImageCreator(object): """A name for the image.""" self.releasever = releasever + self.useplugins = useplugins self.tmpdir = tmpdir """The directory in which all temporary files will be created.""" @@ -617,7 +618,7 @@ class ImageCreator(object): """ yum_conf = self._mktemp(prefix = "yum.conf-") - ayum = LiveCDYum(releasever=self.releasever) + ayum = LiveCDYum(releasever=self.releasever, useplugins=self.useplugins) ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): @@ -632,6 +633,7 @@ class ImageCreator(object): yr.proxy = proxy if cost is not None: yr.cost = cost + ayum.setup(yum_conf, self._instroot) if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") @@ -778,7 +780,7 @@ class LoopImageCreator(ImageCreator): """ - def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize a LoopImageCreator instance. This method takes the same arguments as ImageCreator.__init__() with @@ -787,7 +789,7 @@ class LoopImageCreator(ImageCreator): fslabel -- A string used as a label for any filesystems created. """ - ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir) + ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir, useplugins=useplugins) self.__fslabel = None self.fslabel = fslabel diff --git a/imgcreate/live.py b/imgcreate/live.py index d80f518..a73d7f0 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -40,7 +40,7 @@ class LiveImageCreatorBase(LoopImageCreator): """ def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", - title="Linux", product="Linux"): + title="Linux", product="Linux", useplugins=False): """Initialise a LiveImageCreator instance. This method takes the same arguments as LoopImageCreator.__init__(). @@ -49,7 +49,8 @@ class LiveImageCreatorBase(LoopImageCreator): LoopImageCreator.__init__(self, ks, name, fslabel=fslabel, releasever=releasever, - tmpdir=tmpdir) + tmpdir=tmpdir, + useplugins=useplugins) self.compress_type = "xz" """mksquashfs compressor to use.""" diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py index d835d9f..5605eea 100644 --- a/imgcreate/yuminst.py +++ b/imgcreate/yuminst.py @@ -45,12 +45,13 @@ class TextProgress(object): self.emit(logging.INFO, "...OK\n") class LiveCDYum(yum.YumBase): - def __init__(self, releasever=None): + def __init__(self, releasever=None, useplugins=False): """ releasever = optional value to use in replacing $releasever in repos """ yum.YumBase.__init__(self) self.releasever = releasever + self.useplugins = useplugins def doFileLogSetup(self, uid, logfile): # don't do the file log for the livecd as it can lead to open fds @@ -71,7 +72,10 @@ class LiveCDYum(yum.YumBase): conf = "[main]\n" conf += "installroot=%s\n" % installroot conf += "cachedir=/var/cache/yum\n" - conf += "plugins=0\n" + if self.useplugins: + conf += "plugins=1\n" + else: + conf += "plugins=0\n" conf += "reposdir=\n" conf += "failovermethod=priority\n" conf += "keepcache=1\n" diff --git a/tools/livecd-creator b/tools/livecd-creator index 6b2c799..8bb81aa 100755 --- a/tools/livecd-creator +++ b/tools/livecd-creator @@ -49,6 +49,9 @@ def parse_options(args): # Provided for img-create compatibility imgopt.add_option("-n", "--name", type="string", dest="fslabel", help=optparse.SUPPRESS_HELP) + imgopt.add_option("-p", "--plugins", action="store_true", dest="plugins", + help="Use yum plugins during image creation", + default=False) imgopt.add_option("", "--image-type", type="string", dest="image_type", help=optparse.SUPPRESS_HELP) imgopt.add_option("", "--compression-type", type="string", dest="compress_type", @@ -171,11 +174,13 @@ def main(): fslabel=fslabel, releasever=options.releasever, tmpdir=os.path.abspath(options.tmpdir), + useplugins=options.plugins, title=title, product=product) elif options.image_type == 'image': creator = imgcreate.LoopImageCreator(ks, name, fslabel=fslabel, releasever=options.releasever, + useplugins=options.plugins, tmpdir=os.path.abspath(options.tmpdir)) else: # Cannot happen, we validate this when parsing options. commit ace3d83189fe1b06640c5451316084f50cb0bd3c Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 10:41:48 2012 -0400 Capitalise EFI names The spec says these are mixed case, but the implementation has them as upper case. This is fine on vfat, but breaks on iso9660. Make them upper case. diff --git a/imgcreate/live.py b/imgcreate/live.py index 0fc20e9..d80f518 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -771,7 +771,7 @@ hiddenmenu os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT.conf") # for most things, we want them named boot$efiarch - efiarch = {"i386": "ia32", "x86_64": "x64"} + efiarch = {"i386": "IA32", "x86_64": "X64"} efiname = efiarch[rpmUtils.arch.getBaseArch()] os.rename(isodir + "/EFI/BOOT/grub.efi", isodir + "/EFI/BOOT/BOOT%s.efi" %(efiname,)) os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT%s.conf" %(efiname,)) commit 06322244dc56912366190cb53d9d0957959c6fd8 Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 09:47:31 2012 -0400 Add tighter Mac boot image integration Make sure that the Mac boot image ends up with an icon and has the product info set correctly. diff --git a/imgcreate/live.py b/imgcreate/live.py index c5c9db8..0fc20e9 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -234,7 +234,9 @@ class LiveImageCreatorBase(LoopImageCreator): subprocess.call(["mkefiboot", isodir + "/EFI/BOOT", isodir + "/isolinux/efiboot.img"]) subprocess.call(["mkefiboot", "-a", isodir + "/EFI/BOOT", - isodir + "/isolinux/macboot.img"]) + isodir + "/isolinux/macboot.img", "-l", self.product, + "-i", "/usr/share/pixmaps/bootloader/fedora.icns", + "-p", self.product]) def _create_bootconfig(self): """Configure the image so that it's bootable."""

1 0

Branch 'f17-branch' - 3 commits - imgcreate/creator.py imgcreate/live.py imgcreate/yuminst.py tools/livecd-creator
by Brian C. Lane 24 Apr '12

24 Apr '12

imgcreate/creator.py | 10 ++++++---- imgcreate/live.py | 11 +++++++---- imgcreate/yuminst.py | 8 ++++++-- tools/livecd-creator | 5 +++++ 4 files changed, 24 insertions(+), 10 deletions(-) New commits: commit 9b2965aa880e07b0ab805e8a996e21bec77da1b6 Author: Bill Nottingham <notting(a)redhat.com> Date: Mon Apr 23 18:31:22 2012 -0400 allow for use of yum plugins during livecd creation https://bugzilla.redhat.com/show_bug.cgi?id=813429 This adds an option ("-p", or "--plugins") to livecd-creator to allow for the use of yum plugins during image creation. The initial usage case is for localized live images that want to use yum-langpacks when creating their live image so that they include the proper language packs for their locale. Aside from the noise of propagating the commandline options down to the yum instance, there is a bugfix where we re-call repository setup after we've actually added the repositories; this is required so that plugins operate properly. Bill diff --git a/imgcreate/creator.py b/imgcreate/creator.py index 35fe777..d8249cb 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -51,7 +51,7 @@ class ImageCreator(object): """ - def __init__(self, ks, name, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize an ImageCreator instance. ks -- a pykickstart.KickstartParser instance; this instance will be @@ -72,6 +72,7 @@ class ImageCreator(object): """A name for the image.""" self.releasever = releasever + self.useplugins = useplugins self.tmpdir = tmpdir """The directory in which all temporary files will be created.""" @@ -617,7 +618,7 @@ class ImageCreator(object): """ yum_conf = self._mktemp(prefix = "yum.conf-") - ayum = LiveCDYum(releasever=self.releasever) + ayum = LiveCDYum(releasever=self.releasever, useplugins=self.useplugins) ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): @@ -632,6 +633,7 @@ class ImageCreator(object): yr.proxy = proxy if cost is not None: yr.cost = cost + ayum.setup(yum_conf, self._instroot) if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") @@ -778,7 +780,7 @@ class LoopImageCreator(ImageCreator): """ - def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp"): + def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", useplugins=False): """Initialize a LoopImageCreator instance. This method takes the same arguments as ImageCreator.__init__() with @@ -787,7 +789,7 @@ class LoopImageCreator(ImageCreator): fslabel -- A string used as a label for any filesystems created. """ - ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir) + ImageCreator.__init__(self, ks, name, releasever=releasever, tmpdir=tmpdir, useplugins=useplugins) self.__fslabel = None self.fslabel = fslabel diff --git a/imgcreate/live.py b/imgcreate/live.py index d80f518..a73d7f0 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -40,7 +40,7 @@ class LiveImageCreatorBase(LoopImageCreator): """ def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp", - title="Linux", product="Linux"): + title="Linux", product="Linux", useplugins=False): """Initialise a LiveImageCreator instance. This method takes the same arguments as LoopImageCreator.__init__(). @@ -49,7 +49,8 @@ class LiveImageCreatorBase(LoopImageCreator): LoopImageCreator.__init__(self, ks, name, fslabel=fslabel, releasever=releasever, - tmpdir=tmpdir) + tmpdir=tmpdir, + useplugins=useplugins) self.compress_type = "xz" """mksquashfs compressor to use.""" diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py index d835d9f..5605eea 100644 --- a/imgcreate/yuminst.py +++ b/imgcreate/yuminst.py @@ -45,12 +45,13 @@ class TextProgress(object): self.emit(logging.INFO, "...OK\n") class LiveCDYum(yum.YumBase): - def __init__(self, releasever=None): + def __init__(self, releasever=None, useplugins=False): """ releasever = optional value to use in replacing $releasever in repos """ yum.YumBase.__init__(self) self.releasever = releasever + self.useplugins = useplugins def doFileLogSetup(self, uid, logfile): # don't do the file log for the livecd as it can lead to open fds @@ -71,7 +72,10 @@ class LiveCDYum(yum.YumBase): conf = "[main]\n" conf += "installroot=%s\n" % installroot conf += "cachedir=/var/cache/yum\n" - conf += "plugins=0\n" + if self.useplugins: + conf += "plugins=1\n" + else: + conf += "plugins=0\n" conf += "reposdir=\n" conf += "failovermethod=priority\n" conf += "keepcache=1\n" diff --git a/tools/livecd-creator b/tools/livecd-creator index 6b2c799..8bb81aa 100755 --- a/tools/livecd-creator +++ b/tools/livecd-creator @@ -49,6 +49,9 @@ def parse_options(args): # Provided for img-create compatibility imgopt.add_option("-n", "--name", type="string", dest="fslabel", help=optparse.SUPPRESS_HELP) + imgopt.add_option("-p", "--plugins", action="store_true", dest="plugins", + help="Use yum plugins during image creation", + default=False) imgopt.add_option("", "--image-type", type="string", dest="image_type", help=optparse.SUPPRESS_HELP) imgopt.add_option("", "--compression-type", type="string", dest="compress_type", @@ -171,11 +174,13 @@ def main(): fslabel=fslabel, releasever=options.releasever, tmpdir=os.path.abspath(options.tmpdir), + useplugins=options.plugins, title=title, product=product) elif options.image_type == 'image': creator = imgcreate.LoopImageCreator(ks, name, fslabel=fslabel, releasever=options.releasever, + useplugins=options.plugins, tmpdir=os.path.abspath(options.tmpdir)) else: # Cannot happen, we validate this when parsing options. commit fb443dae640131cff2058f81dd8ab747be31914b Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 10:41:48 2012 -0400 Capitalise EFI names The spec says these are mixed case, but the implementation has them as upper case. This is fine on vfat, but breaks on iso9660. Make them upper case. diff --git a/imgcreate/live.py b/imgcreate/live.py index 0fc20e9..d80f518 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -771,7 +771,7 @@ hiddenmenu os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT.conf") # for most things, we want them named boot$efiarch - efiarch = {"i386": "ia32", "x86_64": "x64"} + efiarch = {"i386": "IA32", "x86_64": "X64"} efiname = efiarch[rpmUtils.arch.getBaseArch()] os.rename(isodir + "/EFI/BOOT/grub.efi", isodir + "/EFI/BOOT/BOOT%s.efi" %(efiname,)) os.link(isodir + "/EFI/BOOT/grub.conf", isodir + "/EFI/BOOT/BOOT%s.conf" %(efiname,)) commit 59e2bcf150480f9f1a28a6be45941fcfb1297234 Author: Matthew Garrett <mjg(a)redhat.com> Date: Tue Apr 24 09:47:31 2012 -0400 Add tighter Mac boot image integration Make sure that the Mac boot image ends up with an icon and has the product info set correctly. diff --git a/imgcreate/live.py b/imgcreate/live.py index c5c9db8..0fc20e9 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -234,7 +234,9 @@ class LiveImageCreatorBase(LoopImageCreator): subprocess.call(["mkefiboot", isodir + "/EFI/BOOT", isodir + "/isolinux/efiboot.img"]) subprocess.call(["mkefiboot", "-a", isodir + "/EFI/BOOT", - isodir + "/isolinux/macboot.img"]) + isodir + "/isolinux/macboot.img", "-l", self.product, + "-i", "/usr/share/pixmaps/bootloader/fedora.icns", + "-p", self.product]) def _create_bootconfig(self): """Configure the image so that it's bootable."""

1 0

[PATCH] allow for use of yum plugins during livecd creation
by Bill Nottingham 24 Apr '12

24 Apr '12

https://bugzilla.redhat.com/show_bug.cgi?id=813429 This adds an option ("-p", or "--plugins") to livecd-creator to allow for the use of yum plugins during image creation. The initial usage case is for localized live images that want to use yum-langpacks when creating their live image so that they include the proper language packs for their locale. Aside from the noise of propagating the commandline options down to the yum instance, there is a bugfix where we re-call repository setup after we've actually added the repositories; this is required so that plugins operate properly. Bill

2 2

Branch 'f16-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 23 Apr '12

23 Apr '12

tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2bc93c540c0b214c9bcede1e020c2242d91c2d4f Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 23 13:26:41 2012 -0700 fix quoting with basename and SRC (#814174) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 070a3b4..37abae0 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1109,8 +1109,8 @@ if [ "$srctype" = "installer" ]; then if [ -e $TGTMNT/$imgpath ]; then tbd=$(du -s -B 1M $TGTMNT/$imgpath | awk {'print $1;'}) fi - if [ -e $TGTMNT/$(basename "$SRC") ]; then - tbd=$(($tbd + $(du -s -B 1M $TGTMNT/$(basename "$SRC") | awk {'print $1;'}))) + if [ -e "$TGTMNT/$(basename "$SRC")" ]; then + tbd=$(($tbd + $(du -s -B 1M "$TGTMNT/$(basename "$SRC")" | awk {'print $1;'}))) fi echo "Size of $imgpath: $installimgsize" echo "Available space: $((freespace + tbd))"

1 0

Branch 'f17-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 23 Apr '12

23 Apr '12

tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4ba4b5dfbc158f6082aadfe09f7816949e4b1bba Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 23 13:26:41 2012 -0700 fix quoting with basename and SRC (#814174) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 13437d4..95f0fae 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1109,8 +1109,8 @@ if [ "$srctype" = "installer" ]; then if [ -e $TGTMNT/$imgpath ]; then tbd=$(du -s -B 1M $TGTMNT/$imgpath | awk {'print $1;'}) fi - if [ -e $TGTMNT/$(basename "$SRC") ]; then - tbd=$(($tbd + $(du -s -B 1M $TGTMNT/$(basename "$SRC") | awk {'print $1;'}))) + if [ -e "$TGTMNT/$(basename "$SRC")" ]; then + tbd=$(($tbd + $(du -s -B 1M "$TGTMNT/$(basename "$SRC")" | awk {'print $1;'}))) fi echo "Size of $imgpath: $installimgsize" echo "Available space: $((freespace + tbd))"

1 0

tools/livecd-iso-to-disk.sh
by Brian C. Lane 23 Apr '12

23 Apr '12

tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5ed65059ca0b644ba21eda6d4f730d8e9160a93e Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 23 13:26:41 2012 -0700 fix quoting with basename and SRC (#814174) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 13437d4..95f0fae 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1109,8 +1109,8 @@ if [ "$srctype" = "installer" ]; then if [ -e $TGTMNT/$imgpath ]; then tbd=$(du -s -B 1M $TGTMNT/$imgpath | awk {'print $1;'}) fi - if [ -e $TGTMNT/$(basename "$SRC") ]; then - tbd=$(($tbd + $(du -s -B 1M $TGTMNT/$(basename "$SRC") | awk {'print $1;'}))) + if [ -e "$TGTMNT/$(basename "$SRC")" ]; then + tbd=$(($tbd + $(du -s -B 1M "$TGTMNT/$(basename "$SRC")" | awk {'print $1;'}))) fi echo "Size of $imgpath: $installimgsize" echo "Available space: $((freespace + tbd))"

1 0

livecd-creator arbitrary fsck errors
by Alex 23 Apr '12

23 Apr '12

Hi I have a huge problem building a RHEL6 LiveCD/DVD. This happend on two different virtual machines I used to build a LiveCD, thats why I'm writing to this list. Setup: Clean RHEL6.2 Install, >30GB free space available. Aim: RHEL6 LiveCD with some extra packages. After a few successfull builds (3 - 4, sometimes after 1) livecd-creator stops working. If I try to build a LiveCD I always get the following error: Error creating Live CD : fsck after resize returned an error! image to debug at /tmp/resize-image-ZJgv1q I try to build the LiveCD with the following line: livecd-creator -c fedora-livecd-desktop.ks -f rhel6-live -t /var/tmp/rhel6-live/ --cache /var/cache/rhel6-live/ -d -v --logfile=/root/spin-kickstarts-kundrak/rhel6-live.log I run the commandline within a simple shellscript which exports LANG=C prior to starting livecd-creator as I read on an old post on this list, that this could be an issue. Because it drove me nuts, I (manually) logged the configuration (added packages, changed settings) of my runs on the second machine. I thought this would be a good idea because then I'm able to revert my steps and always have a working base-configuration. But even when I'm reverting my last step after it stopped working, it still doesn't work and breaks with the same error. Between the runs, I cleaned the cache & tmp dir and even did reboots. But still no luck. It can't be the repo configuration or other stuff like the part size etc., because when it runs without an error, I cant boot the livecd and all extra packages I included are available. Why is it sometimes working and why not? Do you have any suggestions? I really appreciate any help! Thanks, Alex Here is the error from livecd-creator: umount: /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root: device is busy. (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1)) Unmounting directory /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root failed, using lazy umount lazy umount succeeded on /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root loop: can't delete device /dev/loop2: Device or resource busy e2fsck 1.41.12 (17-May-2010) _rhel6-live: recovering journal Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts Pass 5: Checking group summary information _rhel6-live: ***** FILE SYSTEM WAS MODIFIED ***** _rhel6-live: 97630/196608 files (0.1% non-contiguous), 611369/786432 blocks e2image 1.41.12 (17-May-2010) resize2fs 1.41.12 (17-May-2010) Resizing the filesystem on /var/tmp/rhel6-live/imgcreate-lIbnh_/tmp-bUcK4E/ext3fs.img to 617874 (4k) blocks. The filesystem on /var/tmp/rhel6-live/imgcreate-lIbnh_/tmp-bUcK4E/ext3fs.img is now 617874 blocks long. e2fsck 1.41.12 (17-May-2010) _rhel6-live: recovering journal The filesystem size (according to the superblock) is 786432 blocks The physical size of the device is 617874 blocks Either the superblock or the partition table is likely to be corrupt! Abort? yes /usr/lib/python2.6/site-packages/imgcreate/errors.py:45: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6 return unicode(self.message) Here is the full output of my (debug enabled) log: Extending sparse file /var/tmp/rhel6-live/imgcreate-lIbnh_/tmp-bUcK4E/ext3fs.img to 3221225472 Mounting /dev/loop2 at /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root No such package java-1.6.0-openjdk-plugin to remove No such package mpage to remove No such package ibus-pinyin-open-phrase to remove No such package constantine-backgrounds-extras to remove No such package specspo to remove No such package system-config-rootpassword to remove No such package evolution-help to remove No such package gnome-games-help to remove No such package desktop-backgrounds-basic to remove No such package system-config-boot to remove No such package system-config-network to remove Unmounting directory /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root Unmounting directory /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root failed, using lazy umount lazy umount succeeded on /var/tmp/rhel6-live/imgcreate-lIbnh_/install_root Losetup remove /dev/loop2 Checking filesystem /var/tmp/rhel6-live/imgcreate-lIbnh_/tmp-bUcK4E/ext3fs.img Checking filesystem /var/tmp/rhel6-live/imgcreate-lIbnh_/tmp-bUcK4E/ext3fs.img Error creating Live CD : fsck after resize returned an error! image to debug at /tmp/resize-image-TxijRK

3 3

Branch 'f16-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 19 Apr '12

19 Apr '12

tools/livecd-iso-to-disk.sh | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) New commits: commit 1013b009e4ea2bb2f6dca36c51ef469ad6578fc2 Author: Brian C. Lane <bcl(a)redhat.com> Date: Wed Apr 18 17:04:02 2012 -0700 check for LIVE-REPO partition when writing DVD (#813905) When writing a DVD to a device using livecd-iso-to-disk it needs a second partition for the iso with the packages. Using --format sets this up, but it was not working correctly without adding --format. It would instead write the iso to the / of the host system. This fixes the problem by looking for the LIVE-REPO partition as p2 of the device and exiting if it is not found. This also adds --inplace to sync so that devices with limited space can be updated without reformatting. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index fe4e59b..070a3b4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -460,7 +460,6 @@ createGPTLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -517,7 +516,6 @@ createMSDOSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -577,7 +575,6 @@ createEXTFSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : $mkfs -L LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -653,6 +650,25 @@ checkFilesystem() { fi } +# Check partition 2 to see if it has been setup as LIVE-REPO +# Setup REPODEV for later use +findLIVEREPO() { + dev=$1 + getdisk $dev + + if [ -b ${device}2 ]; then + label=$(/sbin/blkid -s LABEL -o value ${device}2) + if [ "$label" == "LIVE-REPO" ]; then + echo "Found LIVE-REPO on ${device}2" + REPODEV=${device}2 + return + fi + fi + echo "DVD installs need a second partition labeled LIVE-REPO." + echo "This is setup when you use --format" + exitclean +} + checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -741,7 +757,7 @@ cp_p() { copyFile() { if [ -x /usr/bin/rsync ]; then - rsync -P "$1" "$2" + rsync --inplace -P "$1" "$2" return fi if [ -x /usr/bin/gvfs-copy ]; then @@ -931,6 +947,9 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi +elif [ -n "$packages" ]; then + # Need the LIVE-REPO partition to copy the .iso to + findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -975,6 +994,7 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean if [ -n "$REPODEV" ]; then + REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) mount $mountopts $REPODEV $REPOMNT || exitclean fi @@ -1158,7 +1178,7 @@ if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ fi # Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" ]; then +if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then echo "Copying $SRC" copyFile "$SRC" $REPOMNT/ sync

1 0

Branch 'f17-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 19 Apr '12

19 Apr '12

tools/livecd-iso-to-disk.sh | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) New commits: commit 2216681f838a43e245ac13c9b7c40ca24a4b5128 Author: Brian C. Lane <bcl(a)redhat.com> Date: Wed Apr 18 17:04:02 2012 -0700 check for LIVE-REPO partition when writing DVD (#813905) When writing a DVD to a device using livecd-iso-to-disk it needs a second partition for the iso with the packages. Using --format sets this up, but it was not working correctly without adding --format. It would instead write the iso to the / of the host system. This fixes the problem by looking for the LIVE-REPO partition as p2 of the device and exiting if it is not found. This also adds --inplace to sync so that devices with limited space can be updated without reformatting. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index f428812..13437d4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -460,7 +460,6 @@ createGPTLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -517,7 +516,6 @@ createMSDOSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -577,7 +575,6 @@ createEXTFSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : $mkfs -L LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -653,6 +650,25 @@ checkFilesystem() { fi } +# Check partition 2 to see if it has been setup as LIVE-REPO +# Setup REPODEV for later use +findLIVEREPO() { + dev=$1 + getdisk $dev + + if [ -b ${device}2 ]; then + label=$(/sbin/blkid -s LABEL -o value ${device}2) + if [ "$label" == "LIVE-REPO" ]; then + echo "Found LIVE-REPO on ${device}2" + REPODEV=${device}2 + return + fi + fi + echo "DVD installs need a second partition labeled LIVE-REPO." + echo "This is setup when you use --format" + exitclean +} + checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -741,7 +757,7 @@ cp_p() { copyFile() { if [ -x /usr/bin/rsync ]; then - rsync -P "$1" "$2" + rsync --inplace -P "$1" "$2" return fi if [ -x /usr/bin/gvfs-copy ]; then @@ -931,6 +947,9 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi +elif [ -n "$packages" ]; then + # Need the LIVE-REPO partition to copy the .iso to + findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -975,6 +994,7 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean if [ -n "$REPODEV" ]; then + REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) mount $mountopts $REPODEV $REPOMNT || exitclean fi @@ -1158,7 +1178,7 @@ if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ fi # Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" ]; then +if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then echo "Copying $SRC" copyFile "$SRC" $REPOMNT/ sync

1 0

tools/livecd-iso-to-disk.sh
by Brian C. Lane 19 Apr '12

19 Apr '12

tools/livecd-iso-to-disk.sh | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) New commits: commit b62f88f0490f61455a119ff519574585620aa813 Author: Brian C. Lane <bcl(a)redhat.com> Date: Wed Apr 18 17:04:02 2012 -0700 check for LIVE-REPO partition when writing DVD (#813905) When writing a DVD to a device using livecd-iso-to-disk it needs a second partition for the iso with the packages. Using --format sets this up, but it was not working correctly without adding --format. It would instead write the iso to the / of the host system. This fixes the problem by looking for the LIVE-REPO partition as p2 of the device and exiting if it is not found. This also adds --inplace to sync so that devices with limited space can be updated without reformatting. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index f428812..13437d4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -460,7 +460,6 @@ createGPTLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -517,7 +516,6 @@ createMSDOSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : /sbin/mkdosfs -n LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -577,7 +575,6 @@ createEXTFSLayout() { REPODEV=${device}2 umount $REPODEV &> /dev/null || : $mkfs -L LIVE-REPO $REPODEV - REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" fi } @@ -653,6 +650,25 @@ checkFilesystem() { fi } +# Check partition 2 to see if it has been setup as LIVE-REPO +# Setup REPODEV for later use +findLIVEREPO() { + dev=$1 + getdisk $dev + + if [ -b ${device}2 ]; then + label=$(/sbin/blkid -s LABEL -o value ${device}2) + if [ "$label" == "LIVE-REPO" ]; then + echo "Found LIVE-REPO on ${device}2" + REPODEV=${device}2 + return + fi + fi + echo "DVD installs need a second partition labeled LIVE-REPO." + echo "This is setup when you use --format" + exitclean +} + checkSyslinuxVersion() { if [ ! -x /usr/bin/syslinux ]; then echo "You need to have syslinux installed to run this script" @@ -741,7 +757,7 @@ cp_p() { copyFile() { if [ -x /usr/bin/rsync ]; then - rsync -P "$1" "$2" + rsync --inplace -P "$1" "$2" return fi if [ -x /usr/bin/gvfs-copy ]; then @@ -931,6 +947,9 @@ if [ -n "$format" -a -z "$skipcopy" ]; then else createEXTFSLayout $TGTDEV fi +elif [ -n "$packages" ]; then + # Need the LIVE-REPO partition to copy the .iso to + findLIVEREPO $TGTDEV fi checkFilesystem $TGTDEV @@ -975,6 +994,7 @@ fi TGTMNT=$(mktemp -d /media/tgttmp.XXXXXX) mount $mountopts $TGTDEV $TGTMNT || exitclean if [ -n "$REPODEV" ]; then + REPOLABEL="UUID=$(/sbin/blkid -s UUID -o value $REPODEV)" REPOMNT=$(mktemp -d /media/repotmp.XXXXXX) mount $mountopts $REPODEV $REPOMNT || exitclean fi @@ -1158,7 +1178,7 @@ if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ fi # Copy source .iso to repo partition -if [ -n "$packages" -a -z "$skipcopy" ]; then +if [ -n "$packages" -a -z "$skipcopy" -a -n "$REPOMNT" ]; then echo "Copying $SRC" copyFile "$SRC" $REPOMNT/ sync

1 0

Changes to 'refs/tags/livecd-tools-16.12'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-16.12' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-17 00:36 +0000 Tag as livecd-tools-16.12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT4y7ABF+jBaO/jp/AQL+ggf8Dbk9mpGz6C8t0TfEQ1T9DfFDI93bziMI c3JLuNoi/drGAG97NgI/iyjrZzhTIb35kQiqVnk5Ekg5Zk3f+l9MfvusmqaOHrl5 PWsdMJkNiypy/0Ol44kqoUSGGnQcc9bSwlprfN6Dsm84AyIFAYl/E6QR2ED4jUdS 5FI3411se8hk2B4NA4ZYB17wyx/Lx6WMKszj43vmm0PFanwHuU+5zIm8b8uE7c1P VmThldDhW7DJA0/IA0JjgZAj5j6KiIsF+FFRXpYmWii/+RFh4vas4SAejgTwvReL OlEsycDKkoYAApW5rcmZf4EstPD7jEmTiSWwO/oNhtbp3tx4dxyLuQ== =5mok -----END PGP SIGNATURE----- Changes since livecd-tools-16.11: Brian C. Lane (4): fix syntax problem in detectsrctype remove kernel and initrd from EFI/BOOT (#811438) skip copying DVD image file with skipcopy option (786037) Version 16.12 Mads Kiilerich (1): add support for cost in kickstart repo line (#735079) --- Makefile | 2 +- imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- imgcreate/live.py | 9 ++------- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 7 ++++--- 6 files changed, 12 insertions(+), 14 deletions(-) ---

1 0

Branch 'f16-branch' - Makefile
by Brian C. Lane 17 Apr '12

17 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0fca6d54642cbcc916a8b721c0b02c5cd08700b3 Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 17:36:12 2012 -0700 Version 16.12 diff --git a/Makefile b/Makefile index ebaccb2..7922b65 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 16.11 +VERSION = 16.12 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

Changes to 'refs/tags/livecd-tools-17.8'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-17.8' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-17 00:29 +0000 Tag as livecd-tools-17.8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT4y5dBF+jBaO/jp/AQI/gAf/W3R4yW+5vg3mv3O0sPyf6oSko8CuSxrF g5mWq06yk12gwtmRzA5CAGS0q/n3084vndCtINezlMmKVCOhILBqZ/o4pbSuecNW d78D/ckfbV0UCiMpRJvv6kPpoen3d0Rn8ZNyDBd1Hf+Tja03kWUYX6tNdgPhCCk7 ntPeBLTqjNhvb974HFdHY5o5QwfF4ADtL4CwPZbRuTX9fspAu44FlgwHAmN7zRwM nyS8BERP110pF+YhneHoWL+dioZbv2CqaSHRmhpvcm3ro3/gzTMpQbXdx0lTeFYh lHaXFSiBWFZlfyzQfGa07jwMbmOWT3E7ReuhZEiyPe/vAYlR7DKiTw== =hCkj -----END PGP SIGNATURE----- Changes since livecd-tools-17.7: Brian C. Lane (4): fix syntax problem in detectsrctype remove kernel and initrd from EFI/BOOT (#811438) skip copying DVD image file with skipcopy option (786037) Version 17.8 Mads Kiilerich (1): add support for cost in kickstart repo line (#735079) --- Makefile | 2 +- imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- imgcreate/live.py | 9 ++------- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 7 ++++--- 6 files changed, 12 insertions(+), 14 deletions(-) ---

1 0

Branch 'f17-branch' - Makefile
by Brian C. Lane 17 Apr '12

17 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cdfcfeea5a8cabb6ebf7ffd8c70969bcdcf057f Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 17:29:05 2012 -0700 Version 17.8 diff --git a/Makefile b/Makefile index 0cc83ac..1f504e1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 17.7 +VERSION = 17.8 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

Changes to 'refs/tags/livecd-tools-18.3'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-18.3' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-17 00:23 +0000 Tag as livecd-tools-18.3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT4y37BF+jBaO/jp/AQLWdwgAnLwm8FFYM4hNgQpr+u+lDOg1ESVz282d ssecljxHdXo+ts6ZHDxg94Casva0wf37Ktg4Mlawa97rR7FUfpVSmRyrwwyDjQEn 7TdyrBAyPL51xnupqJUKo6aXdjQZFr9060vQ73Pn+j73/zVq5dHwPHO8UsNW7UV5 JOndTj9CXSbquEpKsQR9dCGNvd6hVzlpLJ1k837gDSg/wLrMaBeCY2++eIGLFcMc htKkn5AUTppRWfIp4PKfQbV5jUTtdbwBjeiKHTnzy+VbmyEOqt/j7lQjGbtKqkin GkNsMxzi6pd9H6qW9U/cwgUZSzmk2in2nTBU3Tv7lyKYWZWwoGcHZQ== =7EJP -----END PGP SIGNATURE----- Changes since livecd-tools-18.2: Brian C. Lane (4): fix syntax problem in detectsrctype remove kernel and initrd from EFI/BOOT (#811438) skip copying DVD image file with skipcopy option (786037) Version 18.3 Mads Kiilerich (1): add support for cost in kickstart repo line (#735079) --- Makefile | 2 +- imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- imgcreate/live.py | 9 ++------- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 7 ++++--- 6 files changed, 12 insertions(+), 14 deletions(-) ---

1 0

Changes to 'refs/tags/livecd-tools-18.2'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-18.2' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:02 +0000 Tag as livecd-tools-18.2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT0+rnRF+jBaO/jp/AQLorQgAhqaqn7Yy9ShBhSKLStaNI2+gIQWpwpC4 /X6vBnc/mYxgUuw5MqtcbvG4OY6C7UfiyeF8AtZ06NE5XhNyOG44v/0+NN2ZyA7y sYYNsyx18YMXoxuyRy6ZzXJP/Gk4bC5+ul4y9+v5v0lfwXZmkGY/CGxej+3ZO8Rg 5YqeSbINX+9AJKnvxkqW0cqe7MgjLQCBqZeakHGlFaNc7+wbARCuiLxY1dp5BTpa H5YjoJqicIlsDh2IJWqRXrhtRqVYezllwFPlL1CUP5JZNiK0jRuRxHYjdqvPSdN/ xP19vGHAzTdEm648kUYz+GWOKNSBmj6HFXxOveyO9Qiz38/2inXx4g== =e2rE -----END PGP SIGNATURE----- Changes since livecd-tools-18.1: Brian C. Lane (2): livecd-iso-to-disk: Add 2MB slop to calculation Version 18.2 Matthew Garrett (2): Add support for generating EFI-bootable hybrid images Change EFI/boot to EFI/BOOT --- Makefile | 2 - imgcreate/live.py | 58 ++++++++++++++++++++++++++++++-------------- tools/edit-livecd | 4 +-- tools/livecd-iso-to-disk.sh | 8 +++--- 4 files changed, 47 insertions(+), 25 deletions(-) ---

1 0

Changes to 'refs/tags/livecd-tools-17.7'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-17.7' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:10 +0000 Tag as livecd-tools-17.7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT0+tkxF+jBaO/jp/AQJYGAgAndUL+HuyEiBszWosFa4RkojdGnOQaYTL XD9ENqS4TyhS2rHuxOOnPfksgBJeJYXLUziOY8AmC5OI19GW8AoxRDFsvi8wC3M9 l77BVA3nCtW5JWCQ/3HCRXUWTUUZX/38m8klRkkLXMvjm8cZ22dwBf7Y650dNiZ8 TjZBJVHOziGnZ81V6EeEYOY7jU/WyIL8EwHaEdL+6lLeiVjhV7AUpxHPyiTRyDpm 5+UH+oWXbhvWO1oWgOwapB2ARe0D5FiSI3AHyQUNvcGg0PhSV4G9ty1o2OaF6Uik 16w+Avgen0pxIzZILSJ2wJYrZrDA55ZERrXMKn+qiSz9XSoFgBkqJQ== =rR8F -----END PGP SIGNATURE----- Changes since livecd-tools-17.6: Brian C. Lane (2): livecd-iso-to-disk: Add 2MB slop to calculation Version 17.6 Matthew Garrett (2): Add support for generating EFI-bootable hybrid images Change EFI/boot to EFI/BOOT --- Makefile | 2 - imgcreate/live.py | 58 ++++++++++++++++++++++++++++++-------------- tools/edit-livecd | 4 +-- tools/livecd-iso-to-disk.sh | 8 +++--- 4 files changed, 47 insertions(+), 25 deletions(-) ---

1 0

Changes to 'refs/tags/livecd-tools-16.11'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-16.11' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:21 +0000 Tag as livecd-tools-16.11 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT0+wExF+jBaO/jp/AQIAfQgAov5CqdqXi21GaXNbchiv4NZ2sVMcGYxf OLAJ4WnB68fmiLd1wgfoLAbg5COQWAzuDisZzKJNmBdD33DISNGdcK6nPqLmkCpg fy4bEYxp6gpOGexVK3bMsaUFv8zq08maX7Pn26fbQCxV69BuTsRcI2PsYAN+bs1z SwDI3aT6XvMctfbVfxkBPfZEqeSnU5KXD03fT4/0YUQMLHZ2OsEujEZBgXhZCYhY von6Y+0e8Au9SonNV4Xzuw1e8jv1fHJMniEgQtUZQ9OJZ1nTRo9UgGZz9k7CgyU6 fecbgIjAiGVqnl7rAnytR+rV7epyvE2uBaT/UchzYXSZ9e8DNNFTpA== =HEdC -----END PGP SIGNATURE----- Changes since livecd-tools-16.10: Alan Pevec (1): edit-livecd: -k --kickstart option Brian C. Lane (9): dracut needs dmsquash-live explicitly included Use dracut.conf.d instead fo dracut.conf Fix the fix for dracut modules (#766955) Set base_persistdir (#741614) selinux may be off on the host, skip mount (#737064) imgcreate: fix typo in ResizeError livecd-iso-to-disk: create partition for iso livecd-iso-to-disk: Add 2MB slop to calculation Version 16.11 Joey Boggs (2): add missing selinux_mountpoint class object to edit-livecd check for valid script path before editing livecd image and update usage options confusion Matthew Garrett (2): Add support for generating EFI-bootable hybrid images Change EFI/boot to EFI/BOOT --- Makefile | 2 imgcreate/creator.py | 10 + imgcreate/fs.py | 2 imgcreate/kickstart.py | 8 + imgcreate/live.py | 63 +++++++---- imgcreate/yuminst.py | 1 tools/edit-livecd | 185 ++++++++++++++++++++++++++++---- tools/livecd-iso-to-disk.sh | 250 ++++++++++++++++++++++++++++++-------------- 8 files changed, 397 insertions(+), 124 deletions(-) ---

1 0

Changes to 'refs/tags/livecd-tools-15.12'
by Brian C. Lane 17 Apr '12

17 Apr '12

Tag 'livecd-tools-15.12' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:28 +0000 Tag as livecd-tools-15.12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEVAwUAT0+x1RF+jBaO/jp/AQK76gf/YY0v1kKl+ACk0OLlGYSjSJcGA5WwfvzB se9q8+oDsf2CSWVxR5D03WHltmBo/LtwAixK5+AFNl2KHs02WLcXyV24D1N69b8+ iM2oGPhK7BAwQFR4+DwK/dW9hG+V/DObu9k2xHSdJ4fK9XTL05LJ21v8QRsfOoT1 gwXh5v+hPJMyV0gr2/QzlhJEj361G78kHgf9FzFNiUvxDKGCWiHtCgJ2Kw9szk8S oRKNPtSj2nnOP8TuUx5qOFblb4u2G7udID+Bg5aNFQTN31giIJOXQMVNkWoEgxjg kg4VzF70Ul5jiuGTTUWuRglvfsqJRmafVnKocJ/TsXCTq6jG7q7ptA== =5OHc -----END PGP SIGNATURE----- Changes since livecd-tools-15.11: Alan Pevec (1): edit-livecd: -k --kickstart option Brian C. Lane (8): Install edit-livecd to /usr/bin dracut needs dmsquash-live explicitly included Use dracut.conf.d instead fo dracut.conf Fix the fix for dracut modules (#766955) Set base_persistdir (#741614) livecd-iso-to-disk: create partition for iso livecd-iso-to-disk: Add 2MB slop to calculation Version 15.12 Joey Boggs (2): add missing selinux_mountpoint class object to edit-livecd check for valid script path before editing livecd image and update usage options confusion --- Makefile | 3 imgcreate/creator.py | 4 imgcreate/kickstart.py | 8 + imgcreate/live.py | 5 imgcreate/yuminst.py | 1 tools/edit-livecd | 181 ++++++++++++++++++++++++++--- tools/livecd-iso-to-disk.sh | 266 ++++++++++++++++++++++++++++++-------------- 7 files changed, 363 insertions(+), 105 deletions(-) ---

1 0

Makefile
by Brian C. Lane 17 Apr '12

17 Apr '12

Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 997366b4c6f16fed4f90638ab5851776071b7b50 Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 17:22:31 2012 -0700 Version 18.3 diff --git a/Makefile b/Makefile index 8e67b05..c1ed0ac 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 18.2 +VERSION = 18.3 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL}

1 0

Branch 'f16-branch' - 4 commits - imgcreate/creator.py imgcreate/kickstart.py imgcreate/live.py tools/edit-livecd tools/livecd-iso-to-disk.sh
by Brian C. Lane 17 Apr '12

17 Apr '12

imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- imgcreate/live.py | 9 ++------- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 7 ++++--- 5 files changed, 11 insertions(+), 13 deletions(-) New commits: commit 74da00948fc8006918db86ae6805aeec05b0f328 Author: Mads Kiilerich <mads(a)kiilerich.com> Date: Mon Apr 16 16:44:33 2012 -0700 add support for cost in kickstart repo line (#735079) repo --cost is useful in overriding the default repo's packages. Signed-off-by: Brian C. Lane <bcl(a)redhat.com> diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e09bdcf..35fe777 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -621,7 +621,7 @@ class ImageCreator(object): ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo yr = ayum.addRepository(name, baseurl, mirrorlist) if inc: @@ -630,6 +630,8 @@ class ImageCreator(object): yr.exclude = exc if proxy: yr.proxy = proxy + if cost is not None: + yr.cost = cost if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 9fdd683..ad69a87 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -511,7 +511,7 @@ def get_repos(ks, repo_urls = {}): if repos.has_key(repo.name): logging.warn("Overriding already specified repo %s" %(repo.name,)) - repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc) + repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost) return repos.values() diff --git a/tools/edit-livecd b/tools/edit-livecd index 948064b..bb59c7f 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -524,7 +524,7 @@ class LiveImageEditor(LiveImageCreator): # start RPM transaction ts=rpm.TransactionSet(self._instroot) for repo in kickstart.get_repos(self.ks): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo if baseurl.startswith("file://"): baseurl=baseurl[7:] elif not baseurl.startswith("/"): commit d30d1300d6ea11ec4ed41920006a9b93189402fe Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 15:28:07 2012 -0700 skip copying DVD image file with skipcopy option (786037) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index d5d4db9..fe4e59b 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -615,7 +615,7 @@ checkFilesystem() { TGTFS=$(/sbin/blkid -s TYPE -o value $dev || :) if [ "$TGTFS" != "vfat" ] && [ "$TGTFS" != "msdos" ]; then if [ "$TGTFS" != "ext2" ] && [ "$TGTFS" != "ext3" ] && [ "$TGTFS" != "ext4" ] && [ "$TGTFS" != "btrfs" ]; then - echo "Target filesystem must be vfat, ext[234] or btrfs" + echo "Target filesystem ($dev:$TGTFS) must be vfat, ext[234] or btrfs" exitclean fi fi @@ -1145,7 +1145,7 @@ fi # DVD installer copy # Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then echo "Copying DVD image to target device." mkdir -p $TGTMNT/images/ if [ "$imgtype" = "install" ]; then commit 87af53859e0fb1e50fc05ea701f4dcc4a098ad36 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:48:13 2012 -0700 remove kernel and initrd from EFI/BOOT (#811438) The kernel and initrd don't need to be in the EFI/BOOT directory, they are already in the isolinux dir. A side-effect of this is that the efiboot.img and macboot.img were including them as well, causing the image size to be larger than it needed to be. livecd-iso-to-disk has also been adjusted to handle the new path in the EFI boot config. diff --git a/imgcreate/live.py b/imgcreate/live.py index 49fbf3c..656f49c 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -712,8 +712,8 @@ hiddenmenu args["rootlabel"] = "CDLABEL=%(fslabel)s" % args return """title %(long)s findiso - kernel /EFI/BOOT/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s - initrd /EFI/BOOT/initrd%(index)s.img + kernel /isolinux/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s + initrd /isolinux/initrd%(index)s.img """ %args def __get_efi_image_stanzas(self, isodir, name): @@ -757,11 +757,6 @@ hiddenmenu shutil.rmtree(isodir + "/EFI") return - for f in os.listdir(isodir + "/isolinux"): - os.link("%s/isolinux/%s" %(isodir, f), - "%s/EFI/BOOT/%s" %(isodir, f)) - - cfg = self.__get_basic_efi_config(name = self.name, timeout = self._timeout) cfg += self.__get_efi_image_stanzas(isodir, self.name) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 1ec42c6..d5d4db9 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1253,6 +1253,7 @@ fi # EFI images are in $SYSLINUXPATH now if [ -n "$efi" ]; then + sed -i -e "s;/isolinux/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi commit 7b58dc092fbf326cbb66be73dcd27326d5786afe Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:08:15 2012 -0700 fix syntax problem in detectsrctype diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index b5adf1e..1ec42c6 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -704,7 +704,7 @@ detectsrctype() { srctype=live return fi - if [ -e $SRCMNT/images/install.img -o $SRCMNT/isolinux/initrd.img ]; then + if [ -e $SRCMNT/images/install.img -o -e $SRCMNT/isolinux/initrd.img ]; then if [ -n "$packages" ]; then srctype=installer else

1 0

Branch 'f17-branch' - imgcreate/creator.py imgcreate/kickstart.py tools/edit-livecd
by Brian C. Lane 16 Apr '12

16 Apr '12

imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- tools/edit-livecd | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) New commits: commit ca55b00a50c286e7aa534c8fba4b531e634006a1 Author: Mads Kiilerich <mads(a)kiilerich.com> Date: Mon Apr 16 16:44:33 2012 -0700 add support for cost in kickstart repo line (#735079) repo --cost is useful in overriding the default repo's packages. Signed-off-by: Brian C. Lane <bcl(a)redhat.com> diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e09bdcf..35fe777 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -621,7 +621,7 @@ class ImageCreator(object): ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo yr = ayum.addRepository(name, baseurl, mirrorlist) if inc: @@ -630,6 +630,8 @@ class ImageCreator(object): yr.exclude = exc if proxy: yr.proxy = proxy + if cost is not None: + yr.cost = cost if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 9fdd683..ad69a87 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -511,7 +511,7 @@ def get_repos(ks, repo_urls = {}): if repos.has_key(repo.name): logging.warn("Overriding already specified repo %s" %(repo.name,)) - repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc) + repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost) return repos.values() diff --git a/tools/edit-livecd b/tools/edit-livecd index 948064b..bb59c7f 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -524,7 +524,7 @@ class LiveImageEditor(LiveImageCreator): # start RPM transaction ts=rpm.TransactionSet(self._instroot) for repo in kickstart.get_repos(self.ks): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo if baseurl.startswith("file://"): baseurl=baseurl[7:] elif not baseurl.startswith("/"):

1 0

imgcreate/creator.py imgcreate/kickstart.py tools/edit-livecd
by Brian C. Lane 16 Apr '12

16 Apr '12

imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- tools/edit-livecd | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) New commits: commit afea60cdbe85a9e770d8fc7bf3fd8b1ffb4d743a Author: Mads Kiilerich <mads(a)kiilerich.com> Date: Mon Apr 16 16:44:33 2012 -0700 add support for cost in kickstart repo line (#735079) repo --cost is useful in overriding the default repo's packages. Signed-off-by: Brian C. Lane <bcl(a)redhat.com> diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e09bdcf..35fe777 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -621,7 +621,7 @@ class ImageCreator(object): ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo yr = ayum.addRepository(name, baseurl, mirrorlist) if inc: @@ -630,6 +630,8 @@ class ImageCreator(object): yr.exclude = exc if proxy: yr.proxy = proxy + if cost is not None: + yr.cost = cost if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 9fdd683..ad69a87 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -511,7 +511,7 @@ def get_repos(ks, repo_urls = {}): if repos.has_key(repo.name): logging.warn("Overriding already specified repo %s" %(repo.name,)) - repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc) + repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost) return repos.values() diff --git a/tools/edit-livecd b/tools/edit-livecd index 948064b..bb59c7f 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -524,7 +524,7 @@ class LiveImageEditor(LiveImageCreator): # start RPM transaction ts=rpm.TransactionSet(self._instroot) for repo in kickstart.get_repos(self.ks): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo if baseurl.startswith("file://"): baseurl=baseurl[7:] elif not baseurl.startswith("/"):

1 0

tools/livecd-iso-to-disk.sh
by Brian C. Lane 16 Apr '12

16 Apr '12

tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e63eb0d5e739b68568837c15bfb3f791c284db7d Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 15:28:07 2012 -0700 skip copying DVD image file with skipcopy option (786037) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 8f8f6c4..f428812 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -615,7 +615,7 @@ checkFilesystem() { TGTFS=$(/sbin/blkid -s TYPE -o value $dev || :) if [ "$TGTFS" != "vfat" ] && [ "$TGTFS" != "msdos" ]; then if [ "$TGTFS" != "ext2" ] && [ "$TGTFS" != "ext3" ] && [ "$TGTFS" != "ext4" ] && [ "$TGTFS" != "btrfs" ]; then - echo "Target filesystem must be vfat, ext[234] or btrfs" + echo "Target filesystem ($dev:$TGTFS) must be vfat, ext[234] or btrfs" exitclean fi fi @@ -1145,7 +1145,7 @@ fi # DVD installer copy # Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then echo "Copying DVD image to target device." mkdir -p $TGTMNT/images/ if [ "$imgtype" = "install" ]; then

1 0

Branch 'f17-branch' - tools/livecd-iso-to-disk.sh
by Brian C. Lane 16 Apr '12

16 Apr '12

tools/livecd-iso-to-disk.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b4db87c231486c694b686e756138c4f692eaa783 Author: Brian C. Lane <bcl(a)redhat.com> Date: Mon Apr 16 15:28:07 2012 -0700 skip copying DVD image file with skipcopy option (786037) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 8f8f6c4..f428812 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -615,7 +615,7 @@ checkFilesystem() { TGTFS=$(/sbin/blkid -s TYPE -o value $dev || :) if [ "$TGTFS" != "vfat" ] && [ "$TGTFS" != "msdos" ]; then if [ "$TGTFS" != "ext2" ] && [ "$TGTFS" != "ext3" ] && [ "$TGTFS" != "ext4" ] && [ "$TGTFS" != "btrfs" ]; then - echo "Target filesystem must be vfat, ext[234] or btrfs" + echo "Target filesystem ($dev:$TGTFS) must be vfat, ext[234] or btrfs" exitclean fi fi @@ -1145,7 +1145,7 @@ fi # DVD installer copy # Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then +if [ -z "$skipcopy" -a $ "$srctype" = "installer" -o "$srctype" = "netinst" $ ]; then echo "Copying DVD image to target device." mkdir -p $TGTMNT/images/ if [ "$imgtype" = "install" ]; then

1 0

Compress packages
by Cadu 16 Apr '12

16 Apr '12

Hi! I'm running the follow command after add some packages at image *livecd-iso-to-disk-oc --noverify --home-size-mb 2048 --overlay-size-mb 2048 ${ISO} ${LOOP}* and return the message *getdisk DEV = /dev/loop2 Unable to fit live image + overlay on available space on USB stick + Size of live image: 2986 + Overlay size: 2048 + Home overlay size: 2048 --------------------------- = Requested: 7082 - Available: 7075 --------------------------- = To fit, free or decrease requested size total by: 7 Cleaning up to exit... * Is possible shrink /home to fit new package space requirements? Note: Using USB Device of 8GB. Thanks! -- []'s Carlos Eduardo * Seja a mudança que você deseja ver no mundo.* "Mahatma Gandhi" **** <http://www.frasesdodia.com.br/archives/80>

1 0

Failure in livecd-creator
by Randy Prakken 14 Apr '12

14 Apr '12

Here is information regarding a failure of livecd-creator. I'd be happy to test fixes as well. Environment: F16 LXDE 32b spin totally updated (a VM running in VMware Player). Goal: Build more up to date ISO of F16 LXDE How: - Used standard process, including standard fedora-live-minimization.ks, fedora-live-base.ks, fedora-livecd-lxde.ks. - Modified to remove office tools and sound but nothing important - Always run as root, plenty of disk space This worked perfectly until about 2 weeks ago when an F16 update broke it. It crashed out of Python at the end of the process. Sorry, I didn't save one of those. So, I got the most recent livecd-tools (16.11) from git and installed (make install). That installation seemed to be successful. Now it fails in Python, but with a different error: ... Installing: vconfig ##################### [919/919] 6872 blocks Removing password for user root. passwd: Success Note: Forwarding request to 'systemctl enable NetworkManager.service'. Note: Forwarding request to 'systemctl disable sshd.service'. rm '/etc/systemd/system/multi-user.target.wants/sshd.service' Traceback (most recent call last): File "/usr/bin/livecd-creator", line 210, in <module> sys.exit(main()) File "/usr/bin/livecd-creator", line 194, in main creator.configure() File "/usr/lib/python2.7/site-packages/imgcreate/creator.py", line 724, in configure self._create_bootconfig() File "/usr/lib/python2.7/site-packages/imgcreate/live.py", line 242, in _create_bootconfig self._generate_efiboot(self.__ensure_isodir()) File "/usr/lib/python2.7/site-packages/imgcreate/live.py", line 235, in _generate_efiboot isodir + "/isolinux/efiboot.img"]) File "/usr/lib/python2.7/subprocess.py", line 493, in call return Popen(*popenargs, **kwargs).wait() File "/usr/lib/python2.7/subprocess.py", line 679, in __init__ errread, errwrite) File "/usr/lib/python2.7/subprocess.py", line 1228, in _execute_child raise child_exception OSError: [Errno 2] No such file or directory

3 4

Branch 'f17-branch' - 2 commits - imgcreate/live.py tools/livecd-iso-to-disk.sh
by Brian C. Lane 12 Apr '12

12 Apr '12

imgcreate/live.py | 9 ++------- tools/livecd-iso-to-disk.sh | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) New commits: commit 673c2179a002f68b68ea8ebfac1f74f15a3702dd Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:48:13 2012 -0700 remove kernel and initrd from EFI/BOOT (#811438) The kernel and initrd don't need to be in the EFI/BOOT directory, they are already in the isolinux dir. A side-effect of this is that the efiboot.img and macboot.img were including them as well, causing the image size to be larger than it needed to be. livecd-iso-to-disk has also been adjusted to handle the new path in the EFI boot config. diff --git a/imgcreate/live.py b/imgcreate/live.py index adcf34f..c5c9db8 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -715,8 +715,8 @@ hiddenmenu args["rootlabel"] = "CDLABEL=%(fslabel)s" % args return """title %(long)s findiso - kernel /EFI/BOOT/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s - initrd /EFI/BOOT/initrd%(index)s.img + kernel /isolinux/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s + initrd /isolinux/initrd%(index)s.img """ %args def __get_efi_image_stanzas(self, isodir, name): @@ -755,11 +755,6 @@ hiddenmenu shutil.rmtree(isodir + "/EFI") return - for f in os.listdir(isodir + "/isolinux"): - os.link("%s/isolinux/%s" %(isodir, f), - "%s/EFI/BOOT/%s" %(isodir, f)) - - cfg = self.__get_basic_efi_config(name = self.name, timeout = self._timeout) cfg += self.__get_efi_image_stanzas(isodir, self.name) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index cc682a0..8f8f6c4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1253,6 +1253,7 @@ fi # EFI images are in $SYSLINUXPATH now if [ -n "$efi" ]; then + sed -i -e "s;/isolinux/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi commit b6c7ebfa713065a5ff126b18943ad5da6b57e914 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:08:15 2012 -0700 fix syntax problem in detectsrctype diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 533a13d..cc682a0 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -704,7 +704,7 @@ detectsrctype() { srctype=live return fi - if [ -e $SRCMNT/images/install.img -o $SRCMNT/isolinux/initrd.img ]; then + if [ -e $SRCMNT/images/install.img -o -e $SRCMNT/isolinux/initrd.img ]; then if [ -n "$packages" ]; then srctype=installer else

1 0

2 commits - imgcreate/live.py tools/livecd-iso-to-disk.sh
by Brian C. Lane 12 Apr '12

12 Apr '12

imgcreate/live.py | 9 ++------- tools/livecd-iso-to-disk.sh | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) New commits: commit f8c7e72593a61c2ebe46b0df202dc45cb16bef31 Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:48:13 2012 -0700 remove kernel and initrd from EFI/BOOT (#811438) The kernel and initrd don't need to be in the EFI/BOOT directory, they are already in the isolinux dir. A side-effect of this is that the efiboot.img and macboot.img were including them as well, causing the image size to be larger than it needed to be. livecd-iso-to-disk has also been adjusted to handle the new path in the EFI boot config. diff --git a/imgcreate/live.py b/imgcreate/live.py index adcf34f..c5c9db8 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -715,8 +715,8 @@ hiddenmenu args["rootlabel"] = "CDLABEL=%(fslabel)s" % args return """title %(long)s findiso - kernel /EFI/BOOT/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s - initrd /EFI/BOOT/initrd%(index)s.img + kernel /isolinux/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s + initrd /isolinux/initrd%(index)s.img """ %args def __get_efi_image_stanzas(self, isodir, name): @@ -755,11 +755,6 @@ hiddenmenu shutil.rmtree(isodir + "/EFI") return - for f in os.listdir(isodir + "/isolinux"): - os.link("%s/isolinux/%s" %(isodir, f), - "%s/EFI/BOOT/%s" %(isodir, f)) - - cfg = self.__get_basic_efi_config(name = self.name, timeout = self._timeout) cfg += self.__get_efi_image_stanzas(isodir, self.name) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index cc682a0..8f8f6c4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1253,6 +1253,7 @@ fi # EFI images are in $SYSLINUXPATH now if [ -n "$efi" ]; then + sed -i -e "s;/isolinux/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi commit 1693a45b01b23a150a29aa1dd96cf4cdd91aec5a Author: Brian C. Lane <bcl(a)redhat.com> Date: Thu Apr 12 11:08:15 2012 -0700 fix syntax problem in detectsrctype diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 533a13d..cc682a0 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -704,7 +704,7 @@ detectsrctype() { srctype=live return fi - if [ -e $SRCMNT/images/install.img -o $SRCMNT/isolinux/initrd.img ]; then + if [ -e $SRCMNT/images/install.img -o -e $SRCMNT/isolinux/initrd.img ]; then if [ -n "$packages" ]; then srctype=installer else

1 0

disk less
by jafar 1983 11 Apr '12

11 Apr '12

Hi I want to use livecd for disk less environment, but after running the command "livecd-iso-pxeboot" the initrd0.img is very big in size. how can I decrease the size of image as I only want to use runlevel 3 (text mode) on disk less clients. Is NFS is supported for the sharing of the image file. regards, jafar +923335498669

1 0

How to PXE boot a LiveCD ?
by Sukesh Nischal 10 Apr '12

10 Apr '12

Hi I'm trying to setup a PXE boot environment to start a LiveCD. I've setup DHCP/ tftpboot and this has tested fine doing kickstart installations. Next step is to be able to boot a live cd Ive created a custom live cd ISO which boots fine from a USB stick. I then ran livecd-iso-to-pxeboot to generate a tftpboot directory and merged this with my existing configs. The problem I'm getting is that the booting stops at 'Cannot open root device live:/livecd/livecd.iso' This is the entry I have in /var/lib/tftboot/pxelinux.cfg/default (amongst other working things) LABEL livecd KERNEL /livecd/vmlinuz0 APPEND rootflags=loop initrd=/livecd/initrd0.img root=live:/livecd/livecd.iso debug rootfstype=auto ro liveimg rd.luks=0 rd.md=0 rd.dm=0 Heres what I have in /var/lib/tftpboot/livecd # ls -lR /var/lib/tftpboot/livecd/ /var/lib/tftpboot/livecd/: total 1365096 -rw-r--r-- 1 root root 220 Mar 20 16:58 default -rw-r--r-- 1 root root 701686594 Mar 20 16:58 initrd0.img -rw-r--r-- 1 root root 26828 Mar 20 16:58 pxelinux.0 -rw-r--r-- 1 root root 692060160 Mar 20 16:57 livecd.iso -r--r--r-- 1 root root 4063584 Mar 20 16:58 vmlinuz0 This would be such a useful thing to have working, has anyone actually got this working? And can anyone see what I'm doing wrong?

3 5

getting edit-livecd working
by Tim Coote 02 Apr '12

02 Apr '12

Hullo I'm trying to modify an f16 livecd to enable ssh on boot, so that I can get to it when it's not in front of me. I'm using a physical laptop with an f16 install from livecd and then yum update'd the stock f16 livecd-tools falls over with this error: File "/usr/lib/python2.7/site-packages/imgcreate/creator.py", line 464, in __destroy_selinuxfs arglist = ["/bin/umount", self._instroot + self.__selinux_mountpoint + "/load"] AttributeError: 'LiveImageEditor' object has no attribute '_ImageCreator__selinux_mountpoint' Which if I look in the source of /usr/bin/edit-livecd seems to be understandable. If I update to the updates-testing repo version of livecd-tools: livecd-tools-16.11-1.fc16.i686 I get this error: [tim@pluto make]$ sudo edit-livecd -n withssh Fedora-16-i686-Live-Desktop.iso Fedora-16-i686-Live-Desktop.iso umount: /var/tmp/edit-liveos-W2ZKFk/install_root/sys/fs/selinux/load: not found Traceback (most recent call last): File "/usr/bin/edit-livecd", line 723, in <module> sys.exit(main()) File "/usr/bin/edit-livecd", line 697, in main editor.mount(LiveOS, cachedir = None) File "/usr/bin/edit-livecd", line 251, in mount os.symlink("../proc/mounts", self._instroot + "/etc/mtab") OSError: [Errno 17] File exists I *think* that this is because self._instroot is set to None in class LiveImageEditor(LiveImageCreator):, and does not appear to be reassigned. Should the f16 livecd-tools version of edit-livecd work and are there any particular options/configurations that I must set to get it to work? Or should I just install from somewhere else (I'd much rather not do that as it will screw up the other dependencies on the box, but if necessary, I could spin up a VM and do it on that.) All help gratefully received. Tim

2 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

livecd April 2012