Patch review request for black screen fix
by Bruno Wolff III
This patch will break builds with generic-logos and that package is updated
to be consistent with fedora-logos. I suspect that will happen anyway, but
if this patch is accepted, I'll be filing a but against generic-logos.
The patch is attached and the commit log entry follows:
Change live.py to use the new location of the vesa splash image.
fedora-logos recently changed the location it uses for the vesa splash
image. This breaks (bug 615443) live images built using fedora-logos.
This patch changes the location that the image is fetched from to match
the one used by fedora-logos.
Note that generic-logos hasn't been changed to use the new location yet.
So this change will break live images built using generic-logos until
that package is updated to match fedora-logos in where it stores the
vesa splash image.
13 years, 8 months
docs/livecd-creator.pod imgcreate/fs.py imgcreate/live.py tools/livecd-creator
by Bruno Wolff III
docs/livecd-creator.pod | 4 ++--
imgcreate/fs.py | 4 ++--
imgcreate/live.py | 2 +-
tools/livecd-creator | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d17704983b857889612a6963b6bd7ef456d12e2e
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Jul 27 08:32:01 2010 -0500
Replace "zlib" with "gzip" to fix thinko with the compressor name.
The default compressor still worked because in that case the -comp option
isn't used. But still this should be made consistent with what mksquashsf
uses for compressor names.
diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
index 880ae19..e80a119 100644
--- a/docs/livecd-creator.pod
+++ b/docs/livecd-creator.pod
@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name.
=item --compression-type=COMPRESSOR
-Specify a compressor recognized by mksquashfs. The default is zlib. lzma
-currently requires a custom kernel to produce a functional image. If zlib
+Specify a compressor recognized by mksquashfs. The default is gzip. lzma
+currently requires a custom kernel to produce a functional image. If gzip
is used, the -comp option is not passed to mksquashfs to allow the use of
older versions of mksquashfs.
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index c5cd18b..554d1b9 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -41,8 +41,8 @@ def makedirs(dirname):
raise
def mksquashfs(in_img, out_img, compress_type):
-# Allow zlib to work for older versions of mksquashfs
- if compress_type == "zlib":
+# Allow gzip to work for older versions of mksquashfs
+ if compress_type == "gzip":
args = ["/sbin/mksquashfs", in_img, out_img]
else:
args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 36fef63..f349a1f 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator):
"""
LoopImageCreator.__init__(self, *args)
- self.compress_type = "zlib"
+ self.compress_type = "gzip"
"""mksquashfs compressor to use."""
self.skip_compression = False
diff --git a/tools/livecd-creator b/tools/livecd-creator
index 79fc944..d1727c5 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -42,8 +42,8 @@ def parse_options(args):
imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label",
help="File system label (default based on config name)")
imgopt.add_option("", "--compression-type", type="string", dest="compress_type",
- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)",
- default="zlib")
+ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)",
+ default="gzip")
parser.add_option_group(imgopt)
# options related to the config of your system
13 years, 8 months
Changes to 'refs/tags/livecd-tools-033'
by Bruno Wolff III
Tag 'livecd-tools-033' created by Bruno Wolff III <bruno(a)wolff.to> at 2010-07-27 10:57 +0000
livecd-tools-033
Changes since livecd-tools-031:
Alan Pevec (2):
livecd-iso-to-disk --format fails with existing LV on USB
livecd-creator ignores device directive
Bastien Nocera (2):
Update the root label for EFI as well
Document the --efi command-line argument
Bernie Innocenti (1):
LANG=C when parted output is being scraped, as localized strings cause it to fail.
Bruno Wolff III (7):
Support for specifying a compressor.
Add Douglas McClendon to the AUTHORS file, as the man page says he's an author.
Need to update version in Makefile
Do lazy umounts to reduce the impact of umount issues.
Fix issue with improper exception args used by urlgrabber and pykickstart.
Change live.py to use the new location of the vesa splash image.
Bump Makefile for 033.
Colin Walters (2):
Add tools/liveimage-mount
Rename --proc to --mount-hacks, strip whitespace
Daniel Drake (1):
Implement %post --erroronfail
Jim Meyering (1):
livecd-iso-to-disk.sh: use LC_ALL=C, not LANG=C, since LC_ALL trumps all other envvars, including LANG. For example,
Joey Boggs (3):
add rd_NO_DM dracut cmdline options bz: 589783
add edit-livecd
prepend _ to the file system label.
Lubomir Rintel (2):
This reverts commit 5f42d465badfc2b172e0bb10a2c0d2a27a164d27.
Aside from mkinitrd, create equivalent dracut configuration as well.
---
AUTHORS | 1
Makefile | 3
docs/livecd-creator.pod | 7
docs/livecd-iso-to-disk.pod | 8 -
imgcreate/creator.py | 19 +-
imgcreate/debug.py | 4
imgcreate/fs.py | 22 +-
imgcreate/kickstart.py | 10 -
imgcreate/live.py | 78 ++++++---
tools/edit-livecd | 350 ++++++++++++++++++++++++++++++++++++++++++++
tools/livecd-creator | 4
tools/livecd-iso-to-disk.sh | 23 ++
tools/liveimage-mount | 101 ++++++++++++
13 files changed, 576 insertions(+), 54 deletions(-)
---
13 years, 8 months
Makefile
by Bruno Wolff III
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 38eb71759c2478e28f42f117998b7a1b70f33551
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Jul 27 05:18:47 2010 -0500
Bump Makefile for 033.
diff --git a/Makefile b/Makefile
index 868ea20..8818236 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 032
+VERSION = 033
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
13 years, 8 months
imgcreate/live.py
by Bruno Wolff III
imgcreate/live.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d5b47ac2d861cc6e96e6ee94f2bf3f0d76361e12
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Jul 27 05:11:47 2010 -0500
Change live.py to use the new location of the vesa splash image.
fedora-logos recently changed the location it uses for the vesa splash
image. This breaks (bug 615443) live images built using fedora-logos.
This patch changes the location that the image is fetched from to match
the one used by fedora-logos.
Note that generic-logos hasn't been changed to use the new location yet.
To accommodate this as well as building older repos on F14, a fallback
to using the old path is provided if the splash image is not found at
the new location.
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 4f3bdd3..36fef63 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -372,10 +372,15 @@ class x86LiveImageCreator(LiveImageCreatorBase):
def __copy_syslinux_background(self, isodest):
background_path = self._instroot + \
- "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg"
+ "/usr/share/anaconda/syslinux-vesa-splash.jpg"
if not os.path.exists(background_path):
- return False
+ # fallback to F13 location
+ background_path = self._instroot + \
+ "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg"
+
+ if not os.path.exists(background_path):
+ return False
shutil.copyfile(background_path, isodest)
13 years, 8 months
req for a cd......
by sivanesan
hello,
i'm a linux student.......i'm in need of a fedora latest version....it
will be really helpfull if i get one by your team....
Thank you
13 years, 9 months
imgcreate/creator.py imgcreate/debug.py imgcreate/fs.py imgcreate/kickstart.py
by Bruno Wolff III
imgcreate/creator.py | 8 ++++----
imgcreate/debug.py | 4 ++--
imgcreate/fs.py | 4 ++--
imgcreate/kickstart.py | 10 ++++++----
4 files changed, 14 insertions(+), 12 deletions(-)
New commits:
commit 341ee165662be870c09acaba36fc71684ad0a788
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sun Jul 25 09:09:44 2010 -0500
Fix issue with improper exception args used by urlgrabber and pykickstart.
urlgrabber and pykickstart don't always supply both and error number and
an error message when raising an IOError exception. This was causing
an exception while processing the exception for some errors.
To prevent exceptions from insufficient arguments, the exception calls
were changed to use a single variable instead of a tuple and to use
strerror instead of the second argument.
As a temporary work around for urlgrabber and pykickstart issues, if
strerror is null, args[0] is used as a fallback so that we get a
reasonable error message.
This resolves bug 551932.
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 4deb49e..0ba5af5 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -385,9 +385,9 @@ class ImageCreator(object):
try:
self.__builddir = tempfile.mkdtemp(dir = os.path.abspath(self.tmpdir),
prefix = "imgcreate-")
- except OSError, (err, msg):
+ except OSError, e:
raise CreatorError("Failed create build directory in %s: %s" %
- (self.tmpdir, msg))
+ (self.tmpdir, e.strerror))
def __sanity_check(self):
"""Ensure that the config we've been given is sane."""
@@ -705,9 +705,9 @@ class ImageCreator(object):
try:
subprocess.check_call([s.interp, script],
preexec_fn = preexec, env = env)
- except OSError, (err, msg):
+ except OSError, e:
raise CreatorError("Failed to execute %%post script "
- "with '%s' : %s" % (s.interp, msg))
+ "with '%s' : %s" % (s.interp, e.strerror))
except subprocess.CalledProcessError, err:
if s.errorOnFail:
raise CreatorError("%%post script failed with code %d "
diff --git a/imgcreate/debug.py b/imgcreate/debug.py
index c45047d..84b8d30 100644
--- a/imgcreate/debug.py
+++ b/imgcreate/debug.py
@@ -30,9 +30,9 @@ def handle_logging(option, opt, val, parser, logger, level):
def handle_logfile(option, opt, val, parser, logger, stream):
try:
logfile = logging.FileHandler(val,"a")
- except IOError, (err, msg):
+ except IOError, e:
raise optparse.OptionValueError("Cannot open file '%s' : %s" %
- (val, msg))
+ (val, e.strerror))
logger.removeHandler(stream)
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index 16445a5..c5cd18b 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -36,8 +36,8 @@ def makedirs(dirname):
"""
try:
os.makedirs(dirname)
- except OSError, (err, msg):
- if err != errno.EEXIST:
+ except OSError, e:
+ if e.errno != errno.EEXIST:
raise
def mksquashfs(in_img, out_img, compress_type):
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 328043c..6600fd7 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -53,9 +53,11 @@ def read_kickstart(path):
try:
ksfile = urlgrabber.urlgrab(path)
ks.readKickstart(ksfile)
- except IOError, (err, msg):
+# Fallback to e.args[0] is a workaround for bugs in urlgragger and pykickstart.
+ except IOError, e:
raise errors.KickstartError("Failed to read kickstart file "
- "'%s' : %s" % (path, msg))
+ "'%s' : %s" % (path, e.strerror or
+ e.args[0]))
except kserrors.KickstartError, e:
raise errors.KickstartError("Failed to parse kickstart file "
"'%s' : %s" % (path, e))
@@ -153,8 +155,8 @@ class TimezoneConfig(KickstartConfig):
try:
shutil.copyfile(self.path("/usr/share/zoneinfo/%s" %(tz,)),
self.path("/etc/localtime"))
- except OSError, (errno, msg):
- log.error("Error copying timezone: %s" %(msg,))
+ except OSError, e:
+ log.error("Error copying timezone: %s" %(e.strerror,))
class AuthConfig(KickstartConfig):
13 years, 9 months
Patch review request for exception handling
by Bruno Wolff III
I have attached the diff. The commit note is below. I like to get an ack or
two on this patch. Thanks!
Fix issues due to raises supplying one argument when two are expected.
OSError and IOError normally have 2 or 3 arguments. However some routines
raise these with only one argument. This patch changes the handling to
use just the last argument provided (which would be the error message) or
the empty string if there isn't one.
I didn't print the list of arguments, since for these two exceptions the
first argument is an error number, that wouldn't look good in the error
message.
I didn't message with any of non-builtin exceptions, as I am assuming that
in those cases a mismatch is an error that should get fixed. Most of those
cases use the whole argument list as the error message in any case.
This resolves bug 551932.
13 years, 9 months
kickstart.py: except IOError, (err, msg): ValueError: need more than 1 value to unpack
by Marc Herbert
Insert a typo in the name of a %include(d) file. Run "livecd-creator". You get the cryptic:
Traceback (most recent call last):
File "/usr/bin/livecd-creator", line 140, in <module>
sys.exit(main())
File "/usr/bin/livecd-creator", line 112, in main
ks = imgcreate.read_kickstart(options.kscfg)
File "/usr/lib/python2.6/site-packages/imgcreate/kickstart.py", line 56, in read_kickstart
except IOError, (err, msg):
ValueError: need more than 1 value to unpack
The following patch works around the problem. It is probably NOT a fix but a workaround!
I suspect this is far from the only place to find this bug.
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -53,7 +53,7 @@ def read_kickstart(path):
try:
ksfile = urlgrabber.urlgrab(path)
ks.readKickstart(ksfile)
- except IOError, (err, msg):
+ except IOError, (msg):
raise errors.KickstartError("Failed to read kickstart file "
"'%s' : %s" % (path, msg))
except kserrors.KickstartError, e:
13 years, 9 months
Patch for BZ# 509427
by Jasper Hartline
Attached is a patch that will fix BZ# 509427 involving livecd-creator
crashing hard
when it is unable to mount filesystems immediately during an exception.
diff -up patch/fs.py.orig patch/fs.py
--- patch/fs.py.orig 2010-07-23 18:17:34.000000000 -0700
+++ patch/fs.py 2010-07-23 18:18:54.000000000 -0700
@@ -112,7 +112,7 @@ class BindChrootMount:
if not self.mounted:
return
- rc = subprocess.call(["/bin/umount", self.dest])
+ rc = subprocess.call(["/bin/umount", "-l", self.dest])
if rc != 0:
raise MountError("Unable to unmount filesystem at %s" % self.dest)
self.mounted = False
13 years, 9 months
