Anaconda-devel July 2009

anaconda-devel@lists.fedoraproject.org

29 participants
100 discussions

[PATCH] Remove _catchallCategory. yum handles this for us now.
by Chris Lumens 09 Jul '09

09 Jul '09

--- yuminstall.py | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index d1cb626..623911d 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1097,8 +1097,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon self.ayum._setGroups(None) continue - self._catchallCategory() - def doRepoSetup(self, anaconda, thisrepo = None, fatalerrors = True): self.__withFuncDo(anaconda, lambda r: self.ayum.doRepoSetup(thisrepo=r.id), thisrepo=thisrepo, fatalerrors=fatalerrors) @@ -1186,29 +1184,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon self.ayum.repos.callback = None - def _catchallCategory(self): - # FIXME: this is a bad hack, but catch groups which aren't in - # a category yet are supposed to be user-visible somehow. - # conceivably should be handled by yum - grps = {} - for g in self.ayum.comps.groups: - if g.user_visible: - grps[g.groupid] = g - - for cat in self.ayum.comps.categories: - for g in cat.groups: - if grps.has_key(g): - del grps[g] - - if len(grps.keys()) == 0: - log.info("no groups missing") - return - c = yum.comps.Category() - c.name = _("Uncategorized") - c._groups = grps - c.categoryid = "uncategorized" - self.ayum.comps._categories[c.categoryid] = c - def getDefaultGroups(self, anaconda): langs = anaconda.id.instLanguage.getCurrentLangSearchList() rc = map(lambda x: x.groupid, -- 1.6.1.3

2 1

[PATCH] Use a method yum provides, rather than inventing our own.
by Chris Lumens 08 Jul '09

08 Jul '09

--- yuminstall.py | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 623911d..478b22b 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -743,17 +743,12 @@ class AnacondaYum(YumSorter): downloadpkgs = [] totalSize = 0 totalFiles = 0 - for txmbr in self.tsInfo.getMembers(): - if txmbr.ts_state in ['i', 'u']: - po = txmbr.po - else: - continue - - if po: - totalSize += int(po.returnSimple("installedsize")) / 1024 - for filetype in po.returnFileTypes(): - totalFiles += len(po.returnFileEntries(ftype=filetype)) - downloadpkgs.append(po) + for txmbr in self.tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES): + if txmbr.po: + totalSize += int(txmbr.po.returnSimple("installedsize")) / 1024 + for filetype in txmbr.po.returnFileTypes(): + totalFiles += len(txmbr.po.returnFileEntries(ftype=filetype)) + downloadpkgs.append(txmbr.po) return (downloadpkgs, totalSize, totalFiles) -- 1.6.1.3

2 1

[PATCH 1/2] pykickstart: Add fcoe command (take 2)
by Hans de Goede 08 Jul '09

08 Jul '09

Add an command to activate FCoE attached SAN's from kickstart --- pykickstart/commands/__init__.py | 4 +- pykickstart/commands/fcoe.py | 73 ++++++++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 2 + 3 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 pykickstart/commands/fcoe.py diff --git a/pykickstart/commands/__init__.py b/pykickstart/commands/__init__.py index 7ce21f7..0952bf8 100644 --- a/pykickstart/commands/__init__.py +++ b/pykickstart/commands/__init__.py @@ -18,8 +18,8 @@ # with the express permission of Red Hat, Inc. # import authconfig, autopart, autostep, bootloader, clearpart, device -import deviceprobe, displaymode, dmraid, driverdisk, firewall, firstboot, group -import ignoredisk, interactive, iscsi, iscsiname, key, keyboard, lang +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 diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py new file mode 100644 index 0000000..e3ffce8 --- /dev/null +++ b/pykickstart/commands/fcoe.py @@ -0,0 +1,73 @@ +# +# Hans de Goede <hdegoede(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.options import * + +class F12_FcoeData(BaseData): + removedKeywords = BaseData.removedKeywords + removedAttrs = BaseData.removedAttrs + + def __init__(self, *args, **kwargs): + BaseData.__init__(self, *args, **kwargs) + self.nic = kwargs.get("nic", None) + + def __str__(self): + retval = BaseData.__str__(self) + retval += "fcoe" + + if self.nic: + retval += " --nic=%s" % self.nic + + return retval + "\n" + + +class F12_Fcoe(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords + removedAttrs = KickstartCommand.removedAttrs + + def __init__(self, writePriority=71, *args, **kwargs): + KickstartCommand.__init__(self, writePriority, *args, **kwargs) + self.op = self._getParser() + self.fcoe = kwargs.get("fcoe", []) + + def __str__(self): + retval = "" + for fcoe in self.fcoe: + retval += fcoe.__str__() + + return retval + + def _getParser(self): + op = KSOptionParser() + op.add_option("--nic", dest="nic", required=1) + return op + + def parse(self, args): + zd = self.handler.FcoeData() + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + if len(extra) > 0: + mapping = {"command": "fcoe", "options": extra} + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Unexpected arguments to %(command)s command: %(options)s") % mapping) + + self._setToObj(self.op, opts, zd) + return zd + + def dataList(self): + return self.fcoe diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 8e1ab66..8f78c3e 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -541,6 +541,7 @@ commandMap = { "deviceprobe": deviceprobe.FC3_DeviceProbe, "dmraid": dmraid.FC6_DmRaid, "driverdisk": driverdisk.FC3_DriverDisk, + "fcoe": fcoe.F12_Fcoe, "firewall": firewall.F10_Firewall, "firstboot": firstboot.FC3_Firstboot, "graphical": displaymode.FC3_DisplayMode, @@ -873,6 +874,7 @@ dataMap = { "DriverDiskData": driverdisk.F12_DriverDiskData, "DeviceData": device.F8_DeviceData, "DmRaidData": dmraid.FC6_DmRaidData, + "FcoeData": fcoe.F12_FcoeData, "GroupData": group.F12_GroupData, "IscsiData": iscsi.F10_IscsiData, "LogVolData": logvol.F9_LogVolData, -- 1.6.2.2

3 3

[PATCH] Use the yum preconf object to do $releasever substitution.
by Chris Lumens 08 Jul '09

08 Jul '09

--- yuminstall.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 5fdca80..5170e94 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -555,11 +555,11 @@ class AnacondaYum(YumSorter): # We need to make sure $releasever gets set up before .repo files are # read. Since there's no redhat-release package in /mnt/sysimage (and # won't be for quite a while), we need to do our own substutition. - def getReposFromConfig(self): - def _getReleasever(): - from ConfigParser import ConfigParser - c = ConfigParser() + def _getReleasever(): + from ConfigParser import ConfigParser + c = ConfigParser() + try: if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): ConfigParser.read(c, "%s/.treeinfo" % self.anaconda.methodstr) else: @@ -569,13 +569,8 @@ class AnacondaYum(YumSorter): ConfigParser.read(c, "/tmp/.treeinfo") return c.get("general", "version") - - try: - self.yumvar["releasever"] = _getReleasever() except: - self.yumvar["releasever"] = productVersion - - YumSorter.getReposFromConfig(self) + return productVersion # Override this method so yum doesn't nuke our existing logging config. def doLoggingSetup(self, *args, **kwargs): @@ -611,6 +606,7 @@ class AnacondaYum(YumSorter): if hasattr(self, "preconf"): self.preconf.fn = fn self.preconf.root = root + self.preconf.releasever = self._getReleasever() self.preconf.enabled_plugins = ["whiteout", "blacklist"] YumSorter._getConfig(self) else: -- 1.6.1.3

2 1

More arch fixes.
by Bill Nottingham 08 Jul '09

08 Jul '09

iutil.py | 16 +++++++++++++--- storage/devicelibs/lvm.py | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-)

2 4

[master] Fix many or all 'cannot commit to disk after 5 attempts' problems
by David Cantrell 08 Jul '09

08 Jul '09

The problem I have been able to reliably reproduce is active logical volumes on the system when the storage code goes to commit changes to the disk. Added a status() property to LVMLogicalVolumeDevice that calls lvm.lvs() and reads the lv_attr field looking for an 'a' which indicates the logical volume is active. This patch causes the rest of the LVM device status code to fall in to place and the devices are torn down/deactivated correctly. -- David Cantrell <dcantrell(a)redhat.com> Red Hat, Inc. / Honolulu, HI

2 3

[PATCH] pykickstart: Add fcoe command
by Hans de Goede 07 Jul '09

07 Jul '09

Add an command to activate FCoE attached SAN's from kickstart --- pykickstart/commands/fcoe.py | 69 +++++++++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 1 + 2 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 pykickstart/commands/fcoe.py diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py new file mode 100644 index 0000000..b3c01bd --- /dev/null +++ b/pykickstart/commands/fcoe.py @@ -0,0 +1,69 @@ +# +# Hans de Goede <hdegoede(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.options import * + +class F12_FcoeData(BaseData): + removedKeywords = BaseData.removedKeywords + removedAttrs = BaseData.removedAttrs + + def __init__(self, *args, **kwargs): + BaseData.__init__(self, *args, **kwargs) + self.nic = kwargs.get("nic", None) + + def __str__(self): + retval = BaseData.__str__(self) + retval += "fcoe" + + if self.nic: + retval += " --nic=%s" % self.nic + + return retval + "\n" + + +class F12_Fcoe(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.fcoe = kwargs.get("fcoe", []) + + def __str__(self): + retval = "" + for fcoe in self.fcoe: + retval += fcoe.__str__() + + return retval + + def _getParser(self): + op = KSOptionParser() + op.add_option("--nic", dest="nic", required=1) + return op + + def parse(self, args): + zd = self.handler.FcoeData() + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + self._setToObj(self.op, opts, zd) + return zd + + def dataList(self): + return self.fcoe diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 8e1ab66..be6d6f3 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -541,6 +541,7 @@ commandMap = { "deviceprobe": deviceprobe.FC3_DeviceProbe, "dmraid": dmraid.FC6_DmRaid, "driverdisk": driverdisk.FC3_DriverDisk, + "fcoe": fcoe.F12_Fcoe, "firewall": firewall.F10_Firewall, "firstboot": firstboot.FC3_Firstboot, "graphical": displaymode.FC3_DisplayMode, -- 1.6.2.2

2 3

Installer device Filtering...
by Joel Granados 07 Jul '09

07 Jul '09

Hello list. There was a discussion in irc about device filtering. I just wanted to summarize and post what was discussed so we can maybe get some valuable insight from the mailing list. This is more like an irc dump than a summary. But I hope it shows some of the topics that should/could be discussed * What information to give to the filter? This is related to the UI. And this was the reason to begin the discussion. - Give a regular expression that identifies the devices - Specify with a checkbox if you want anaconda to use the regular expression. - Specify what that regular expression should do (Ignore or Include) * On what would those regular expressions operate? - canonicalized path of the device link under /sys/block. - []$ readlink -f /sys/block/sda/device /sys/devices/pci0000:00/0000:00:05.0/host0/target0:0:0/0:0:0:0 - /dev/disk/by-path version is also possible. Could be useful. * Why not have the possibility to refresh? (Refresh would work with the information contained in the kernel.) - The user tweaks the scanning list and hits refresh. - User does this until he/she is satisfied with the device list. * Three possible scanning stages where identified. Each of these might be controlled by the filter. 1. Kernel scan 2. udev scan 3. devicetree.py:scan * We actually want to be able to tell the kernel not to scan certain LUN's. * Wish people would learn how to configure fibrechannel switch acl's so we would only see the lun's they actually want us to touch. Would it be a good idea to document the configuration setup that anaconda expects? * How would udev filters aid us with the overall filtering. Regards. -- Joel Andres Granados Brno, Czech Republic, Red Hat.

6 5

[PATCH] Clean up some arch code.
by Bill Nottingham 07 Jul '09

07 Jul '09

Just use rpmUtils's definition of multilib arches, and we no longer set ppc64iseries/ppc64pseries. Signed-off-by: Bill Nottingham <notting(a)redhat.com> --- yuminstall.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 70ed98a..acc2fba 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -762,8 +762,7 @@ class AnacondaYum(YumSorter): return (downloadpkgs, totalSize, totalFiles) def setColor(self): - if (rpmUtils.arch.canonArch.startswith("ppc64") or - rpmUtils.arch.canonArch in ("s390x", "sparc64", "x86_64", "ia64")): + if rpmUtils.arch.isMultiLibArch(): self.ts.ts.setColor(3) def run(self, instLog, cb, intf, id): @@ -1285,7 +1284,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon foundkernel = False - if (isys.smpAvailable() or isys.htavailable()) and not rpmUtils.arch.canonArch.startswith("ppc64"): + if (isys.smpAvailable() or isys.htavailable()) and rpmUtils.arch.canonArch != "ppc64": if selectKernel("kernel-smp"): foundkernel = True -- 1.6.2.5

2 1

[PATCH rhel 5.4] Make buildinstall error-out on failed loop mount, propagate status (#472552)
by Radek Vykydal 07 Jul '09

07 Jul '09

I forgot to check mk-images exit status in buildinstall in previous patch. --- scripts/buildinstall | 2 ++ scripts/mk-images | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/buildinstall b/scripts/buildinstall index 072f8bf..efb754f 100755 --- a/scripts/buildinstall +++ b/scripts/buildinstall @@ -161,6 +161,8 @@ $MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$ echo "Making images..." $MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL" +rc=$? +[ $rc = 0 ] || exit $rc echo "Writing .discinfo file" $MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo diff --git a/scripts/mk-images b/scripts/mk-images index 48ba567..8bd4790 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -746,7 +746,8 @@ makemainimage () { mke2fs -q -F $mmi_tmpimage > /dev/null tune2fs -c0 -i0 $mmi_tmpimage >/dev/null mount -o loop $mmi_tmpimage $mmi_mntpoint - [ $? = 0 ] || return $? + rc=$? + [ $rc = 0 ] || return $rc (cd $IMGPATH; find . | fgrep -v "./usr/lib/anaconda-runtime" | cpio -H crc -o) | (cd $mmi_mntpoint; cpio -iumd) @@ -783,7 +784,8 @@ makeSecondStage() { [ $? = 0 ] || exit 1 echo "Building stage2.img" makemainimage "stage2" "squashfs" - [ $? = 0 ] || exit 1 + rc=$? + [ $rc = 0 ] || exit $rc } doPostImages() { -- 1.6.0.6

2 1

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel July 2009