Anaconda-devel May 2010

anaconda-devel@lists.stg.fedoraproject.org

25 participants
180 discussions

[PATCH f13-branch master] Retain user's UTC checkbox setting (#591125)
by Brian C. Lane 12 Jun '10

12 Jun '10

This sets the initial UTC setting when anaconda.timezone is initialized instead of every time the timezone UI is entered. --- anaconda | 9 ++++++++- iw/timezone_gui.py | 4 ---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/anaconda b/anaconda index 0f54d65..d16abd8 100755 --- a/anaconda +++ b/anaconda @@ -588,8 +588,15 @@ class Anaconda(object): def timezone(self): if not self._timezone: import timezone + from bootloader import hasWindows + self._timezone = timezone.Timezone() - self._timezone.setTimezoneInfo(self.instLanguage.getDefaultTimeZone(self.rootPath)) + tz = self.instLanguage.getDefaultTimeZone(self.rootPath) + if not self.ksdata: + utc = not hasWindows(anaconda.bootloader) + else: + utc = 0 + self._timezone.setTimezoneInfo(tz, utc) return self._timezone diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index c5ecd88..1a821b7 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -30,7 +30,6 @@ import sys from timezone_map_gui import TimezoneMap, Enum from iw_gui import * from booty.bootloaderInfo import dosFilesystems -from bootloader import hasWindows from constants import * import gettext @@ -104,9 +103,6 @@ class TimezoneWindow(InstallWindow): self.tz.setCurrent(self.zonetab.findEntryByTZ(self.default)) self.utcCheckbox.set_active(asUTC) - if not anaconda.ksdata: - self.utcCheckbox.set_active(not hasWindows(anaconda.bootloader)) - self.notebook.remove(self.vbox) return self.vbox -- 1.6.6.1

4 6

[RFC] correctly pass s390 netconfig to loader and NM (#595388, #595382)
by Steffen Maier 11 Jun '10

11 Jun '10

--- loader/linuxrc.s390 | 44 +------------------------------------------- loader/loader.c | 16 ++++++++++++++++ loader/net.c | 21 +++++++-------------- 3 files changed, 24 insertions(+), 57 deletions(-) diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 99e5192..a5cedaf 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -2971,49 +2971,7 @@ done # [ "$ipv6" ] && echo "IPV6=yes" # transfer options into install environment -cat > /tmp/install.cfg << EOF -LANG="$LANG" -S390ARCH="$S390ARCH" -TEXTDOMAIN="$TEXTDOMAIN" -TEXTDOMAINDIR="$TEXTDOMAINDIR" -PORTNAME="$PORTNAME" -HOSTNAME="$HOSTNAME" -DEVICE="$DEVICE" -NETTYPE="$NETTYPE" -IPADDR="$IPADDR" -GATEWAY="$GATEWAY" -MTU="$MTU" -NETWORK="$NETWORK" -NETMASK="$NETMASK" -BROADCAST="$BROADCAST" -SEARCHDNS="$SEARCHDNS" -PEERID="$PEERID" -SUBCHANNELS="$SUBCHANNELS" -ONBOOT="yes" -CTCPROT="$CTCPROT" -EOF -if [ "$ipv6" ]; then - DNS1=$(echo $DNS | cut -d ',' -f 1) - echo DNS=\"$DNS1\" >> /tmp/install.cfg - echo DNS1=\"$DNS1\" >> /tmp/install.cfg - echo DNS2=\"$(echo $DNS | cut -d ',' -f 2)\" >> /tmp/install.cfg -else - DNS1=$(echo $DNS | cut -d ':' -f 1) - echo DNS=\"$DNS1\" >> /tmp/install.cfg - echo DNS1=\"$DNS1\" >> /tmp/install.cfg - echo DNS2=\"$(echo $DNS | cut -d ':' -f 2)\" >> /tmp/install.cfg -fi -cat >> /tmp/install.cfg << EOF -export LANG PORTNAME S390ARCH TEXTDOMAIN TEXTDOMAINDIR -export HOSTNAME DEVICE NETTYPE IPADDR GATEWAY MTU -export NETWORK NETMASK BROADCAST DNS DNS1 DNS2 SEARCHDNS -export PEERID ONBOOT SUBCHANNELS CTCPROT -EOF -# immediately read it in again to export these into the shell below -. /tmp/install.cfg -if [ -z "$testing" ]; then - cat /tmp/install.cfg >> /etc/profile -fi # testing +# loader now uses ifcfg instead of install.cfg to receive our network config NETSCRIPTS="/etc/sysconfig/network-scripts" IFCFGFILE="$NETSCRIPTS/ifcfg-$DEVICE" diff --git a/loader/loader.c b/loader/loader.c index 63594d8..19149d6 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -692,6 +692,8 @@ static void readNetInfo(struct loaderData_s ** ld) { } else { if (!g_strcmp0(pair[0], "IPADDR")) { loaderData->ipv4 = strdup(val); + loaderData->ipinfo_set = 1; + flags |= LOADER_FLAGS_IP_PARAM; } else if (!g_strcmp0(pair[0], "NETMASK")) { loaderData->netmask = strdup(val); } else if (!g_strcmp0(pair[0], "GATEWAY")) { @@ -718,15 +720,23 @@ static void readNetInfo(struct loaderData_s ** ld) { loaderData->nettype = strdup(val); } else if (!g_strcmp0(pair[0], "CTCPROT")) { loaderData->ctcprot = strdup(val); +/* FIXME: That's deprecated install.cfg syntax. + ifcfg syntax is OPTIONS="layer2=X portno=Y" and we need to parse this. + Optionally just take the value of OPTIONS as string without parsing + and get rid of the layer2 and portno fields of loaderData_S and iface_t. + After all, OPTIONS can contain any qeth sysfs attribute not just layer2 or + portno. } else if (!g_strcmp0(pair[0], "LAYER2")) { loaderData->layer2 = strdup(val); } else if (!g_strcmp0(pair[0], "PORTNO")) { loaderData->portno = strdup(val); +*/ } else if (!g_strcmp0(pair[0], "MACADDR")) { loaderData->macaddr = strdup(val); } else if (!g_strcmp0(pair[0], "HOSTNAME")) { loaderData->hostname = strdup(val); } + /* FIXME: IPv6 support still missing */ } g_free(val); @@ -737,9 +747,11 @@ static void readNetInfo(struct loaderData_s ** ld) { line++; } + /* bogus and not compatible with ipv6 if (loaderData->ipv4 && loaderData->netmask) { flags |= LOADER_FLAGS_HAVE_CMSCONF; } + */ free(cfgfile); g_strfreev(lines); @@ -1470,6 +1482,10 @@ static char *doLoaderMain(struct loaderData_s *loaderData, logMessage(INFO, "going to do getNetConfig"); /* s390 provides all config info by way of the CMS conf file */ + /* This is broken. Info can also be given by parm file or even + interactively without any cms conf file. + Also it could be ipv4, ipv6, or both, so we cannot assume + it's always both just because of that bogus flag. */ if (FL_HAVE_CMSCONF(flags)) { loaderData->ipinfo_set = 1; #ifdef ENABLE_IPV6 diff --git a/loader/net.c b/loader/net.c index dd27916..a302e02 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1412,27 +1412,20 @@ int writeEnabledNetInfo(iface_t *iface) { fprintf(fp, "CTCPROT=%s\n", iface->ctcprot); } - if (iface->layer2 && !strcmp(iface->layer2, "1")) { - osa_layer2 = 1; - } - - if (iface->portno && !strcmp(iface->portno, "1")) { - osa_portno = 1; - } - - if (osa_layer2 || osa_portno) { + /* don't (mis)understand layer2 and portno values, just pass them */ + if (iface->layer2 || iface->portno) { fprintf(fp, "OPTIONS=\""); - if (osa_layer2) { - fprintf(fp, "layer2=1"); + if (iface->layer2) { + fprintf(fp, "layer2=%s", iface->layer2); } - if (osa_layer2 && osa_portno) { + if (iface->layer2 && iface->portno) { fprintf(fp, " "); } - if (osa_portno) { - fprintf(fp, "portno=1"); + if (iface->portno) { + fprintf(fp, "portno=%s", iface->portno); } fprintf(fp, "\"\n"); -- 1.7.0.4

2 3

[PATCH 0/3] s390 install blocker fixes for master and rhel6-branch
by Steffen Maier 11 Jun '10

11 Jun '10

Correctly pass netdev name from linuxrc.s390 to loader (#595382) Fix readNetInfo and writeEnabledNetInfo for s390 (#595388) Fix most of what is necessary for install over IPv6 on s390 (#594090) booty/bootloaderInfo.py | 15 --------- isys/iface.c | 3 +- isys/iface.h | 3 +- loader/linuxrc.s390 | 66 +++++++++++++++-------------------------- loader/loader.c | 74 ++++++++++++++++++++++++++++++++++++++-------- loader/loader.h | 3 +- loader/net.c | 64 ++++++++++++++++++++-------------------- 7 files changed, 121 insertions(+), 107 deletions(-)

4 31

Driver Disk v3 format
by Prudhvi_Tella＠Dell.com 08 Jun '10

08 Jun '10

2 3

Obtaining the list of files generated by anaconda
by Roberto Sassu 04 Jun '10

04 Jun '10

Hi all i'm new to anaconda. I'm trying to investigate if it's possible to track the installation process in order to distinguish between files written in the target volume that are generated depending on the configuration specified by the user and those that are extracted from RPM packages. What is the correct approach to do that? Thanks in advance for replies.

2 3

[PATCH rhel6-branch] Fix parsing of ifcfg OPTIONS parameter (#597205)
by Radek Vykydal 03 Jun '10

03 Jun '10

--- simpleconfig.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/simpleconfig.py b/simpleconfig.py index 23fcaaa..d00f52f 100644 --- a/simpleconfig.py +++ b/simpleconfig.py @@ -112,9 +112,7 @@ class IfcfgFile(SimpleConfigFile): line = line.strip() if line.startswith("#") or line == '': continue - fields = line.split('=', 2) - if len(fields) < 2: - continue + fields = line.split('=', 1) key = uppercase_ASCII_string(fields[0]) value = fields[1] # XXX hack -- 1.6.0.6

3 2

[rhel6-branch] fix error saving screenshots during package install (#594826).
by Ales Kozumplik 02 Jun '10

02 Jun '10

fixed by copying contents of /mnt/sysimage/tmp/anaconda-screenshots too. also disable the metacity screenshot shortcuts so no errors are seen. in fact, we are now catching PrintScrn to do a screenshot ourselves. --- gui.py | 49 ++++++++++++++++++++++++------------------------- scripts/upd-instroot | 14 ++++++++++++++ 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/gui.py b/gui.py index 88942d3..b2b5bf6 100755 --- a/gui.py +++ b/gui.py @@ -89,13 +89,10 @@ if iutil.isS390(): # # Stuff for screenshots # -screenshotDir = None +screenshotDir = "/tmp/anaconda-screenshots" screenshotIndex = 0 def copyScreenshots(): - global screenshotIndex - global screenshotDir - # see if any screenshots taken if screenshotIndex == 0: return @@ -110,12 +107,18 @@ def copyScreenshots(): "to disk."), type="warning") return - # copy all png's over - for f in os.listdir(screenshotDir): - (path, fname) = os.path.split(f) - (b, ext) = os.path.splitext(f) - if ext == ".png": - shutil.copyfile(screenshotDir + '/' + f, destDir + '/' + fname) + # Now copy all the PNGs over. Since some pictures could have been taken + # under a root changed to /mnt/sysimage, we have to try to fetch files from + # there as well. + source_dirs = [screenshotDir, os.path.join("/mnt/sysimage", screenshotDir.lstrip('/'))] + for source_dir in source_dirs: + if not os.access(source_dir, os.X_OK): + continue + for f in os.listdir(source_dir): + (path, fname) = os.path.split(f) + (b, ext) = os.path.splitext(f) + if ext == ".png": + shutil.copyfile(source_dir + '/' + f, destDir + '/' + fname) window = MessageWindow(_("Screenshots Copied"), _("The screenshots have been saved in the " @@ -126,16 +129,12 @@ def copyScreenshots(): def takeScreenShot(): global screenshotIndex - global screenshotDir - - if screenshotDir is None: - screenshotDir = "/tmp/anaconda-screenshots" if not os.access(screenshotDir, os.R_OK): try: os.mkdir(screenshotDir) - except: - screenshotDir = None + except OSError as e: + log.error("os.mkdir() failed for %s: %s" % (screenshotDir, e.strerror)) return try: @@ -153,13 +152,13 @@ def takeScreenShot(): if not os.access(screenshotDir + '/' + sname, os.R_OK): break - screenshotIndex = screenshotIndex + 1 + screenshotIndex += 1 if screenshotIndex > 9999: log.error("Too many screenshots!") return screenshot.save (screenshotDir + '/' + sname, "png") - screenshotIndex = screenshotIndex + 1 + screenshotIndex += 1 window = MessageWindow(_("Saving Screenshot"), _("A screenshot named '%s' has been saved.") % (sname,) , @@ -172,10 +171,11 @@ def takeScreenShot(): "to try several times for it to succeed."), type="warning") -def handleShiftPrintScrnRelease (window, event): - if (event.keyval == gtk.keysyms.Print and event.state & gtk.gdk.SHIFT_MASK): +def handlePrintScrnRelease (window, event): + log.critical("handle()") + if event.keyval == gtk.keysyms.Print: + log.critical("Print") takeScreenShot() - # # HACK to make treeview work # @@ -309,7 +309,7 @@ def titleBarMotionEventCB(widget, event, data): def addFrame(dialog, title=None): # make screen shots work - dialog.connect ("key-release-event", handleShiftPrintScrnRelease) + dialog.connect ("key-release-event", handlePrintScrnRelease) if title: dialog.set_title(title) @@ -1471,8 +1471,7 @@ class InstallControlWindow: elif (event.keyval == gtk.keysyms.F12 and self.currentWindow.getICS().getNextEnabled()): self.nextClicked() - elif (event.keyval == gtk.keysyms.Print - and event.state & gtk.gdk.SHIFT_MASK): + elif event.keyval == gtk.keysyms.Print: takeScreenShot() def _doExit (self, *args): @@ -1524,7 +1523,7 @@ class InstallControlWindow: def connectSignals(self): sigs = { "on_nextButton_clicked": self.nextClicked, - "on_rebootButton_clicked": self._doExit, + "on_rebootButton_clicked": self.nextClicked, "on_closeButton_clicked": self._doExit, "on_backButton_clicked": self.prevClicked, "on_debugButton_clicked": self.debugClicked, diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 4c5f1b1..8b133b6 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -991,6 +991,20 @@ cat > $GCONF_RULES_FILE <<EOF <string>disabled</string> </value> </entry> + <entry> + <key>metacity/global_keybindings/run_command_window_screenshot</key> + <schema_key>/metacity/global_keybindings/run_command_window_screenshot</schema_key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>metacity/global_keybindings/run_command_screenshot</key> + <schema_key>/metacity/global_keybindings/run_command_screenshot</schema_key> + <value> + <string>disabled</string> + </value> + </entry> </entrylist> </gconfentryfile> -- 1.7.0.1

2 3

[master&rhel6-branch] Only kill init for reboot/halt and then exit linuxrc.s390
by Steffen Maier 02 Jun '10

02 Jun '10

Like init.c, linuxrc.s390 should exit immediately after having sent the corresponding signal to the init process when called as reboot or halt (or poweroff in the future). While it might often not be noticed, if linuxrc continues after sending the signal since the system shuts down anyway, there are practical cases where the signalling does not work and linuxrc would otherwise startup yet another instance of the installer. Even though, linuxrc detects that it does not run with PID==1, we should not bet on its "test" mode for the cases where it serves as replacement for reboot/halt. Related: rhbz#571370 --- loader/linuxrc.s390 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 99e5192..614f7ff 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -43,8 +43,10 @@ if [ "${0##*/}" = "reboot" ]; then kill -USR2 1 + exit elif [ "${0##*/}" = "halt" ]; then kill -USR1 1 + exit fi VERSION=1.2 -- 1.7.0.4

2 1

[PATCH] [UT] Unittesting improvements
by Martin Sivak 01 Jun '10

01 Jun '10

These patches finalize the modifications to the existing tests in tests directory and to the unittesting environment so we can start writing tests which are supposed to be ran on developer's machine before any building (eg. sanity checking the methods and interfaces we have tests for). Additionally, tests may be marked as @slow or @acceptance to specify, that they should be ran only after everything was build and installed (partitioning tests and similar). Everything described here was made possible by moving from our unittest control script to python-nose package. The usage now is really simple (works even before configure has been run): make -f Makefile.am unittest - for the sanity checks make -f Makefile.am fulltest - for the full acceptance checks Martin

2 4

[PATCH] Allow "ignoredisk" to explicitly specify interactive usage (#596804)
by Peter Jones 01 Jun '10

01 Jun '10

We want the user to be able to manually navigate advanced storage when using a ks.cfg without partitioning sections. --- pykickstart/commands/ignoredisk.py | 47 +++++++++++++++++++++++++++++++++-- pykickstart/handlers/control.py | 2 +- tests/commands/ignoredisk.py | 17 +++++++++++++ 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/pykickstart/commands/ignoredisk.py b/pykickstart/commands/ignoredisk.py index 607d696..83e1048 100644 --- a/pykickstart/commands/ignoredisk.py +++ b/pykickstart/commands/ignoredisk.py @@ -77,11 +77,12 @@ class F8_IgnoreDisk(FC3_IgnoreDisk): return retval - def parse(self, args): + def parse(self, args, errorCheck=True): retval = FC3_IgnoreDisk.parse(self, args) - if (len(self.ignoredisk) == 0 and len(self.onlyuse) == 0) or (len(self.ignoredisk) > 0 and (len(self.onlyuse) > 0)): - raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("One of --drives or --only-use must be specified for ignoredisk command.")) + if errorCheck: + if (len(self.ignoredisk) == 0 and len(self.onlyuse) == 0) or (len(self.ignoredisk) > 0 and (len(self.onlyuse) > 0)): + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("One of --drives or --only-use must be specified for ignoredisk command.")) return retval @@ -96,3 +97,43 @@ class F8_IgnoreDisk(FC3_IgnoreDisk): op.add_option("--only-use", dest="onlyuse", action="callback", callback=drive_cb, nargs=1, type="string") return op + +class RHEL6_IgnoreDisk(F8_IgnoreDisk): + removedKeywords = F8_IgnoreDisk.removedKeywords + removedAttrs = F8_IgnoreDisk.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + F8_IgnoreDisk.__init__(self, writePriority, *args, **kwargs) + + self.interactive = kwargs.get("interactive", False) + if self.interactive: + self.ignoredisk = [] + + def __str__(self): + retval = F8_IgnoreDisk.__str__(self) + + if self.interactive: + retval = "ignoredisk --interactive\n" + + return retval + + def parse(self, args): + retval = F8_IgnoreDisk.parse(self, args, errorCheck=False) + + howmany = 0 + if len(self.ignoredisk) > 0: + howmany += 1 + if len(self.onlyuse) > 0: + howmany += 1 + if self.interactive: + howmany += 1 + if howmany != 1: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("One of --drives , --only-use , or --interactive must be specified for ignoredisk command.")) + + return retval + + def _getParser(self): + op = F8_IgnoreDisk._getParser(self) + op.add_option("--interactive", dest="interactive", action="store_true", + default=False) + return op diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 51651b8..2bcb566 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -830,7 +830,7 @@ commandMap = { "group": group.F12_Group, "halt": reboot.FC6_Reboot, "harddrive": method.F13_Method, - "ignoredisk": ignoredisk.F8_IgnoreDisk, + "ignoredisk": ignoredisk.RHEL6_IgnoreDisk, "install": upgrade.F11_Upgrade, "interactive": interactive.FC3_Interactive, "iscsi": iscsi.F10_Iscsi, diff --git a/tests/commands/ignoredisk.py b/tests/commands/ignoredisk.py index 23c5840..f535689 100644 --- a/tests/commands/ignoredisk.py +++ b/tests/commands/ignoredisk.py @@ -59,5 +59,22 @@ class F8_TestCase(FC3_TestCase): self.assert_parse_error("ignoredisk --drives=sda --only-use=sdb", KickstartValueError) self.assert_parse_error("ignoredisk --only-use=sda --drives=sdb", KickstartValueError) +class RHEL6_TestCase(F8_TestCase): + def runTest(self): + # Run parents class tests + F8_TestCase.runTest(self) + + # pass + self.assert_parse("ignoredisk --interactive", "ignoredisk --interactive\n") + + # fail + # both options provided + self.assert_parse_error("ignoredisk --drives=sda --interactive", KickstartValueError) + self.assert_parse_error("ignoredisk --interactive --drives=sda", KickstartValueError) + self.assert_parse_error("ignoredisk --only-use=sda --interactive", KickstartValueError) + self.assert_parse_error("ignoredisk --interactive --only-use=sda", KickstartValueError) + self.assert_parse_error("ignoredisk --interactive --drives=sda --only-use=sdb", KickstartValueError) + self.assert_parse_error("ignoredisk --only-use=sda --drives=sdb --interactive", KickstartValueError) + if __name__ == "__main__": unittest.main() -- 1.7.0.1

2 3

Jump to page:

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 2010