Branch 'f17-branch' - 3 commits - imgcreate/kickstart.py Makefile tools/edit-livecd tools/livecd-iso-to-disk.sh
by Brian C. Lane
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 7b452dc1c0306dc237ae602b2ea25324a991cff8
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Aug 2 11:37:29 2012 -0700
Version 17.13
diff --git a/Makefile b/Makefile
index 85ea462..66a2d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 17.12
+VERSION = 17.13
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 0ad4171f2183f9730fbd7d9abd28bd1704aee7d2
Author: Frederick Grose <fgrose(a)sugarlabs.org>
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 43aa3bbb6586b0a732e27ad44d12b21881ef10a4
Author: Brian C. Lane <bcl(a)redhat.com>
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 aca4043..cb9829c 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):
11 years, 8 months
- 1
- 0
Changes to 'refs/tags/livecd-tools-18.7'
by Brian C. Lane
Tag 'livecd-tools-18.7' created by Brian C. Lane <bcl(a)redhat.com> at 2012-08-02 18:35 +0000
Tag as livecd-tools-18.7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAUBrIexF+jBaO/jp/AQL+HAgAjQ292v4fyMxpPL25TfKeFgaao/qEM6pz
UhjGRkkxIa2Ls5HZaq3sxCLag9Hmill9zttXp6hURZ3NDfJVzuisqIrTLUe3wJ0r
heBwV1s1aSazzNH9WSYrZIKbBO7aTEITHUqCWYUxPfnXqfdUh1jWggHGU3cIuChB
aLsjkDS1ZBEDJw3b9PWUrJdeAgETg6w9xyv0Nl1o/1xjL/ER6JWUKKO/OXwWY8i2
0/jOFqrG+FUyU9PVQy9gbx5fG8xewSZDsX7gu0wfX550rk8xpuiOrGpxoxAGA+wf
GeATlC6zIEEDfv81JqfTJZCEkuMFHK7ZdiAxyi4JK/rQsWQKIgkmeQ==
=/2Gt
-----END PGP SIGNATURE-----
Changes since livecd-tools-18.6:
Brian C. Lane (2):
fix /etc/localtime file vs. symlink (#829032)
Version 18.7
Frederick Grose (1):
Recognize rd.live.image as well as liveimg in sed scripts of livecd-iso-to-disk & edit-livecd
---
Makefile | 2 +-
imgcreate/kickstart.py | 17 ++++++++++++-----
tools/edit-livecd | 2 +-
tools/livecd-iso-to-disk.sh | 8 +++++---
4 files changed, 19 insertions(+), 10 deletions(-)
---
11 years, 8 months
- 1
- 0
3 commits - imgcreate/kickstart.py Makefile tools/edit-livecd tools/livecd-iso-to-disk.sh
by Brian C. Lane
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 <bcl(a)redhat.com>
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 <fgrose(a)sugarlabs.org>
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 <bcl(a)redhat.com>
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):
11 years, 8 months
- 1
- 0
[PATCH] Recognize rd.live.image as well as liveimg in sed scripts of livecd-iso-to-disk & edit-livecd
by Frederick Grose
commit ee5d9b8b22039d83655bdb6235489995c87a7da9
Author: Frederick Grose <fgrose(a)sugarlabs.org>
Date: Tue Jul 31 22:48:49 2012 -0400
Recognize rd.live.image as well as liveimg in sed scripts.
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
11 years, 8 months
- 1
- 0