Makefile | 2 +- imgcreate/kickstart.py | 17 ++++++++++++----- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 8 +++++--- 4 files changed, 19 insertions(+), 10 deletions(-)
New commits: commit 65e80bfd6e03c3a93392e9eada9aefe200a6cfa1 Author: Brian C. Lane <[email protected]> Date: Thu Aug 2 11:35:14 2012 -0700 Version 18.7 diff --git a/Makefile b/Makefile index b944b24..6d0335d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 18.6 +VERSION = 18.7 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 395368a01be152a5fca2c894553efc2987140479 Author: Frederick Grose <[email protected]> Date: Tue Jul 31 23:03:53 2012 -0400 Recognize rd.live.image as well as liveimg in sed scripts of livecd-iso-to-disk & edit-livecd diff --git a/tools/edit-livecd b/tools/edit-livecd index bb59c7f..1670228 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -423,7 +423,7 @@ class LiveImageEditor(LiveImageCreator): args.append('-e') args.append('s/rootfstype=[^ ]* [^ ]*/rootfstype=auto ro/') args.append('-e') - args.append('s/liveimg .* quiet/liveimg quiet/') + args.append('s/\(r*d*.*live.*ima*ge*\) .* quiet/\1 quiet/') args.append('-e') args.append('s/root=[^ ]*/root=live:CDLABEL=' + self.name + '/') if self.ks: diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 7df49c2..71fb288 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1174,7 +1174,7 @@ if [ "$srctype" = "live" ]; then if [[ -d $SRCMNT/syslinux/ ]]; then echo "Preparing boot config file." sed -i -e "s/root=live:[^ ]*/root=live:CDLABEL=name/"\ - -e "s/liveimg .* quiet/liveimg quiet/"\ + -e "s/\(r*d*.*live.*ima*ge*\) .* quiet/\1 quiet/"\ $BOOTCONFIG $BOOTCONFIG_EFI sed -i -e "s/^timeout.*$/timeout\ 100/"\ -e "/^totaltimeout.*$/d" $BOOTCONFIG @@ -1192,7 +1192,8 @@ if [ -n "$kernelargs" ]; then fi fi if [ "$LIVEOS" != "LiveOS" ]; then - sed -i -e "s;liveimg;liveimg live_dir=$LIVEOS;" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s;r*d*.*live.*ima*ge*;& live_dir=$LIVEOS;"\ + $BOOTCONFIG $BOOTCONFIG_EFI fi # EFI images are in $SYSLINUXPATH now @@ -1234,7 +1235,8 @@ if [ "$overlaysizemb" -gt 0 ]; then dd if=/dev/null of=$TGTMNT/$LIVEOS/$OVERFILE count=1 bs=1M seek=$overlaysizemb fi fi - sed -i -e "s/liveimg/liveimg overlay=${TGTLABEL}/" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s/r*d*.*live.*ima*ge*/& overlay=${TGTLABEL}/"\ + $BOOTCONFIG $BOOTCONFIG_EFI sed -i -e "s/\ ro\ /\ rw\ /" $BOOTCONFIG $BOOTCONFIG_EFI fi commit e346b72bbb9aa8067b84ea0da4cd288ba35df37c Author: Brian C. Lane <[email protected]> Date: Wed Aug 1 16:05:59 2012 -0700 fix /etc/localtime file vs. symlink (#829032) glibc > 2.15-41 uses a symlink for /etc/localtime, previously it was a copy of the file. diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 3bcbe1e..b66367c 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -153,11 +153,18 @@ class TimezoneConfig(KickstartConfig): f.write("ZONE=\"" + tz + "\"\n") f.write("UTC=" + utc + "\n") f.close() - try: - shutil.copy2(self.path("/usr/share/zoneinfo/%s" %(tz,)), - self.path("/etc/localtime")) - except OSError, e: - log.error("Error copying timezone: %s" %(e.strerror,)) + + # /etc/localtime is a symlink with glibc > 2.15-41 + if os.path.islink(self.path("/etc/localtime")): + os.unlink(self.path("/etc/localtime")) + os.symlink("/usr/share/zoneinfo/%s" %(tz,), + self.path("/etc/localtime")) + else: + try: + shutil.copy2(self.path("/usr/share/zoneinfo/%s" %(tz,)), + self.path("/etc/localtime")) + except (OSError, shutil.Error) as e: + log.error("Error copying timezone: %s" %(e.strerror,)) class AuthConfig(KickstartConfig): -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
