Anaconda-devel October 2009

anaconda-devel@lists.fedoraproject.org

29 participants
138 discussions

[PATCH - rhel6-branch] Fix translations of timezones in the UI (#530014).
by Chris Lumens 27 Oct '09

27 Oct '09

This is only needed on rhel6-branch for now. F12 doesn't have the same problem, likely because there's different versions of s-c-date in the two trees. --- iw/timezone_gui.py | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 2e18f5a..165c531 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -113,7 +113,7 @@ class TimezoneWindow(InstallWindow): class AnacondaTZMap(TimezoneMap): def __init__(self, zonetab, default, map="", viewportWidth=480): TimezoneMap.__init__(self, zonetab, default, map=map, viewportWidth=viewportWidth) - self.columns = Enum("TRANSLATED", "TZ", "ENTRY") + self.columns = Enum("TZ", "ENTRY", "TZSORT") def status_bar_init(self): self.status = None @@ -135,12 +135,12 @@ class AnacondaTZMap(TimezoneMap): # York as the default. self.fallbackEntry = entry - iter = self.tzStore.insert_after(iter, [gettext.ldgettext("system-config-date", entry.tz), entry.tz, entry]) + iter = self.tzStore.insert_after(iter, [gettext.ldgettext("system-config-date", entry.tz), entry, entry.tz]) def timezone_list_init (self, default): self.hbox = gtk.HBox() - self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_PYOBJECT) + self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, + gobject.TYPE_STRING) root = self.canvas.root() @@ -149,11 +149,11 @@ class AnacondaTZMap(TimezoneMap): # Add the ListStore to the sorted model after the list has been # populated, since otherwise we end up resorting on every addition. self.tzSorted = gtk.TreeModelSort(self.tzStore) - self.tzSorted.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.tzSorted.set_sort_column_id(self.columns.TZSORT, gtk.SORT_ASCENDING) self.tzCombo = gtk.ComboBox(model=self.tzSorted) cell = gtk.CellRendererText() self.tzCombo.pack_start(cell, True) - self.tzCombo.add_attribute(cell, 'text', 0) + self.tzCombo.add_attribute(cell, 'text', self.columns.TZ) self.tzCombo.connect("changed", self.selectionChanged) self.hbox.pack_start(self.tzCombo, False, False) @@ -163,7 +163,7 @@ class AnacondaTZMap(TimezoneMap): iter = widget.get_active_iter() if iter is None: return - entry = widget.get_model().get_value(iter, self.columns.ENTRY) + entry = widget.get_model().get_value(iter, 1) if entry: self.setCurrent (entry, skipList=1) if entry.long != None and entry.lat != None: @@ -172,10 +172,12 @@ class AnacondaTZMap(TimezoneMap): def updateTimezoneList(self): # Find the currently selected item in the combo box and update both # the combo and the comment label. - iter = self.tzCombo.get_model().get_iter_first() + model = self.tzCombo.get_model() + + iter = model.get_iter_first() while iter: - if self.tzCombo.get_model().get_value(iter, 1) == self.currentEntry.tz: + if model.get_value(iter, 2) == self.currentEntry.tz: self.tzCombo.set_active_iter(iter) break - iter = self.tzCombo.get_model().iter_next(iter) + iter = model.iter_next(iter) -- 1.6.5.rc2

3 3

grub (boot on mdraid) upgrade patches for master
by Radek Vykydal 27 Oct '09

27 Oct '09

Folow-up patches for commit 358a9a34f496fdd2b032edf12274a146b606d1a4 (only in master). When doing bootloader (grub) update during upgrade (especially with boot on mdraid device): - Install it by the same code path as when doing install (install was fixed beforementioned commit). - Remove code duplication that was done when detecting where grub had been installed. - Handle grub stage1 destination that had been written incorrectly in releases F11 and earlier (real destination for /dev/mdX were mbrs). I am not 100% sure about it - see patch [4/4] comment.

4 8

[PATCH] Provide a single checkbox for a minimal install (#523839).
by Chris Lumens 27 Oct '09

27 Oct '09

This patch allows the user to select "Minimal" from the task list and get just a bare minimum of packages. Note that the first task to have all its groups selected by default will be the only one selected in the task list. --- installclasses/fedora.py | 25 +++++++++++++++++++------ iw/task_gui.py | 24 ++++++++++++++++++------ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/installclasses/fedora.py b/installclasses/fedora.py index 009fa7a..bd3aa97 100644 --- a/installclasses/fedora.py +++ b/installclasses/fedora.py @@ -38,17 +38,30 @@ class InstallClass(BaseInstallClass): id = "fedora" name = N_("_Fedora") _description = N_("The default installation of %s includes a set of " - "software applicable for general internet usage. " - "What additional tasks would you like your system " - "to include support for?") + "software applicable for general internet usage. " + "You can optionally select a different software set.") _descriptionFields = (productName,) sortPriority = 10000 if productName.startswith("Red Hat Enterprise"): hidden = 1 - tasks = [(N_("Office and Productivity"), ["graphics", "office"]), - (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],), - (N_("Web Server"), ["web-server"])] + # (Translated Name, Default?, Group List) + tasks = [(N_("Graphical Desktop"), + ["admin-tools", "base", "base-x", "core", "editors", "fonts", + "games", "gnome-desktop", "graphical-internet", "graphics", + "hardware-support", "input-methods", "java", "office", + "printing", "sound-and-video", "text-internet"]), + (N_("Software Development"), + ["base", "base-x", "core", "development-libs", + "development-tools", "editors", "fonts", "gnome-desktop", + "gnome-software-development", "graphical-internet", "graphics", + "hardware-support", "input-methods", "java", "text-internet", + "x-software-development"]), + (N_("Web Server"), + ["admin-tools", "base", "base-x", "core", "editors", + "gnome-desktop", "graphical-internet", "hardware-support", + "java", "text-internet", "web-server"]), + (N_("Minimal"), ["core"])] bugFiler = BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", "https://bugzilla.redhat.com/", diff --git a/iw/task_gui.py b/iw/task_gui.py index aeacd48..067e6cd 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -534,10 +534,13 @@ class TaskWindow(InstallWindow): s = self.xml.get_widget("repoList").get_model() s.append([dialog.repo.isEnabled(), dialog.repo.name, dialog.repo]) - def _taskToggled(self, button, row, store): - i = store.get_iter(int(row)) - val = store.get_value(i, 0) - store.set_value(i, 0, not val) + def _taskToggled(self, button, path, store): + # First, untoggle everything in the store. + for row in store: + row[0] = False + + # Then, enable the one that was clicked. + store[path][0] = True def _anyRepoEnabled(self): model = self.rs.get_model() @@ -580,18 +583,27 @@ class TaskWindow(InstallWindow): tl.set_model(store) cbr = gtk.CellRendererToggle() - col = gtk.TreeViewColumn('', cbr, active = 0) + cbr.set_radio(True) cbr.connect("toggled", self._taskToggled, store) + + col = gtk.TreeViewColumn('', cbr, active = 0) tl.append_column(col) col = gtk.TreeViewColumn('Text', gtk.CellRendererText(), text = 1) col.set_clickable(False) tl.append_column(col) + anyEnabled = False + for (txt, grps) in self.tasks: if not self.backend.groupListExists(grps): continue - store.append([self.backend.groupListDefault(grps), _(txt), grps]) + + enabled = self.backend.groupListDefault(grps) + store.append([not anyEnabled and enabled, _(txt), grps]) + + if enabled: + anyEnabled = True return tl -- 1.6.5.rc2

2 1

[rhel6-branch] fix for DASD and zFCP discovery
by David Cantrell 24 Oct '09

24 Oct '09

For rhel6-branch and master. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[PATCH] [master] Default to /images/install.img if no dir is given in stage2=hd: (#528809)
by Radek Vykydal 23 Oct '09

23 Oct '09

Another option to solve the bug would be to write append "/images/install.img" to "hd:LABEL="Fedora" in buildinstall. --- loader/hdinstall.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/loader/hdinstall.c b/loader/hdinstall.c index a4396df..6d8a50a 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -170,8 +170,11 @@ char * mountHardDrive(struct installMethod * method, /* if exist, duplicate */ if (kspartition) kspartition = strdup(kspartition); - if (ksdirectory) + if (ksdirectory) { ksdirectory = strdup(ksdirectory); + } else { + ksdirectory = strdup("/images/install.img"); + } if (!kspartition || !ksdirectory) { logMessage(ERROR, "missing partition or directory specification"); -- 1.6.0.6

1 0

[PATCH] Add an "sshpw" command for changing the passwords in anaconda's env.
by Peter Jones 22 Oct '09

22 Oct '09

This allows the user to change the passwords for anaconda's "ssh" environment. --- pykickstart/commands/__init__.py | 2 +- pykickstart/commands/sshpw.py | 104 ++++++++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 2 + tests/commands/sshpw.py | 57 +++++++++++++++++++++ 4 files changed, 164 insertions(+), 1 deletions(-) create mode 100644 pykickstart/commands/sshpw.py create mode 100644 tests/commands/sshpw.py diff --git a/pykickstart/commands/__init__.py b/pykickstart/commands/__init__.py index 0952bf8..da48ff5 100644 --- a/pykickstart/commands/__init__.py +++ b/pykickstart/commands/__init__.py @@ -22,5 +22,5 @@ import deviceprobe, displaymode, dmraid, driverdisk, fcoe, firewall, firstboot import group, ignoredisk, interactive, iscsi, iscsiname, key, keyboard, lang import langsupport, lilocheck, logging, logvol, mediacheck, method, monitor import mouse, multipath, network, partition, raid, reboot, repo, rescue, rootpw -import selinux, services, skipx, timezone, updates, upgrade, user, vnc +import selinux, services, skipx, sshpw, timezone, updates, upgrade, user, vnc import volgroup, xconfig, zerombr, zfcp diff --git a/pykickstart/commands/sshpw.py b/pykickstart/commands/sshpw.py new file mode 100644 index 0000000..9d48e22 --- /dev/null +++ b/pykickstart/commands/sshpw.py @@ -0,0 +1,104 @@ +# +# Peter Jones <pjones(a)redhat.com> +# +# Copyright 2009 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +from pykickstart.base import * +from pykickstart.errors import * +from pykickstart.options import * + +import gettext +_ = lambda x: gettext.ldgettext("pykickstart", x) + +class F13_SshPwData(BaseData): + removedKeywords = BaseData.removedKeywords + removedAttrs = BaseData.removedAttrs + + def __init__(self, *args, **kwargs): + BaseData.__init__(self, *args, **kwargs) + self.username = kwargs.get("username", None) + self.isCrypted = kwargs.get("isCrypted", False) + self.password = kwargs.get("password", "") + self.lock = kwargs.get("lock", False) + + def __eq__(self, y): + return self.username == y.username + + def __str__(self): + retval = BaseData.__str__(self) + + retval += "sshpw" + retval += self._getArgsAsStr() + '\n' + + return retval + + def _getArgsAsStr(self): + retval = "" + + retval += " --username=%s" % self.username + if self.lock: + retval += " --lock" + if self.isCrypted: + retval += " --iscrypted" + else: + retval += " --plaintext" + + retval += " %s" % self.password + return retval + +class F13_SshPw(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords + removedAttrs = KickstartCommand.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + KickstartCommand.__init__(self, writePriority, *args, **kwargs) + self.op = self._getParser() + + self.sshUserList = kwargs.get("sshUserList", []) + + def __str__(self): + retval = "" + for user in self.sshUserList: + retval += user.__str__() + + return retval + + def _getParser(self): + op = KSOptionParser() + op.add_option("--username", dest="username", required=True) + op.add_option("--iscrypted", dest="isCrypted", action="store_true", + default=False) + op.add_option("--plaintext", dest="isCrypted", action="store_false") + op.add_option("--lock", dest="lock", action="store_true", default=False) + return op + + def parse(self, args): + ud = self.handler.SshPwData() + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + self._setToObj(self.op, opts, ud) + + if len(extra) != 1: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("A single argument is expected for the %s command") % "sshpw") + ud.password = extra[0] + + if ud in self.dataList(): + warnings.warn(_("An ssh user with the name %s has already been defined.") % ud.name) + + return ud + + def dataList(self): + return self.sshUserList diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index e6f62c0..9d15cfd 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -636,6 +636,7 @@ commandMap = { "services": services.FC6_Services, "shutdown": reboot.FC6_Reboot, "skipx": skipx.FC3_SkipX, + "sshpw": sshpw.F13_SshPw, "text": displaymode.FC3_DisplayMode, "timezone": timezone.FC6_Timezone, "updates": updates.F7_Updates, @@ -961,6 +962,7 @@ dataMap = { "PartData": partition.F12_PartData, "RaidData": raid.F12_RaidData, "RepoData": repo.F13_RepoData, + "SshPwData": sshpw.F13_SshPwData, "UserData": user.F12_UserData, "VolGroupData": volgroup.FC3_VolGroupData, "ZFCPData": zfcp.F12_ZFCPData, diff --git a/tests/commands/sshpw.py b/tests/commands/sshpw.py new file mode 100644 index 0000000..2187c74 --- /dev/null +++ b/tests/commands/sshpw.py @@ -0,0 +1,57 @@ +# +# Peter Jones <pjones(a)redhat.com> +# +# Copyright 2009 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +import unittest, shlex +import warnings +from tests.baseclass import * + +from pykickstart.errors import * +from pykickstart.commands.sshpw import * + +class F13_TestCase(CommandTest): + def runTest(self): + # pass + self.assert_parse("sshpw --username=someguy --iscrypted secrethandshake", "sshpw --username=someguy --iscrypted secrethandshake\n") + + # fail + self.assert_parse_error("sshpw", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy --iscrypted=OMGSEKRITZ", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --iscrypted", KickstartValueError) + + # pass + self.assert_parse("sshpw --username=someguy --lock secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext secrethandshake", "sshpw --username=someguy --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext --iscrypted secrethandshake", "sshpw --username=someguy --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --plaintext secrethandshake\n", "sshpw --username=someguy --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --plaintext secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --lock secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --iscrypted --plaintext secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --plaintext --iscrypted secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext --iscrypted --lock secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --plaintext --lock secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + + # fail + self.assert_parse_error("sshpw --username=someguy --plaintext=ISEEENGLAND secrethandshake", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --lock=NOKEYSFORYOU secrethandshake", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --plaintext", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy --lock", KickstartValueError) + +if __name__ == "__main__": + unittest.main() -- 1.6.5.rc2

2 2

[PATCH] Add the bcm5974 kernel module needed for some touchpads (#474225).
by Chris Lumens 22 Oct '09

22 Oct '09

--- scripts/mk-images | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 3d32d7d..44e4664 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -96,7 +96,7 @@ TOPDIR=$(cd $TOPDIR; pwd) # modules that are needed. this is the generic "needed for every arch" stuff COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci netconsole" -USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch" +USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch bcm5974" FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci" SDMODS="mmc-block sdhci sdhci-pci" IDEMODS="ide-cd ide-cd_mod" -- 1.6.5.rc2

2 1

Anaconda and Physical NIC
by Viswanath Krishnamurthy 22 Oct '09

22 Oct '09

Folks, During PXE install process, does Anaconda always look for physical Ethernet devices (PCI devices)? Is there a way Anaconda can recognize a virtual network interface (which uses other physical media like IB (Infiniband) as transport). The virtual NIC driver does not have an actual PCI device associated with it. Thx, Viswa

1 0

[f12-branch] & [master] - force swap formatting
by David Cantrell 22 Oct '09

22 Oct '09

For kickstart installs with autopart set, force swap partition formatting if any of the swap exceptions are raised. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 3

[rhel6-branch] merge in things from dist-cvs
by David Cantrell 21 Oct '09

21 Oct '09

We have a rhel6-branch, so vacuum up things from RHEL-6 dist-cvs and put them in git. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 10

← Newer
1
2
3
4
5
6
7
...
14
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel October 2009