May 2012 - Anaconda-devel - Fedora mailing-lists

[lorax] Copy mapping and magic to BOOTDIR on ppc (#815550)
by Martin Gracik 25 May '12

25 May '12

--- share/ppc.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/ppc.tmpl b/share/ppc.tmpl index 4879c45..3ff15da 100644 --- a/share/ppc.tmpl +++ b/share/ppc.tmpl @@ -44,6 +44,10 @@ mkdir ${MACDIR} install usr/lib/yaboot/yaboot ${MACDIR} install ${configdir}/ofboot.b ${MACDIR} +## copy mapping and magic files needed for isos +install ${configdir}/mapping ${BOOTDIR} +install ${configdir}/magic ${BOOTDIR} + ## NOTE: PPC is kind of funky. There's three possible "arch" setups here: ## ppc, ppc64, and 'hybrid' (ppc userspace, both ppc & ppc64 kernels). -- 1.7.9.5

1 0

[PATCH rhel6-branch] Unmount resources mounted by dracut (#818581)
by Radek Vykydal 24 May '12

24 May '12

Otherwise it hangs when systemd is trying to umount them (Device or resource busy). See also comment in the patch. Umount lazily for nfs mounts. A bit of history for reference: commit a1c759a9524e00356fc952193bb2795dc9c54a18 commit 8f537d923bf833b1d57504e8e3058535b347fa2f commit 37144b9e86e801074fa4ae4656da458fe83f6e07 commit 93d177b0643a5488b8aa8777e43d4f3c4d57c51d ... and now adapt it for systemd. Corresponding f17 bug: #824191 --- pyanaconda/yuminstall.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index 0ca534b..9d865a4 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -1228,6 +1228,19 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon if not anaconda.mediaDevice and os.path.ismount(self.ayum.tree): isys.umount(self.ayum.tree) + # bug #818581 - mounts from dracut would make systemd hang + # in reboot (Device or resource ebusy) when trying to umount + # them (after NM is stopped) + # - for repo=nfs: dracut nfs mounts /run/install/repo + # - for repo=nfsiso: dracut nfs mounts /run/install/isodir + # and iso mounts /run/install/repo + dracut_mounts = ["/run/install/repo", "/run/install/isodir"] + for mp in dracut_mounts: + if os.path.ismount(mp): + log.info("unmounting mount by dracut (lazily) %s" % mp) + iutil.execWithRedirect("umount", ["-l", mp], + stdout="/dev/tty5", stderr="/dev/tty5") + # clean up rpmdb locks so that kickstart %post scripts aren't # unhappy (#496961) iutil.resetRpmDb() -- 1.7.4

2 2

[PATCH] Don't call a util we don't have (#824690)
by Jesse Keating 24 May '12

24 May '12

This furthers the work in 41f9a52d2 --- pyanaconda/storage/formats/fs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py index a9abe1a..cc7b4ca 100644 --- a/pyanaconda/storage/formats/fs.py +++ b/pyanaconda/storage/formats/fs.py @@ -1412,7 +1412,8 @@ class NTFS(FS): if self._minInstanceSize is None: # we try one time to determine the minimum size. size = self._minSize - if self.exists and os.path.exists(self.device): + if self.exists and os.path.exists(self.device) and \ + iutil.find_program_in_path(self.resizefsProg): minSize = None buf = iutil.execWithCapture(self.resizefsProg, ["-m", self.device], -- 1.7.10.1

2 2

[PATCH rhel7-alpha2-branch] Don't support hfsplus in RHEL7 (#818912)
by Jesse Keating 24 May '12

24 May '12

--- anaconda.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index c3491a9..8c2b3ea 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -132,7 +132,6 @@ Requires: zenity %endif Requires: createrepo >= %{createrepover} Requires: squashfs-tools -Requires: hfsplus-tools Requires: genisoimage >= %{genisoimagever} Requires: GConf2 >= %{gconfversion} %ifarch %{ix86} x86_64 -- 1.7.10.1

2 1

[newui] [PATCH] Make TimezoneMap better suitable for testing
by Vratislav Podzimek 24 May '12

24 May '12

When testing, we need to set the location of the bitmaps our TimezoneMap is using, so let it try to get the location from the environment. --- widgets/src/Makefile.am | 4 +++- widgets/src/TimezoneMap.c | 22 +++++++++++++++------- widgets/src/tz.c | 17 ++++++++++++++++- widgets/src/tz.h | 5 +---- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index cef38b5..79afc82 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -53,12 +53,14 @@ SOURCES = $(GISOURCES) $(NONGISOURCES) HDRS = $(GIHDRS) $(NONGIHDRS) -TZMAPDATA = '"$(datadir)/anaconda/tzmapdata"' +WIDGETSDATA = '"$(datadir)/anaconda"' +TZMAPDATA = '"tzmapdata"' noinst_HEADERS = gettext.h intl.h lib_LTLIBRARIES = libAnacondaWidgets.la libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(GLADEUI_CFLAGS) -Wall -g\ + -DWIDGETS_DATADIR=$(WIDGETSDATA)\ -DTZMAP_DATADIR=$(TZMAPDATA) libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(GLADEUI_LIBS) libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) diff --git a/widgets/src/TimezoneMap.c b/widgets/src/TimezoneMap.c index fb2ff5f..1071390 100644 --- a/widgets/src/TimezoneMap.c +++ b/widgets/src/TimezoneMap.c @@ -24,6 +24,7 @@ #include "TimezoneMap.h" #include <math.h> #include <string.h> +#include <stdlib.h> #include "tz.h" /** @@ -73,7 +74,6 @@ enum { static guint signals[LAST_SIGNAL]; - static AnacondaTimezoneMapOffset color_codes[] = { {-11.0, 43, 0, 0, 255 }, @@ -335,7 +335,8 @@ anaconda_timezone_map_draw (GtkWidget *widget, cairo_paint (cr); /* paint hilight */ - file = g_strdup_printf (TZMAP_DATADIR "/timezone_%s.png", + file = g_strdup_printf ("%s/" TZMAP_DATADIR "/timezone_%s.png", + get_widgets_datadir(), g_ascii_formatd (buf, sizeof (buf), "%g", priv->selected_offset)); orig_hilight = gdk_pixbuf_new_from_file (file, &err); @@ -360,7 +361,10 @@ anaconda_timezone_map_draw (GtkWidget *widget, } /* load pin icon */ - pin = gdk_pixbuf_new_from_file (TZMAP_DATADIR "/pin.png", &err); + + file = g_strdup_printf("%s/" TZMAP_DATADIR "/pin.png", get_widgets_datadir()); + pin = gdk_pixbuf_new_from_file (file, &err); + g_free(file); if (err) { g_warning ("Could not load pin icon: %s", err->message); @@ -521,11 +525,13 @@ static void anaconda_timezone_map_init (AnacondaTimezoneMap *self) { AnacondaTimezoneMapPrivate *priv; GError *err = NULL; + gchar *file; priv = self->priv = TIMEZONE_MAP_PRIVATE (self); - priv->orig_background = gdk_pixbuf_new_from_file (TZMAP_DATADIR "/bg.png", - &err); + file = g_strdup_printf("%s/" TZMAP_DATADIR "/bg.png", get_widgets_datadir()); + priv->orig_background = gdk_pixbuf_new_from_file (file, &err); + g_free(file); if (!priv->orig_background) { g_warning ("Could not load background image: %s", @@ -533,8 +539,10 @@ anaconda_timezone_map_init (AnacondaTimezoneMap *self) { g_clear_error (&err); } - priv->orig_color_map = gdk_pixbuf_new_from_file (TZMAP_DATADIR "/cc.png", - &err); + file = g_strdup_printf("%s/" TZMAP_DATADIR "/cc.png", get_widgets_datadir()); + priv->orig_color_map = gdk_pixbuf_new_from_file (file, &err); + g_free(file); + if (!priv->orig_color_map) { g_warning ("Could not load background image: %s", (err) ? err->message : "Unknown error"); diff --git a/widgets/src/tz.c b/widgets/src/tz.c index 5173808..ca42f8c 100644 --- a/widgets/src/tz.c +++ b/widgets/src/tz.c @@ -41,6 +41,17 @@ static void sort_locations_by_country (GPtrArray *locations); static gchar * tz_data_file_get (void); static void load_backward_tz (TzDB *tz_db); +gchar *get_widgets_datadir() { + gchar *env_value; + + env_value = getenv("ANACONDA_WIDGETS_DATA"); + if (env_value == NULL) + //defined in the widgets/src/Makefile.am + return WIDGETS_DATADIR; + else + return env_value; +} + /* ---------------- * * Public interface * * ---------------- */ @@ -381,13 +392,17 @@ load_backward_tz (TzDB *tz_db) GError *error = NULL; char **lines, *contents; guint i; + gchar *file; tz_db->backward = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - if (g_file_get_contents (BACKWARDDIR "timezones_backward", &contents, NULL, &error) == FALSE) { + file = g_strdup_printf ("%s/" TZMAP_DATADIR "/timezones_backward", get_widgets_datadir()); + if (g_file_get_contents (file, &contents, NULL, &error) == FALSE) { g_warning ("Failed to load 'backward' file: %s", error->message); return; } + g_free(file); + lines = g_strsplit (contents, "\n", -1); g_free (contents); for (i = 0; lines[i] != NULL; i++) { diff --git a/widgets/src/tz.h b/widgets/src/tz.h index 7056364..ec8a569 100644 --- a/widgets/src/tz.h +++ b/widgets/src/tz.h @@ -22,10 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef BACKWARDDIR -#define BACKWARDDIR "/usr/share/anaconda/tzmapdata/" -#endif - #ifndef _E_TZ_H #define _E_TZ_H @@ -37,6 +33,7 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; typedef struct _TzInfo TzInfo; +gchar *get_widgets_datadir(); struct _TzDB { -- 1.7.4.4

3 2

[PATCH 1/3] Merge run-hub with run-spoke as the code was almost identical
by Martin Sivak 24 May '12

24 May '12

To start hub use the following command: make runhub HUB_MODULE=summary or make runhub HUB_MODULE=summary HUB_CLASS=SummaryHub --- Makefile.am | 3 ++ pyanaconda/ui/gui/tools/run-hub.py | 65 +--------------------------------- pyanaconda/ui/gui/tools/run-spoke.py | 39 ++++++++++++-------- 3 files changed, 29 insertions(+), 78 deletions(-) mode change 100755 => 120000 pyanaconda/ui/gui/tools/run-hub.py diff --git a/Makefile.am b/Makefile.am index 74612ad..59b5d0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,3 +106,6 @@ unittests-logpicker: # GUI TESTING runspoke: ANACONDA_DATA=${PWD}/data ANACONDA_WIDGETS_DATA=${PWD}/widgets/data ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ LD_LIBRARY_PATH=widgets/src/.libs UIPATH=pyanaconda/ui/gui/ GI_TYPELIB_PATH=widgets/src/ pyanaconda/ui/gui/tools/run-spoke.py ${SPOKE_MODULE} ${SPOKE_CLASS} + +runhub: + ANACONDA_DATA=${PWD}/data ANACONDA_WIDGETS_DATA=${PWD}/widgets/data ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ LD_LIBRARY_PATH=widgets/src/.libs UIPATH=pyanaconda/ui/gui/ GI_TYPELIB_PATH=widgets/src/ pyanaconda/ui/gui/tools/run-hub.py ${HUB_MODULE} ${HUB_CLASS} diff --git a/pyanaconda/ui/gui/tools/run-hub.py b/pyanaconda/ui/gui/tools/run-hub.py deleted file mode 100755 index b75470f..0000000 --- a/pyanaconda/ui/gui/tools/run-hub.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/python - -from gi.repository import AnacondaWidgets, Gtk -import ctypes, sys - -# This is a hack to make sure the AnacondaWidgets library gets loaded -ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) - -# Logging always needs to be set up first thing, or there'll be tracebacks. -from pyanaconda import anaconda_log -anaconda_log.init() - -from pyanaconda.installclass import DefaultInstall -from pyanaconda.storage import Storage -from pyanaconda.threads import initThreading -from pyanaconda.packaging.yumpayload import YumPayload -from pyanaconda.platform import getPlatform -from pykickstart.version import makeVersion - -# Don't worry with fcoe, iscsi, dasd, any of that crud. -from pyanaconda.flags import flags -flags.imageInstall = True -flags.testing = True - -initThreading() - -# NOTE: To run your hub, you need to do the proper import here (may need to -# set $PYTHONPATH as well) and set hubClass to be the class from that import. -# I suppose this could be done automatically somehow, but that's hard and this -# is a development testing tool. -#from pyanaconda.ui.gui.hubs.summary import SummaryHub -#hubClass = SummaryHub -hubClass = None - -platform = getPlatform() -ksdata = makeVersion() -storage = Storage(data=ksdata, platform=platform) -storage.reset() -instclass = DefaultInstall() - -payload = YumPayload(ksdata) -payload.setup(storage) -payload.install_log = sys.stdout - -if not hubClass: - print "You forgot to set hubClass to something." - sys.exit(1) - -hub = hubClass(ksdata, storage, payload, instclass) -hub.register_event_cb("continue", lambda: Gtk.main_quit()) -hub.register_event_cb("quit", lambda: Gtk.main_quit()) -hub.initialize() - -if not hub.showable: - print "This hub is not showable, but I'll continue anyway." - -hub.refresh() -hub.window.set_beta(True) -hub.window.set_property("distribution", "TEST HARNESS") -hub.window.show_all() - -Gtk.main() - -print "Hub kickstart fragment:\n%s" % ksdata diff --git a/pyanaconda/ui/gui/tools/run-hub.py b/pyanaconda/ui/gui/tools/run-hub.py new file mode 120000 index 0000000..4583bed --- /dev/null +++ b/pyanaconda/ui/gui/tools/run-hub.py @@ -0,0 +1 @@ +run-spoke.py \ No newline at end of file diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index 65cae6a..e8205a9 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -2,6 +2,7 @@ from gi.repository import AnacondaWidgets, Gtk import ctypes, sys +import os.path # Check command line arguments if len(sys.argv)<2: @@ -29,8 +30,23 @@ flags.testing = True initThreading() -# Figure out the name of spoke module entered on command line -spokeModuleName = "pyanaconda.ui.gui.spokes.%s" % sys.argv[1] +# Figure out the part we are about to show: hub/spoke? +# And get the name of the module which represents it +if os.path.basename(sys.argv[0]) == "run-spoke.py": + spokeModuleName = "pyanaconda.ui.gui.spokes.%s" % sys.argv[1] + from pyanaconda.ui.gui.spokes import NormalSpoke + spokeBaseClass = NormalSpoke + spokeText = "spoke" + SpokeText = "Spoke" +elif os.path.basename(sys.argv[0]) == "run-hub.py": + spokeModuleName = "pyanaconda.ui.gui.hubs.%s" % sys.argv[1] + from pyanaconda.ui.gui.hubs import Hub + spokeBaseClass = Hub + spokeText = "hub" + SpokeText = "Hub" +else: + print "You have to run this command as run-spoke.py or run-hub.py." + sys.exit(1) # Set default spoke class spokeClass = None @@ -45,10 +61,9 @@ try: except IndexError: __import__(spokeModuleName) spokeModule = sys.modules[spokeModuleName] - from pyanaconda.ui.gui.spokes import NormalSpoke for k,v in vars(spokeModule).iteritems(): try: - if issubclass(v, NormalSpoke): + if issubclass(v, spokeBaseClass) and v != spokeBaseClass: spokeClassName = k spokeClass = v break @@ -59,11 +74,11 @@ if not spokeClass: try: spokeClass = getattr(spokeModule, spokeClassName) except KeyError: - print "Spoke %s could not be found in %s" % (spokeClassName, spokeModuleName) + print "%s %s could not be found in %s" % (SpokeText, spokeClassName, spokeModuleName) sys.exit(1) -print "Running spoke %s from %s" % (spokeClass, spokeModule) +print "Running %s %s from %s" % (spokeText, spokeClass, spokeModule) platform = getPlatform() ksdata = makeVersion() @@ -75,10 +90,6 @@ payload = YumPayload(ksdata) payload.setup(storage) payload.install_log = sys.stdout -if not spokeClass: - print "You forgot to set spokeClass to something." - sys.exit(1) - spoke = spokeClass(ksdata, storage, payload, instclass) if hasattr(spoke, "register_event_cb"): spoke.register_event_cb("continue", lambda: Gtk.main_quit()) @@ -86,7 +97,7 @@ if hasattr(spoke, "register_event_cb"): spoke.initialize() if not spoke.showable: - print "This spoke is not showable, but I'll continue anyway." + print "This %s is not showable, but I'll continue anyway." % spokeText spoke.refresh() spoke.window.set_beta(True) @@ -96,6 +107,6 @@ spoke.window.show_all() Gtk.main() if hasattr(spoke, "status"): - print "Spoke status:\n%s\n" % spoke.status -print "Spoke completed:\n%s\n" % spoke.completed -print "Spoke kickstart fragment:\n%s" % ksdata + print "%s status:\n%s\n" % (SpokeText, spoke.status) +print "%s completed:\n%s\n" % (SpokeText, spoke.completed) +print "%s kickstart fragment:\n%s" % (SpokeText, ksdata) -- 1.7.10.1

2 3

[PATCH rhel7-alpha2-branch] Fix unpack_updates_img argument handling (#811979)
by Will Woods 23 May '12

23 May '12

unpack_updates_img takes one or two arguments - the image (required), and the output dir (optional, defaults to "/updates"). That should be: outdir="${2:-/updates}" Instead we had: outdir="${2:+/updates}" Which means "outdir is empty unless $2 is set, then it's /updates". Definitely not what we wanted. --- dracut/anaconda-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index a045bab..212e6b7 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -100,7 +100,7 @@ anaconda_auto_updates() { # Unpack an image into the given dir. unpack_updates_img() { - local img="$1" tmpdir="/tmp/${1##*/}.$$" outdir="${2:+/updates}" + local img="$1" tmpdir="/tmp/${1##*/}.$$" outdir="${2:-/updates}" # NOTE: unpack_img $img $outdir can clobber existing subdirs in $outdir, # which is why we use a tmpdir and copytree (which doesn't clobber) unpack_img $img $tmpdir -- 1.7.10.1

2 1

[PATCH rhel7-alpha2-branch] Fix 'updates' in kickstart
by Will Woods 23 May '12

23 May '12

Using "updates" makes parse-kickstart emit "live.updates=...". We need to run the cmdline script that parses that in order to make it actually happen. --- dracut/anaconda-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh index 212e6b7..776a520 100755 --- a/dracut/anaconda-lib.sh +++ b/dracut/anaconda-lib.sh @@ -194,7 +194,7 @@ run_kickstart() { # re-parse new cmdline stuff from the kickstart . $hookdir/cmdline/*parse-anaconda-repo.sh - # TODO: parse for other stuff ks might set (updates, dd, etc.) + . $hookdir/cmdline/*parse-livenet.sh # live.updates case "$repotype" in http*|ftp|nfs*) do_net=1 ;; cdrom|hd|bd) do_disk=1 ;; -- 1.7.10.1

1 0

[PATCH] [2nd] Improve the runspoke.py tool and make it callable from make
by Martin Sivak 23 May '12

23 May '12

Second version, I forgot to commit the last change.. oops. make runspoke SPOKE_MODULE=source or make runspoke SPOKE_MODULE=source SPOKE_CLASS=InstallSource - runspoke now accepts the name of the module containing the spoke the user wants to run on command line and will find the spoke automatically - as an optional second argument, the script accepts the name of the spoke class - install classes and gi introspection files are looked for in anaconda sources first, so there is no need to install the anaconda-widgets package to the system - there was a circular dependency between yuminstall, backend and kickstart modules, which caused import yuminstall to fail, because: yuminstall called backend, which called kickstart, which requested NoSuchGroup from yuminstall. NoSuchGroup was present in the source, but much later, so it hadn't been evaluated yet and the import failed with missing symbol error. --- Makefile.am | 4 +++ pyanaconda/installclass.py | 8 +++++- pyanaconda/ui/gui/tools/run-spoke.py | 45 +++++++++++++++++++++++++++++----- pyanaconda/yuminstall.py | 11 ++++----- 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1798740..4e2f6d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,3 +102,7 @@ unittest: unittests-logpicker: PYTHONPATH=tests/:.:utils/ nosetests tests/logpicker_test + +# GUI TESTING +runspoke: + ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ LD_LIBRARY_PATH=widgets/src/.libs UIPATH=pyanaconda/ui/gui/ GI_TYPELIB_PATH=widgets/src/ pyanaconda/ui/gui/tools/run-spoke.py ${SPOKE_MODULE} ${SPOKE_CLASS} diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 7e8aca1..15dbe20 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -245,7 +245,11 @@ def availableClasses(showHidden=0): path = [] - for dir in ["installclasses", + env_path = [] + if "ANACONDA_INSTALL_CLASSES" in os.environ: + env_path += os.environ["ANACONDA_INSTALL_CLASSES"].split(":") + + for dir in env_path + ["installclasses", "/tmp/updates/pyanaconda/installclasses", "/tmp/product/pyanaconda/installclasses", "%s/pyanaconda/installclasses" % get_python_lib(plat_specific=1) ]: @@ -297,6 +301,7 @@ def availableClasses(showHidden=0): list.append(((obj.name, obj, obj.pixmap), sortOrder)) except ImportError as e: log.warning ("module import of %s failed: %s" % (mainName, sys.exc_type)) + raise if flags.debug: raise else: continue @@ -316,6 +321,7 @@ def getBaseInstallClass(): # figure out what installclass we should base on. allavail = availableClasses(showHidden = 1) avail = availableClasses(showHidden = 0) + if len(avail) == 1: (cname, cobject, clogo) = avail[0] log.info("using only installclass %s" %(cname,)) diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index aef62db..65cae6a 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -3,6 +3,11 @@ from gi.repository import AnacondaWidgets, Gtk import ctypes, sys +# Check command line arguments +if len(sys.argv)<2: + print "Usage: $0 <spoke module name> [<spoke widget class>]" + sys.exit(1) + # This is a hack to make sure the AnacondaWidgets library gets loaded ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) @@ -24,14 +29,42 @@ flags.testing = True initThreading() -# NOTE: To run your spoke, you need to do the proper import here (may need to -# set $PYTHONPATH as well) and set spokeClass to be the class from that import. -# I suppose this could be done automatically somehow, but that's hard and this -# is a development testing tool. -#from pyanaconda.ui.gui.spokes.software import SoftwareSelectionSpoke -#spokeClass = SoftwareSelectionSpoke +# Figure out the name of spoke module entered on command line +spokeModuleName = "pyanaconda.ui.gui.spokes.%s" % sys.argv[1] + +# Set default spoke class spokeClass = None +# Load spoke specified on the command line +# If the spoke module was specified, but the spoke class was not, +# try to find it using class hierarchy +try: + spokeClassName = sys.argv[2] + __import__(spokeModuleName, fromlist = [spokeClassName]) + spokeModule = sys.modules[spokeModuleName] +except IndexError: + __import__(spokeModuleName) + spokeModule = sys.modules[spokeModuleName] + from pyanaconda.ui.gui.spokes import NormalSpoke + for k,v in vars(spokeModule).iteritems(): + try: + if issubclass(v, NormalSpoke): + spokeClassName = k + spokeClass = v + break + except TypeError: + pass + +if not spokeClass: + try: + spokeClass = getattr(spokeModule, spokeClassName) + except KeyError: + print "Spoke %s could not be found in %s" % (spokeClassName, spokeModuleName) + sys.exit(1) + + +print "Running spoke %s from %s" % (spokeClass, spokeModule) + platform = getPlatform() ksdata = makeVersion() storage = Storage(data=ksdata, platform=platform) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index d895e27..d8761ea 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -17,8 +17,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from flags import flags - import ConfigParser import sys import os @@ -32,6 +30,10 @@ import tempfile import itertools import re +class NoSuchGroup(Exception): + pass + +from flags import flags import anaconda_log import rpm @@ -45,12 +47,12 @@ from yum.constants import * from yum.Errors import * from yum.misc import to_unicode from yum.yumRepo import YumRepository -from backend import AnacondaBackend from product import isFinal, productName, productVersion, productStamp from constants import * from image import * from compssort import * import packages +from backend import AnacondaBackend import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -72,9 +74,6 @@ urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(produc import iutil import isys -class NoSuchGroup(Exception): - pass - def size_string (size): def number_format(s): return locale.format("%s", s, 1) -- 1.7.10.1

2 2

[PATCH] Improve the runspoke.py tool and make it callable from make
by Martin Sivak 23 May '12

23 May '12

make runspoke SPOKE_MODULE=source or make runspoke SPOKE_MODULE=source SPOKE_CLASS=InstallSource - runspoke now accepts the name of the module containing the spoke the user wants to run on command line and will find the spoke automatically - as an optional second argument, the script accepts the name of the spoke class - install classes and gi introspection files are looked for in anaconda sources first, so there is no need to install the anaconda-widgets package to the system - there was a circular dependency between yuminstall, backend and kickstart modules, which caused import yuminstall to fail, because: yuminstall called backend, which called kickstart, which requested NoSuchGroup from yuminstall. NoSuchGroup was present in the source, but much later, so it hadn't been evaluated yet and the import failed with missing symbol error. --- Makefile.am | 4 +++ pyanaconda/installclass.py | 8 +++++- pyanaconda/ui/gui/tools/run-spoke.py | 45 +++++++++++++++++++++++++++++----- pyanaconda/yuminstall.py | 11 ++++----- 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1798740..41f7d27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,3 +102,7 @@ unittest: unittests-logpicker: PYTHONPATH=tests/:.:utils/ nosetests tests/logpicker_test + +# GUI TESTING +runspoke: + ANACONDA_INSTALL_CLASSES=${PWD}/pyanaconda/installclasses PYTHONPATH=.:pyanaconda/isys/.libs:widgets/python/:widgets/src/.libs/ LD_LIBRARY_PATH=widgets/src/.libs UIPATH=pyanaconda/ui/gui/ GI_TYPELIB_PATH=widgets/src/ pyanaconda/ui/gui/tools/run-spoke.py ${SPOKE_MODULE} ${SPOKE} diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 7e8aca1..15dbe20 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -245,7 +245,11 @@ def availableClasses(showHidden=0): path = [] - for dir in ["installclasses", + env_path = [] + if "ANACONDA_INSTALL_CLASSES" in os.environ: + env_path += os.environ["ANACONDA_INSTALL_CLASSES"].split(":") + + for dir in env_path + ["installclasses", "/tmp/updates/pyanaconda/installclasses", "/tmp/product/pyanaconda/installclasses", "%s/pyanaconda/installclasses" % get_python_lib(plat_specific=1) ]: @@ -297,6 +301,7 @@ def availableClasses(showHidden=0): list.append(((obj.name, obj, obj.pixmap), sortOrder)) except ImportError as e: log.warning ("module import of %s failed: %s" % (mainName, sys.exc_type)) + raise if flags.debug: raise else: continue @@ -316,6 +321,7 @@ def getBaseInstallClass(): # figure out what installclass we should base on. allavail = availableClasses(showHidden = 1) avail = availableClasses(showHidden = 0) + if len(avail) == 1: (cname, cobject, clogo) = avail[0] log.info("using only installclass %s" %(cname,)) diff --git a/pyanaconda/ui/gui/tools/run-spoke.py b/pyanaconda/ui/gui/tools/run-spoke.py index aef62db..45a6e8c 100755 --- a/pyanaconda/ui/gui/tools/run-spoke.py +++ b/pyanaconda/ui/gui/tools/run-spoke.py @@ -3,6 +3,11 @@ from gi.repository import AnacondaWidgets, Gtk import ctypes, sys +# Check command line arguments +if len(sys.argv)<2: + print "Usage: $0 <spoke module name> [<spoke widget class>]" + sys.exit(1) + # This is a hack to make sure the AnacondaWidgets library gets loaded ctypes.CDLL("libAnacondaWidgets.so.0", ctypes.RTLD_GLOBAL) @@ -24,14 +29,42 @@ flags.testing = True initThreading() -# NOTE: To run your spoke, you need to do the proper import here (may need to -# set $PYTHONPATH as well) and set spokeClass to be the class from that import. -# I suppose this could be done automatically somehow, but that's hard and this -# is a development testing tool. -#from pyanaconda.ui.gui.spokes.software import SoftwareSelectionSpoke -#spokeClass = SoftwareSelectionSpoke +# Figure out the name of spoke module entered on command line +spokeModuleName = "pyanaconda.ui.gui.spokes.%s" % sys.argv[1] + +# Set default spoke class spokeClass = None +# Load spoke specified on the command line +# If the spoke module was specified, but the spoke class was not, +# try to find it using class hierarchy +try: + spokeClassName = sys.argv[2] + __import__(spokeModuleName, names = [spokeClassName]) + spokeModule = sys.modules[spokeModuleName] +except IndexError: + __import__(spokeModuleName) + spokeModule = sys.modules[spokeModuleName] + from pyanaconda.ui.gui.spokes import NormalSpoke + for k,v in vars(spokeModule).iteritems(): + try: + if issubclass(v, NormalSpoke): + spokeClassName = k + spokeClass = v + break + except TypeError: + pass + +if not spokeClass: + try: + spokeClass = getattr(spokeModule, spokeClassName) + except KeyError: + print "Spoke %s could not be found in %s" % (spokeClassName, spokeModuleName) + sys.exit(1) + + +print "Running spoke %s from %s" % (spokeClass, spokeModule) + platform = getPlatform() ksdata = makeVersion() storage = Storage(data=ksdata, platform=platform) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index d895e27..d8761ea 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -17,8 +17,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from flags import flags - import ConfigParser import sys import os @@ -32,6 +30,10 @@ import tempfile import itertools import re +class NoSuchGroup(Exception): + pass + +from flags import flags import anaconda_log import rpm @@ -45,12 +47,12 @@ from yum.constants import * from yum.Errors import * from yum.misc import to_unicode from yum.yumRepo import YumRepository -from backend import AnacondaBackend from product import isFinal, productName, productVersion, productStamp from constants import * from image import * from compssort import * import packages +from backend import AnacondaBackend import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -72,9 +74,6 @@ urlgrabber.grabber.default_grabber.opts.user_agent = "%s (anaconda)/%s" %(produc import iutil import isys -class NoSuchGroup(Exception): - pass - def size_string (size): def number_format(s): return locale.format("%s", s, 1) -- 1.7.10.1

1 0

Patches for processing multiple layouts correctly
by Vratislav Podzimek 23 May '12

23 May '12

These patches for both anaconda and pykickstart enables setting up multiple for both installation environment and installed system. To be honest, I don't know where these things should go in the newui world. Comments are, of course, welcome. -- Vratislav Podzimek

2 11

[PATCH] [F17] Set serial flag when encountering console argument (#823861)
by Martin Sivak 22 May '12

22 May '12

We forgot to set flags.serial when console= was used to trigger serial mode. Also the whole OptionParser block seems useles to me now, as systemd is not passing any direct arguments to anaconda call. --- anaconda | 1 + 1 file changed, 1 insertion(+) diff --git a/anaconda b/anaconda index b76af4d..939262d 100755 --- a/anaconda +++ b/anaconda @@ -272,6 +272,7 @@ def parseOptions(argv=None, cmdline=None): if cmdline is not None: if "console" in cmdline: op.set_defaults(display_mode="t") + op.set_defaults(serial=True) (opts, args) = op.parse_args(argv, cmdline=cmdline) return (opts, args, op.deprecated_bootargs) -- 1.7.10.1

2 1

[newui] NTP switch functionality
by Vratislav Podzimek 22 May '12

22 May '12

These patches for anaconda and lorax introduce the NTP functionality in the installer. However, we also need to set up these things on the installed system and I think that we should also add a kickstart command for enabling NTP. Suggestions? -- Vratislav Podzimek

4 14

[master] Use grub2 on efi systems.
by Peter Jones 21 May '12

21 May '12

--- pyanaconda/bootloader.py | 229 ++++++++++++++++------------------- pyanaconda/installclasses/fedora.py | 2 + pyanaconda/installclasses/rhel.py | 2 + 3 files changed, 108 insertions(+), 125 deletions(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 2389a4a..210f2d4 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1458,130 +1458,6 @@ class GRUB(BootLoader): def has_windows(self): return len(self.bootable_chain_devices) != 0 - -class EFIGRUB(GRUB): - packages = ["grub-efi", "efibootmgr"] - can_dual_boot = False - _config_dir = "efi/EFI/redhat" - - # list of strings representing options for boot device types - stage2_device_types = ["partition"] - stage2_raid_levels = [] - stage2_raid_member_types = [] - stage2_raid_metadata = [] - - stage2_is_valid_stage1 = False - stage2_bootable = False - stage2_max_end_mb = None - - def efibootmgr(self, *args, **kwargs): - if kwargs.pop("capture", False): - exec_func = iutil.execWithCapture - else: - exec_func = iutil.execWithRedirect - - return exec_func("efibootmgr", list(args), **kwargs) - - # - # configuration - # - - @property - def efi_product_path(self): - """ The EFI product path. - - eg: HD(1,800,64000,faacb4ef-e361-455e-bd97-ca33632550c3) - """ - buf = self.efibootmgr("-v", stderr="/dev/tty5", capture=True) - matches = re.search(productName + r'\s+(HD$.+?$)', buf) - if matches and matches.groups(): - return matches.group(1) - return "" - - @property - def grub_conf_device_line(self): - return "device %s %s\n" % (self.grub_device_name(self.stage2_device), - self.efi_product_path) - - # - # installation - # - - def remove_efi_boot_target(self): - buf = self.efibootmgr(capture=True) - for line in buf.splitlines(): - try: - (slot, _product) = line.split(None, 1) - except ValueError: - continue - - if _product == productName: - slot_id = slot[4:8] - # slot_id is hex, we can't use .isint and use this regex: - if not re.match("^[0-9a-fA-F]+$", slot_id): - log.warning("failed to parse efi boot slot (%s)" % slot) - continue - - rc = self.efibootmgr("-b", slot_id, "-B", - root=ROOT_PATH, - stdout="/dev/tty5", stderr="/dev/tty5") - if rc: - raise BootLoaderError("failed to remove old efi boot entry") - - def add_efi_boot_target(self): - boot_efi = self.storage.mountpoints["/boot/efi"] - if boot_efi.type == "partition": - boot_disk = boot_efi.disk - boot_part_num = boot_efi.partedPartition.number - elif boot_efi.type == "mdarray": - # FIXME: I'm just guessing here. This probably needs the full - # treatment, ie: multiple targets for each member. - boot_disk = boot_efi.parents[0].disk - boot_part_num = boot_efi.parents[0].partedPartition.number - boot_part_num = str(boot_part_num) - - rc = self.efibootmgr("-c", "-w", "-L", productName, - "-d", boot_disk.path, "-p", boot_part_num, - "-l", "\\EFI\\redhat\\grub.efi", - root=ROOT_PATH, - stdout="/dev/tty5", stderr="/dev/tty5") - if rc: - raise BootLoaderError("failed to set new efi boot target") - - def install(self): - self.remove_efi_boot_target() - self.add_efi_boot_target() - - def update(self): - self.install() - - # - # installation - # - def write(self): - """ Write the bootloader configuration and install the bootloader. """ - if self.update_only: - self.update() - return - - sync() - self.stage2_device.format.sync(root=ROOT_PATH) - self.install() - self.write_config() - -class MacEFIGRUB(EFIGRUB): - def mactel_config(self): - if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"): - rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [], - root=ROOT_PATH, - stdout="/dev/tty5", stderr="/dev/tty5") - if rc: - log.error("failed to configure Mac bootloader") - - def install(self): - super(MacEFIGRUB, self).install() - self.mactel_config() - class GRUB2(GRUB): """ GRUBv2 @@ -1741,7 +1617,7 @@ class GRUB2(GRUB): # boot arguments log.info("bootloader.py: used boot args: %s " % self.boot_args) defaults.write("GRUB_CMDLINE_LINUX=\"%s\"\n" % self.boot_args) - defaults.write("#GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"") + defaults.write("#GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"\n") defaults.close() def _encrypt_password(self): @@ -1847,6 +1723,109 @@ class GRUB2(GRUB): sync() self.stage2_device.format.sync(root=ROOT_PATH) +class EFIGRUB(GRUB2): + packages = ["grub2-efi", "efibootmgr"] + can_dual_boot = False + + @property + def _config_dir(self): + return "efi/EFI/%s" % (self.storage.anaconda.instClass.efi_dir,) + + def efibootmgr(self, *args, **kwargs): + if kwargs.pop("capture", False): + exec_func = iutil.execWithCapture + else: + exec_func = iutil.execWithRedirect + + return exec_func("efibootmgr", list(args), **kwargs) + + # + # installation + # + + def remove_efi_boot_target(self): + buf = self.efibootmgr(capture=True) + for line in buf.splitlines(): + try: + (slot, _product) = line.split(None, 1) + except ValueError: + continue + + if _product == productName: + slot_id = slot[4:8] + # slot_id is hex, we can't use .isint and use this regex: + if not re.match("^[0-9a-fA-F]+$", slot_id): + log.warning("failed to parse efi boot slot (%s)" % slot) + continue + + rc = self.efibootmgr("-b", slot_id, "-B", + root=ROOT_PATH, + stdout="/dev/tty5", stderr="/dev/tty5") + if rc: + raise BootLoaderError("failed to remove old efi boot entry") + + @property + def efi_dir_as_efifs_dir(self): + ret = self._config_dir.replace('efi/', '') + return ret.replace('/', '\\') + + def add_efi_boot_target(self): + boot_efi = self.storage.mountpoints["/boot/efi"] + if boot_efi.type == "partition": + boot_disk = boot_efi.disk + boot_part_num = boot_efi.partedPartition.number + elif boot_efi.type == "mdarray": + # FIXME: I'm just guessing here. This probably needs the full + # treatment, ie: multiple targets for each member. + boot_disk = boot_efi.parents[0].disk + boot_part_num = boot_efi.parents[0].partedPartition.number + boot_part_num = str(boot_part_num) + + rc = self.efibootmgr("-c", "-w", "-L", productName, + "-d", boot_disk.path, "-p", boot_part_num, + "-l", + self.efi_dir_as_efifs_dir + "\\grubx64.efi", + root=ROOT_PATH, + stdout="/dev/tty5", stderr="/dev/tty5") + if rc: + raise BootLoaderError("failed to set new efi boot target") + + def install(self): + self.remove_efi_boot_target() + self.add_efi_boot_target() + + def update(self): + self.install() + + # + # installation + # + def write(self): + """ Write the bootloader configuration and install the bootloader. """ + if self.update_only: + self.update() + return + + sync() + self.stage2_device.format.sync(root=ROOT_PATH) + self.install() + self.write_config() + + +class MacEFIGRUB(EFIGRUB): + def mactel_config(self): + if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"): + rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [], + root=ROOT_PATH, + stdout="/dev/tty5", stderr="/dev/tty5") + if rc: + log.error("failed to configure Mac bootloader") + + def install(self): + super(MacEFIGRUB, self).install() + self.mactel_config() + + class YabootSILOBase(BootLoader): def write_config_password(self, config): if self.password: diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py index d2c95a5..1e574b8 100644 --- a/pyanaconda/installclasses/fedora.py +++ b/pyanaconda/installclasses/fedora.py @@ -67,6 +67,8 @@ class InstallClass(BaseInstallClass): _l10n_domain = "anaconda" + efi_dir = "fedora" + def getPackagePaths(self, uri): if not type(uri) == types.ListType: uri = [uri,] diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py index d894543..5d3bff4 100644 --- a/pyanaconda/installclasses/rhel.py +++ b/pyanaconda/installclasses/rhel.py @@ -46,6 +46,8 @@ class InstallClass(BaseInstallClass): _l10n_domain = "comps" + efi_dir = "redhat" + def getPackagePaths(self, uri): if not type(uri) == types.ListType: uri = [uri,] -- 1.7.10.1

2 1

[lorax] Install proper branding packages from repo (#813969)
by Martin Gracik 21 May '12

21 May '12

The product string is not the best source for package names. --- share/runtime-install.tmpl | 2 -- src/pylorax/treebuilder.py | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 7af3f3e..e9056d5 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -95,8 +95,6 @@ installpkg gnome-themes-standard gnome-icon-theme-legacy ## branding & logos installpkg fedora-gnome-theme fedora-icon-theme -installpkg ${product.name}-logos -installpkg ${product.name}-release ## debugging/bug reporting tools installpkg gdb-gdbserver diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 1d4a24c..de3d0bd 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -76,8 +76,30 @@ class RuntimeBuilder(object): yum=yum, templatedir=templatedir) self._runner.defaults = self.vars + def _install_branding(self): + release = None + for pkg in self.yum.whatProvides('/etc/system-release', None, None): + if pkg.name.startswith('generic'): + continue + else: + release = pkg.name + break + + if not release: + logger.error('could not get the release') + return + + # release + logger.info('got release: %s', release) + self._runner.installpkg(release) + + # logos + release, _suffix = release.split('-', 1) + self._runner.installpkg('%s-logos' % release) + def install(self): '''Install packages and do initial setup with runtime-install.tmpl''' + self._install_branding() self._runner.run("runtime-install.tmpl") def writepkglists(self, pkglistdir): -- 1.7.5.4

2 1

[newui] NTP servers dialog mockup
by Vratislav Podzimek 21 May '12

21 May '12

I've created a very first version of the dialog for NTP servers configuration. A video preview can be seen at: http://vpodzime.fedorapeople.org/ntp_config_dialog.ogg It is not finished at all, but I want to know if this is the right direction. Few comments: 1.) We need a way to let the user remove added (manually or by default) servers. However I cannot think up a better way than the small minus in the last column, because there is no good place for the remove button. 2.) There is quite a long timeout before the inaccessible or not working server is considered so. Therefore we need a way to indicate the intermediate state between "server added" and "server (not) working". In the preview, the small question mark in the blue diamond is used as an example. At least this image has to be replaced by something else. The rotating spinner would be the best, but it would be a lot more complicated to put it there, so I think we can start with a static image. 3.) These colourful images don't fit in the rest of the GUI and they should probably be replaced with different ones from the symbolic-* category. Or are they ok? Comments are, of course, welcome. -- Vratislav Podzimek Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic

1 0

[lorax] bind-mount /proc when rebuilding initrd
by Dan Horák 21 May '12

21 May '12

Recently rpm started [1] to look at /proc/self/auxv so it's probably time to bind-mount real /proc instead of only creating /proc/modules to silence dracut. [1] http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=280494cce023f3938023b9b2b117… --- src/pylorax/treebuilder.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 1d4a24c..50062a3 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -176,8 +176,8 @@ class TreeBuilder(object): if not backup: dracut.append("--force") - # Hush some dracut warnings. TODO: bind-mount proc in place? - open(joinpaths(self.vars.inroot,"/proc/modules"),"w") + # bind-mount proc in place - hush some dracut and rpm warnings + check_call(["mount", "-o", "bind", "/proc", joinpaths(self.vars.inroot,"/proc")]) for kernel in self.kernels: logger.info("rebuilding %s", kernel.initrd.path) if backup: @@ -185,7 +185,7 @@ class TreeBuilder(object): os.rename(initrd, initrd + backup) check_call(["chroot", self.vars.inroot] + \ dracut + [kernel.initrd.path, kernel.version]) - os.unlink(joinpaths(self.vars.inroot,"/proc/modules")) + check_call(["umount", joinpaths(self.vars.inroot,"/proc")]) def build(self): templatefile = templatemap[self.vars.arch.basearch] -- 1.7.7.6

2 1

[PATCH rhel7-alpha2-branch 1/2] dracut parse-kickstart: fix 'nfs --opts ...'
by Will Woods 18 May '12

18 May '12

We were putting the ops at the end; they're actually supposed to in front of the server. Whoops. Also, use .format() in all the string formatting in Method, for consistency's sake. --- dracut/parse-kickstart | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index aa4e0e8..acb41ea 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -32,13 +32,14 @@ class Method(commands.method.F14_Method): method="cdrom" elif self.method == "harddrive": if self.biospart: - method="bd:%s:%s" % (self.partition, self.dir) + method="bd:{0.partition}:{0.dir}".format(self) else: - method="hd:%s:%s" % (self.partition, self.dir) + method="hd:{0.partition}:{0.dir}".format(self) elif self.method == "nfs": - method="nfs:%s:%s" % (self.server, self.dir) if self.opts: - method += ":%s" % self.opts + method="nfs:{0.opts}:{0.server}:{0.dir}".format(self) + else: + method="nfs:{0.server}:{0.dir}".format(self) elif self.method == "url": # FIXME: self.proxy, self.noverifyssl method = self.url -- 1.7.7.6

2 1

[PATCH rhel7-alpha2-branch 2/2] dracut parse-kickstart: support --mtu and clean up a bit
by Will Woods 18 May '12

18 May '12

For simplicity's sake, always use the long form of the "ip=" arg. This lets us throw the MTU into its proper place regardless of the other options. --- dracut/parse-kickstart | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index acb41ea..9baece0 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -162,44 +162,34 @@ def ksnet_to_dracut(args, lineno, net, bootdev=False): line.append("ifname=%s:%s" % (net.device, mac.lower())) # NOTE: dracut currently only does ipv4 *or* ipv6, so only one ip=arg.. + # we'll use the ipv4 config if it's present. if net.bootProto in (BOOTPROTO_DHCP, BOOTPROTO_BOOTP): - ip="dhcp" + net.autoconf="dhcp" elif net.bootProto == BOOTPROTO_IBFT: - ip="ibft" + net.autoconf="ibft" elif net.bootProto == BOOTPROTO_QUERY: log.error("'%s': --bootproto=query is deprecated", " ".join(args)) elif net.bootProto == BOOTPROTO_STATIC: - req = ("gateway", "netmask", "nameserver", "ip") - missing = ", ".join("--%s" % i for i in req if not hasattr(net, i)) - if missing: - log.warn("line %u: network missing %s", lineno, missing) - else: - ip="{0.ip}::{0.gateway}:{0.netmask}:" \ - "{0.hostname}:{0.device}:none".format(net) + net.autoconf="none" elif net.ipv6 == "auto": - ip="auto6" + net.autoconf="auto6" elif net.ipv6 == "dhcp": - ip="dhcp6" + net.autoconf="dhcp6" elif net.ipv6: - ip="[{0.ipv6}]::{0.gateway}:{0.netmask}:" \ - "{0.hostname}:{0.device}:none".format(net) + net.autoconf="none" - if net.device and not ip.endswith(":none"): - line.append("ip=%s:%s" % (net.device, ip)) - else: - line.append("ip=%s" % ip) + if ":" in net.gateway: + net.gateway = "[%s]" % net.gateway + + ip=":".join(net.ip or "[%s]" % net.ipv6, "", net.gateway, net.netmask, + net.hostname, net.device, net.autoconf, net.mtu) + + line.append("ip=%s" % ip) for ns in net.nameserver.split(","): if ns: line.append("nameserver=%s" % ns) - if net.mtu: - # XXX FIXME: dracut doesn't support mtu= (yet) - if net.device: - line.append("mtu=%s:%u" % (net.device, net.mtu)) - else: - line.append("mtu=%u" % net.mtu) - # TODO: nodefroute, noipv[46], nodns: pass along to 'ifcfg' module somehow # TODO FIXME dhcpclass: dracut only uses one dhclient.conf for all ifaces # so we can't (yet) have per-interface dhcpclass -- 1.7.7.6

1 0

Summary of custom partitioning discussion
by Máirín Duffy 18 May '12

18 May '12

Hey Anaconda riders and other folk, I did a blog post summary of our custom partitioning UI discussions from IRC this week: http://blog.linuxgrrl.com/2012/05/18/more-anaconda-custom-partitioning/ Hope it helps, ~m

1 0

[lorax] Use --mac for isohybrid only if doing macboot images
by Martin Gracik 18 May '12

18 May '12

--- share/x86.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/share/x86.tmpl b/share/x86.tmpl index db19bdf..023c1af 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -59,7 +59,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} for img in images: efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) efigraft += " {0}={1}/{0}".format(img,outroot) - efihybrid="--uefi --mac" + efihybrid = "--uefi --mac" if domacboot else "--uefi" %> <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/> %endif -- 1.7.5.4

2 2

[firstboot] Let WM place the window (#821077)
by Brian C. Lane 18 May '12

18 May '12

From: "Brian C. Lane" <bcl(a)redhat.com> Some window managers take a bit of time to be ready to use. With KDE this was causing the screen to have its top left corner centered instead of filling the screen depending on who won the race. This fix doesn't try to center the window, it sets the size to match the screen and lets the WM decide where to put it. This has been tested by forcing the race condition with a 10s sleep before starting the wm. This consistently reproduced the problem and the fix consistently works. --- firstboot/interface.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/firstboot/interface.py b/firstboot/interface.py index d5eff3c..58965c2 100644 --- a/firstboot/interface.py +++ b/firstboot/interface.py @@ -197,6 +197,8 @@ class Interface(object): geometry = screen.get_monitor_geometry(monitor) self._x_size = geometry.width self._y_size = geometry.height + logging.info("Setting size to %sx%s" % (self._x_size, self._y_size)) + self.win.set_size_request(self._x_size, self._y_size) def createMainWindow(self): """Create and initialize the main window. This includes switching to @@ -206,7 +208,7 @@ class Interface(object): """ # Create the initial window and a vbox to fill it with. self.win = gtk.Window() - self.win.set_position(gtk.WIN_POS_CENTER) + self.win.set_position(gtk.WIN_POS_NONE) self.win.set_decorated(False) # we don't set border width here so that the sidebar will meet # the edge of the screen -- 1.7.7.6

3 2

[lorax] Add --nomacboot option
by Martin Gracik 17 May '12

17 May '12

Needed for systems without hfsplus support. --- share/efi.tmpl | 4 +++- share/x86.tmpl | 3 ++- src/pylorax/__init__.py | 4 ++-- src/pylorax/treebuilder.py | 4 ++-- src/sbin/lorax | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/share/efi.tmpl b/share/efi.tmpl index add28ee..1350ebc 100644 --- a/share/efi.tmpl +++ b/share/efi.tmpl @@ -11,7 +11,9 @@ install boot/grub/splash.xpm.gz ${EFIBOOTDIR} ## actually make the EFI images ${make_efiboot("images/efiboot.img")} -${make_efiboot("images/macboot.img", imgtype="apple")} +%if domacboot: + ${make_efiboot("images/macboot.img", imgtype="apple")} +%endif ## This is kinda gross, but then... so's EFI. <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')"> diff --git a/share/x86.tmpl b/share/x86.tmpl index ceeac8f..accbcf2 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -53,7 +53,8 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} <% efiarch = 'X64' if basearch=='x86_64' else 'IA32' efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) - for img in ("images/efiboot.img", "images/macboot.img"): + images = ("images/efiboot.img", "images/macboot.img") if domacboot else ("images/efiboot.img",) + for img in images: efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img) efigraft += " {0}={1}/{0}".format(img,outroot) efihybrid="--uefi --mac" diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 2133d60..64924ce 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -130,7 +130,7 @@ class Lorax(BaseLoraxClass): def run(self, ybo, product, version, release, variant="", bugurl="", isfinal=False, workdir=None, outputdir=None, buildarch=None, volid=None, - remove_temp=False): + domacboot=True, remove_temp=False): assert self._configured @@ -246,7 +246,7 @@ class Lorax(BaseLoraxClass): treebuilder = TreeBuilder(product=self.product, arch=self.arch, inroot=installroot, outroot=self.outputdir, runtime=runtime, isolabel=isolabel, - templatedir=templatedir) + domacboot=domacboot, templatedir=templatedir) logger.info("rebuilding initramfs images") dracut_args=["--xz", "--add", "anaconda", "--omit", "plymouth", diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 87e81b3..cf7540d 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -151,14 +151,14 @@ class RuntimeBuilder(object): class TreeBuilder(object): '''Builds the arch-specific boot images. inroot should be the installtree root (the newly-built runtime dir)''' - def __init__(self, product, arch, inroot, outroot, runtime, isolabel, templatedir=None): + def __init__(self, product, arch, inroot, outroot, runtime, isolabel, domacboot, templatedir=None): # NOTE: if you pass an arg named "runtime" to a mako template it'll # clobber some mako internal variables - hence "runtime_img". self.vars = DataHolder(arch=arch, product=product, runtime_img=runtime, runtime_base=basename(runtime), inroot=inroot, outroot=outroot, basearch=arch.basearch, libdir=arch.libdir, - isolabel=isolabel, udev=udev_escape) + isolabel=isolabel, udev=udev_escape, domacboot=domacboot) self._runner = LoraxTemplateRunner(inroot, outroot, templatedir=templatedir) self._runner.defaults = self.vars self.templatedir = templatedir diff --git a/src/sbin/lorax b/src/sbin/lorax index 09a36df..b4acd01 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -74,6 +74,8 @@ def main(args): help="build architecture", metavar="STRING") optional.add_option("--volid", default=None, help="volume id", metavar="STRING") + optional.add_option("--nomacboot", help="", + action="store_false", default=True, dest="domacboot") # add the option groups to the parser parser.add_option_group(required) @@ -126,7 +128,7 @@ def main(args): lorax.run(yb, opts.product, opts.version, opts.release, opts.variant, opts.bugurl, opts.isfinal, workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch, - volid=opts.volid, remove_temp=True) + volid=opts.volid, domacboot=opts.domacboot, remove_temp=True) def get_yum_base_object(installroot, repositories, mirrorlists=[], -- 1.7.5.4

2 1

[master] Get crashkernel arguments from the crashkernel code dynamically.
by Peter Jones 17 May '12

17 May '12

Instead of us knowing about crashkernel stuff in our code, let the crashkernel guys own that policy. --- pyanaconda/bootloader.py | 5 +++++ pyanaconda/installclasses/rhel.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index cfbd152..a45ae22 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1631,6 +1631,11 @@ class GRUB2(GRUB): stage2_raid_levels = [mdraid.RAID0, mdraid.RAID1, mdraid.RAID4, mdraid.RAID5, mdraid.RAID6, mdraid.RAID10] + def __init__(self, storage): + super(GRUB2, self).__init__(self, storage) + self.boot_args.add("$([ -x /usr/sbin/rhcrashkernel-param ] && "\ + "/usr/sbin/rhcrashkernel-param)") + # XXX we probably need special handling for raid stage1 w/ gpt disklabel # since it's unlikely there'll be a bios boot partition on each disk diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py index d894543..f4a2457 100644 --- a/pyanaconda/installclasses/rhel.py +++ b/pyanaconda/installclasses/rhel.py @@ -39,7 +39,7 @@ class InstallClass(BaseInstallClass): hidden = 1 bootloaderTimeoutDefault = 5 - bootloaderExtraArgs = ["crashkernel=auto"] + bootloaderExtraArgs = [] tasks = [(N_("Minimal"), ["core"])] -- 1.7.10.1

3 4

RFC: core/base/etc, pykickstart
by Bill Nottingham 17 May '12

17 May '12

Right now, we have the following entities: - The 'core' group in comps A list of packages suitable for a small-but-functional install that can still add users, install packages, etc. - The nebulous Minimal Install De-facto defined to be the 'core' group in comps - The 'base' group in comps Another group of random stuff. Included in most default installs. - The '--nobase' option to packages in kickstart Which tells it to (theoretically) not select the 'base' group. And we have the following behavior in various kickstart-using tools: - Anaconda (UI) Always selects 'core' - Anaconda (Kickstart) Always selects 'core' Honors '--nobase'. Selects 'base' if it is not passed. - Pungi Always selects 'core' Honors '--nobase'. Selects 'base' if it is not passed. - livecd-creator, and its derivatves Ignores --nobase, doesn't select *any* groups not explicitly listed This leads to assorted confusion points: - Confusion whether the minimal install includes 'base' or not (it does not, but I've heard this a lot) - Different kickstart tools handling the package list differently What I'd like to do (tangentially related to https://fedoraproject.org/wiki/Features/ReworkPackageGroups) is: - Rename the 'base' group to something else Ideally, if it's named something with fewer connotations than 'base', people will be less likely to think of it as part of a minimal install. - Drop the '--nobase' option Obviously, if we rename 'base', it will 1) be a misnomer 2) not work right without patching. I'd just rather drop it. - Have all tools use the same behavior as livecd-creator If you want a group, list it. If you don't want it, don't list it. Opinions? Bill

3 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel May 2012