Makefile | 2 +- imgcreate/fs.py | 2 +- imgcreate/kickstart.py | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-)
New commits: commit ff31b963edb642ae210455cf38a88392feb84a9f Author: Jeremy Katz <ka...@redhat.com> Date: Fri Aug 14 10:50:59 2009 -0400 If resize2fs fails, raise an error also (related to #517222) diff --git a/imgcreate/fs.py b/imgcreate/fs.py index 563b7a9..a9512f2 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -68,7 +68,7 @@ def resize2fs(fs, size = None, minimal = False): args.append("%sK" %(size / 1024,)) ret = subprocess.call(args) if ret != 0: - return ret + raise ResizeError("resize2fs returned an error (%d)! image to debug at %s" %(ret, saved_image)) if e2fsck(fs) != 0: raise ResizeError("fsck after resize returned an error! image to debug at %s" %(saved_image,)) commit b1496d9f5ee11c42ca4446eb5e4da9de025500cd Author: Jeremy Katz <ka...@redhat.com> Date: Thu Jul 30 16:43:42 2009 -0400 Bumpv ersion diff --git a/Makefile b/Makefile index a3b2aa9..68cb635 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 024 +VERSION = 025 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 8d1a422ca611e7f05da8f8f3b8e46c7d3bcb4e86 Author: Jeremy Katz <ka...@redhat.com> Date: Mon Jul 27 09:26:58 2009 -0400 Use system-config-keyboard's bits in preference to rhpl.keyboard system-config-keyboard >= 1.3.0 has support for the keyboard pieces that used to be in rhpl. Use them if we can but fall back gracefully as people running from git could be on older releases diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 83a62e4..98db856 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -24,7 +24,10 @@ import time import logging import urlgrabber -import rhpl.keyboard +try: + import system_config_keyboard.keyboard as keyboard +except ImportError: + import rhpl.keyboard as keyboard import pykickstart.commands as kscommands import pykickstart.constants as ksconstants @@ -132,12 +135,7 @@ class LanguageConfig(KickstartConfig): class KeyboardConfig(KickstartConfig): """A class to apply a kickstart keyboard configuration to a system.""" def apply(self, kskeyboard): - # - # FIXME: - # should this impact the X keyboard config too? - # or do we want to make X be able to do this mapping? - # - k = rhpl.keyboard.Keyboard() + k = keyboard.Keyboard() if kskeyboard.keyboard: k.set(kskeyboard.keyboard) k.write(self.instroot) -- Fedora-livecd-list mailing list Fedora-livecd-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-livecd-list