Anaconda-devel October 2008

anaconda-devel@lists.stg.fedoraproject.org

17 participants
32 discussions

[PATCH] removal of libdhcp
by David Cantrell 21 Dec '08

21 Dec '08

No patch attached because it's quite large. I apologize for the length, but considering this replaces a library and introduces a new struct it meant a new file and changing calls everywhere. http://dcantrel.fedorapeople.org/anaconda/iface/ iface.h - Header file explaining the iface API. iface_t structure replacing pumpNetIntf and networkDeviceConfig, and all of the functions. iface.patch - The changes, it's about 90% complete at this point. *.txt - Explanations and notes. This patch removes anaconda's use of libdhcp, which also means removing libdhcp4client and libdhcp6client. For static network configuration, I am using libnl. To gather current network interface information, I am using libnl. To control IPv6 autoconf, I read/ write /proc since that's all we can do right now. For DHCP and DHCPv6, I run dhclient and dhcp6c, respectively. I'd like everyone to have a look at iface.h and the patch file. It's not complete yet, so I probably know about the obvious things (the FIXMEs and the useless debugging printfs and the incomplete isys.py code and so on). The goal with iface.patch is to get us closer to using NetworkManager in stage 1 and stage 2. I envision the NM changeover to be just as large, but hopefully by then we will have decided to nuke certain parts of loader entirely. Completely eliminating libdhcp and friends will be a nice step. There are some other things that need discussion as well. mkinitrd currently uses libdhcp, for example. This had me thinking we could generate libisys in an anaconda-devel package for things like mkinitrd, but I'm just brainstorming. Maybe I should put the iface code elsewhere? I dunno. At any rate, mkinitrd needs to be not left out. Work in progress, comments welcome. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

8 28

Re: Can the install method be contained within a kickstart file that is referenced via a %include option
by Niels de Vos 11 Nov '08

11 Nov '08

Hello Matt, Matthew Richards wrote: > I suppose that having a Stage0 solution would indeed be more elegant > than an updates.img solution. I'm guessing that you would not have to > rebuild a Stage0 image very often but would have to re-generate an > updates.img patch any time you moved to a new version of Anaconda. It's not that elegant, just working around limitations of anaconda. > I'm curious about this "some kind of detection with two ks.cfgs" that > you refer to. It sounds like you are implying that this is done via a > custom patch to Anaconda? I can't help wondering if Anaconda is > flexible enough to allow this sort of thing without a custom patch > by, say, placing 2 ks= options in the bootloader config - but that > would probably result in either an error or only one of the ks.cfg > files being parsed . . . sorry, just thinking as I type. The patch in Bugzilla (#) exactly does make this possible. With this patch, a ks= option allows more than one ks.cfg. However, it's just an other workaround for missing functionality. I still don't know what the best way would be to implement this correctly in anaconda/kickstart. > It is a bit of a challenge to guess what you are getting at with my > limited Linux app development knowledge, but I imagine you are > proposing to: > > (1) Build a new initrd.img containing only the resources needed for > your basic environment and the tasks that you need to perform ( I > have little idea what this would contain but I suppose I could find > out from Anaconda-Init source and its dependencies, or from LSB, or > from Linux From Scratch or something similar). These are not the references I would suggest. It's probably far more easy to look into a standard /boot/initrd-$(uname -r).img. They are now in cpio.gz format, extract it like: mkdir /tmp/my-initrd cd /tmp/my-initrd gunzip /boot/initrd-$(uname -r).img | cpio -id The script init is the starting point and can be extended/replaced. It might be adviseable to include a busybox or something like it ;) > (2) Write a new Stage0-Anaconda-Init based on Stage1 Anaconda-Init, > that will run your tasks and then finish by loading Stage1 initrd.img > and running /sbin/loader? No, don't write a stage0-anaconda-init. It is more like "stage0 bootstraps anaconda". In the init you would do a minimal setup of the system (like a standard initrd.img) and some extras: * detect the install target (search for /dev/sda,sdb,...) * detect the install source (search for/dev/sda,sdb,http,nfs,...) * create a tmp-directory * extract the original initrd.img which includes the loader * sed ks.cfg and save it in the same tmp-directory * exec chroot tmp-directory /bin/loader Note that the loader parses /proc/cmdline, therefore you can set ks=file:///tmp/ks.cfg as boot option. > How's that for a guess? Close, but don't think too complicated. Only try to do the minimal things needed. Everything what the proposed stage0 does can easily be written in shell-scripts. Good luck, Niels -- WINCOR NIXDORF International GmbH Sitz der Gesellschaft: Paderborn Registergericht Paderborn HRB 3507 Geschäftsführer: Eckard Heidloff (Vorsitzender), Stefan Auerbach, Dr. Jürgen Wunram Vorsitzender des Aufsichtsrats: Karl-Heinz Stiller Steuernummer: 339/5884/0020 - Ust-ID Nr.: DE812927716 - WEEE-Reg.-Nr. DE44477193 Diese E-Mail enthält vertrauliche Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese E-Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser E-Mail ist nicht gestattet. This e-mail may contain confidential information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorised copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

3 4

[PATCH] Improve filtering of non-available groups (#469438)
by Jeremy Katz 02 Nov '08

02 Nov '08

We show groups that don't have any of their mandatory packages available which is less than ideal as, eg, xfce-desktop gets shown just because gdm is on the dvd. So make our filtering a little bit stronger. And make sure that text mode is using the same filtering --- iw/GroupSelector.py | 23 +++-------------------- textw/grpselect_text.py | 2 ++ yuminstall.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/iw/GroupSelector.py b/iw/GroupSelector.py index 18df2ee..a8df9fa 100644 --- a/iw/GroupSelector.py +++ b/iw/GroupSelector.py @@ -120,28 +120,11 @@ def _selectPackage(ayum, group, pkg): else: map(lambda x: x.groups.append(grpid), txmbrs) -def _groupHasPackages(grp, ayum): - # this checks to see if the given group has any packages available - # (ie, already installed or in the sack of available packages) - # so that we don't show empty groups - for p in grp.packages: - try: - pkgs = ayum.pkgSack.returnNewestByName(p) - return True - except yum.Errors.PackageSackError: - pass - try: - pkgs = ayum.rpmdb.returnNewestByName(p) - return True - except (IndexError, yum.Errors.PackageSackError): - pass - return False - def _catHasGroupWithPackages(cat, ayum): grps = map(lambda x: ayum.comps.return_group(x), filter(lambda x: ayum.comps.has_group(x), cat.groups)) for g in grps: - if _groupHasPackages(g, ayum): + if ayum._groupHasPackages(g): return True return False @@ -373,7 +356,7 @@ class GroupSelector: filter(lambda x: self.ayum.comps.has_group(x), groups)) grps.sort(ui_comps_sort) for grp in grps: - if not _groupHasPackages(grp, self.ayum): + if not self.ayum._groupHasPackages(grp): continue s = "<span size=\"large\" weight=\"bold\">%s</span>" % xmltrans(grp.name, grp.translated_name) @@ -488,7 +471,7 @@ class GroupSelector: # conceivably should be handled by yum grps = {} for g in self.ayum.comps.groups: - if g.user_visible and _groupHasPackages(g, self.ayum): + if g.user_visible and self.ayum._groupHasPackages(g): grps[g.groupid] = g for cat in self.ayum.comps.categories: diff --git a/textw/grpselect_text.py b/textw/grpselect_text.py index ff4a402..fe98e37 100644 --- a/textw/grpselect_text.py +++ b/textw/grpselect_text.py @@ -75,6 +75,8 @@ class GroupSelectionWindow: # FIXME: this is very yum backend specific... groups = filter(lambda x: x.user_visible, anaconda.backend.ayum.comps.groups) + groups = filter(lambda x: anaconda.backend.ayum.._groupHasPackages(x), + groups) groups.sort(ui_comps_sort) ct = CheckboxTree(height = 6, scroll = (len(groups) > 6)) for grp in groups: diff --git a/yuminstall.py b/yuminstall.py index 3cf5f95..8a56fcb 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -901,6 +901,35 @@ class AnacondaYum(YumSorter): return True return False + def _pkgExists(self, pkg): + """Whether or not a given package exists in our universe.""" + try: + pkgs = self.pkgSack.returnNewestByName(pkg) + return True + except yum.Errors.PackageSackError: + pass + try: + pkgs = self.rpmdb.returnNewestByName(pkg) + return True + except (IndexError, yum.Errors.PackageSackError): + pass + return False + + def _groupHasPackages(self, grp): + # this checks to see if the given group has any packages available + # (ie, already installed or in the sack of available packages) + # so that we don't show empty groups. also, if there are mandatory + # packages and we have none of them, don't show + for pkg in grp.mandatory_packages.keys(): + if self._pkgExists(pkg): + return True + if len(grp.mandatory_packages) > 0: + return False + for pkg in grp.default_packages.keys() + grp.optional_packages.keys(): + if self._pkgExists(pkg): + return True + return False + class YumBackend(AnacondaBackend): def __init__ (self, anaconda): AnacondaBackend.__init__(self, anaconda) -- 1.6.0.3

2 1

Sample punch card reader script for s390x
by David Cantrell 31 Oct '08

31 Oct '08

IBM filed a feature request against RHEL 6.0 to include a sample punch card reader script on the install media for s390x. Since it's a rhel6 request, we should get those in to Fedora earlier rather than later, so here's the patch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 9

[PATCH] fix a regression involving encrypted PVs
by David Lehman 31 Oct '08

31 Oct '08

Hi, I recently put in a patch that prevented us from marking as available any encrypted PVs the user chose not to provide a passphrase for. The unforeseen consequence, a result of the way we track information about encrypted devices, was that if you give a passphrase for a preexisting encrypted PV, delete it, then create a non-encrypted PV with the same name (eg: sda2) the LVM button will reject you, saying you don't have any available PVs. This is because the filtering I added for the first case described is also erroneously catching this one. Following is a patch that I have tested fairly thoroughly for the aforementioned scenarios. diff --git a/partitions.py b/partitions.py index cfe770d..25af908 100644 --- a/partitions.py +++ b/partitions.py @@ -904,9 +904,14 @@ class Partitions: for part in partedUtils.get_lvm_partitions(disk): partname = partedUtils.get_partition_name(part) partrequest = self.getRequestByDeviceName(partname) - if partrequest.encryption is None and cryptodev.isLuks("/dev/%s" % partname): - # we don't want to treat encrypted an PV like a PV if the - # user chose not to provide a passphrase for this device + if partrequest.encryption is None and \ + cryptodev.isLuks("/dev/%s" % partname) and \ + not self.encryptedDevices.get(partname): + log.debug("ignoring PV %s since we cannot access it's contents" % partname) + # We don't want to treat encrypted an PV like a PV if the + # user chose not to provide a passphrase for this device. + # However, if the LUKS device belongs to a just-deleted + # request then we know it is available. continue used = 0 for volgroup in volgroups: Dave

2 1

[PATCH] - more save to bugzilla error checking
by Chris Lumens 31 Oct '08

31 Oct '08

Used to be that "ppc" was not a valid platform in bugzilla but "powerpc" was. Of course, rpmUtils.arch.getBaseArch returned the former. Well that's been corrected in our bugzilla now, but this patch is still valid as far as I'm concerned. This checks the platform and sets it to All if rpmUtils returns something that bugzilal doesn't understand, and checks that product.productName also exists in bugzilla. It's up to the install class to give us a useful backup there, just like it is with the version. - Chris diff --git a/exception.py b/exception.py index 70b61c0..e4e7c08 100644 --- a/exception.py +++ b/exception.py @@ -408,9 +408,8 @@ def saveToBugzilla(anaconda, exn, dest): if buglist is None: return False - # FIXME: need to handle all kinds of errors here if len(buglist) == 0: - bug = withBugzillaDo(filer, lambda b: b.createbug(product=product.productName, + bug = withBugzillaDo(filer, lambda b: b.createbug(product=filer.getproduct(product.productName), component="anaconda", version=filer.getversion(product.productVersion, product.productName), diff --git a/filer.py b/filer.py index e8431ea..74e8461 100644 --- a/filer.py +++ b/filer.py @@ -66,7 +66,7 @@ class AbstractFiler(object): ValueError -- For all other operations where the client supplied values are not correct. """ - def __init__(self, bugUrl=None, develVersion=None): + def __init__(self, bugUrl=None, develVersion=None, defaultProduct=None): """Create a new AbstractFiler instance. This method need not be overridden by subclasses. @@ -75,6 +75,9 @@ class AbstractFiler(object): the development version. This is used in case anaconda attempts to file bugs against invalid versions. It need not be set. + defaultProduct -- The product bugs should be filed against, should + anaconda get an invalid product name from the + boot media. This must be set. """ self.bugUrl = bugUrl self.develVersion = develVersion @@ -109,6 +112,14 @@ class AbstractFiler(object): """ raise NotImplementedError + def getproduct(self, prod): + """Verify that prod is a valid product name. If it is, return that + same product name. If not, return self.defaultProduct. This method + queries the bug filing system for a list of valid products. It must + be provided by all subclasses. + """ + raise NotImplementedError + def getversion(self, ver, prod): """Verify that ver is a valid version number for the product name prod. If it is, return that same version number. If not, return @@ -286,8 +297,9 @@ class BugzillaFiler(AbstractFiler): except socket.error, e: raise CommunicationError(str(e)) - def __init__(self, bugUrl=None, develVersion=None): - AbstractFiler.__init__(self, bugUrl=bugUrl, develVersion=develVersion) + def __init__(self, bugUrl=None, develVersion=None, defaultProduct=None): + AbstractFiler.__init__(self, bugUrl=bugUrl, develVersion=develVersion, + defaultProduct=defaultProduct) self._bz = None def login(self, username, password): @@ -310,6 +322,11 @@ class BugzillaFiler(AbstractFiler): whiteboards.append((wb, val)) kwargs.pop(key) + if key == "platform": + platformLst = self.__withBugzillaDo(lambda b: b._proxy.Bug.legal_values({'field': 'platform'})) + if not val in platformLst: + kwargs[key] = "All" + bug = self.__withBugzillaDo(lambda b: b.createbug(**kwargs)) for (wb, val) in whiteboards: bug.setwhiteboard(val, which=wb) @@ -323,6 +340,16 @@ class BugzillaFiler(AbstractFiler): lst = self.__withBugzillaDo(lambda b: b.getbugs(idlist)) return map(lambda b: BugzillaBug(self, bug=b), lst) + def getproduct(self, prod): + details = self.__withBugzillaDo(lambda b: b.getproducts()) + if prod not in details.keys(): + if self.defaultProduct: + return self.defaultProduct + else: + raise ValueError, "The product %s is not valid and no defaultProduct is set." % prod + else: + return prod + def getversion(self, ver, prod): details = self.__withBugzillaDo(lambda b: b._proxy.bugzilla.getProductDetails(prod)) bugzillaVers = details[1] diff --git a/installclasses/fedora.py b/installclasses/fedora.py index bf26459..3554043 100644 --- a/installclasses/fedora.py +++ b/installclasses/fedora.py @@ -50,7 +50,7 @@ class InstallClass(BaseInstallClass): (N_("Web Server"), ["web-server"])] bugFiler = BugzillaFiler(bugUrl="https://bugzilla.redhat.com/xmlrpc.cgi", - develVersion="rawhide") + develVersion="rawhide", defaultProduct="Fedora") def getPackagePaths(self, uri): if not type(uri) == types.ListType:

2 2

Remove s390 files and cio_ignore stuff on s390x
by David Cantrell 31 Oct '08

31 Oct '08

First patch removes the bootdisk/s390 subdirectory since we only build for s390x in RHEL-land now. No need for this directory. The second patch removes the cio_ignore functionality brought over from rhel5-branch. This has been reverted on rhel5, so I want to keep rawhide in sync. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 4

[PATCH] 469171 - calling newtWinMessage before startNewt
by Chris Lumens 30 Oct '08

30 Oct '08

Is there any reason we can't just call startNewt a lot earlier in main instead of playing the game of calling it as-needed a million other places? - Chris diff --git a/loader/loader.c b/loader/loader.c index 991b3c5..fa8fa69 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1226,9 +1226,6 @@ static char *doLoaderMain(struct loaderData_s *loaderData, } installNames[numValidMethods] = NULL; - if (!FL_CMDLINE(flags)) - startNewt(); - /* Before anything else, see if there's a CD/DVD with a stage2 image on * it. However if stage2= was given, use that value as an override here. * That will also then bypass any method selection UI in loader. @@ -1906,11 +1903,11 @@ int main(int argc, char ** argv) { /* FIXME: this is a bit of a hack */ loaderData.modInfo = modInfo; - if (FL_MODDISK(flags)) { + if (!FL_CMDLINE(flags)) startNewt(); + if (FL_MODDISK(flags)) loadDriverDisks(DEVICE_ANY, &loaderData); - } if (!access("/dd.img", R_OK)) { logMessage(INFO, "found /dd.img, loading drivers");

4 8

PATCH: Add --strict option to runpychecker.sh
by Hans de Goede 30 Oct '08

30 Oct '08

Hi All, See attachment. Regards, Hans >From 68a074541450912f3fd58c3d4d6144f719a87f6a Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede(a)redhat.com> Date: Thu, 30 Oct 2008 10:35:42 +0100 Subject: [PATCH] Add --strict option to runpychecker.sh Add --strict option to runpychecker.sh, and relax the default checking a bit now we are down to 0 warnings! --- runpychecker.sh | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/runpychecker.sh b/runpychecker.sh index 8a72474..08be9d8 100755 --- a/runpychecker.sh +++ b/runpychecker.sh @@ -9,6 +9,27 @@ # warnings are found it exits with a status of 0 FALSE_POSITIVES=pychecker-false-positives +NON_STRICT_OPTIONS="--no-deprecated --no-returnvalues --no-abstract" + +usage () { + echo "usage: `basename $0` [--strict] [--help]" + exit $1 +} + +while [ $# -gt 0 ]; do + case $1 in + --strict) + NON_STRICT_OPTIONS="" + ;; + --help) + usage 0 + ;; + *) + echo "Error unknown option: $1" + usage 1 + esac + shift +done if [ "`tail -c 1 pychecker-false-positives`" == "`echo`" ]; then echo "Error $FALSE_POSITIVES ends with an enter." @@ -23,6 +44,7 @@ pychecker --only --limit 1000 \ --no-callinit --no-local --no-shadow --no-shadowbuiltin \ --no-import --no-miximport --no-pkgimport --no-reimport \ --no-argsused --no-varargsused --no-override \ + $NON_STRICT_OPTIONS \ anaconda anaconda *.py textw/*.py iw/*.py installclasses/*.py isys/*.py | \ egrep -v "`cat $FALSE_POSITIVES | tr '\n' '|'`" > pychecker-log -- 1.6.0.3

2 1

PATCH: Fix the last pychecker warnings in master
by Hans de Goede 30 Oct '08

30 Oct '08

Hi All, As described in $SUBJECT Note I've verified that clickCB() in the last chunk always returns True or False. Regards, Hans diff --git a/autopart.py b/autopart.py index f335602..ff62f37 100644 --- a/autopart.py +++ b/autopart.py @@ -198,7 +198,7 @@ class partlist: def getMinimumSector(disk): if disk.type.name == 'sun': start = long(disk.dev.sectors * disk.dev.heads) - start /= (1024 / disk.dev.sector_size) + start /= long(1024 / disk.dev.sector_size) return start + 1 return 0L diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 00727ae..58793b7 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -88,7 +88,7 @@ class VolumeGroupEditor: pesize = 32768 pvreq = self.partitions.getRequestByID(id) pvsize = pvreq.getActualSize(self.partitions, self.diskset) - pvsize = lvm.clampPVSize(pvsize, pesize) - (pesize/1024) + pvsize = lvm.clampPVSize(pvsize, pesize) - int(pesize/1024) if first: minpvsize = pvsize first = 0 diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index bda0914..e2ef4a7 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -48,7 +48,7 @@ class WideCheckList(checklist.CheckList): if self.clickCB: rc = self.clickCB(data, row) - if rc == True: + if rc: checklist.CheckList.toggled_item(self, data, row)

2 1

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 2008