July 2009 - Anaconda-devel - Fedora mailing-lists

[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

Assorted patches for rawhide
by David Cantrell 07 Jul '09

07 Jul '09

Some RHEL-5 forward ports and some other fixes. -- David Cantrell <dcantrell(a)redhat.com> Red Hat, Inc. / Honolulu, HI

3 12

[PATCH] no "rhgb quiet" on s390 to enable visible boot progress and system automation (#509881)
by Steffen Maier 06 Jul '09

06 Jul '09

Anaconda appends "rhgb quiet" to the bootloader's kernel arguments. On s390x, there is not graphical console. A console of type line mode is most common. Even more so, it's not uncommon to do system automation based on the guest OS's console output. Therefore, allow full output of kernel boot messages on the console. --- yuminstall.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index fb89281..d96dae6 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1614,10 +1614,11 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon w = anaconda.intf.waitWindow(_("Post Install"), _("Performing post install configuration...")) - if len(self.ayum.tsInfo.matchNaevr(name='rhgb')) > 0: - anaconda.id.bootloader.args.append("rhgb quiet") - elif len(self.ayum.tsInfo.matchNaevr(name='plymouth')) > 0: - anaconda.id.bootloader.args.append("rhgb quiet") + if not iutil.isS390(): + if len(self.ayum.tsInfo.matchNaevr(name='rhgb')) > 0: + anaconda.id.bootloader.args.append("rhgb quiet") + elif len(self.ayum.tsInfo.matchNaevr(name='plymouth')) > 0: + anaconda.id.bootloader.args.append("rhgb quiet") if self.ayum.tsInfo.getProvides("service(graphical-login)") != {} and anaconda.id.displayMode == 'g' and not flags.usevnc: anaconda.id.desktop.setDefaultRunLevel(5) -- 1.6.3.1

2 1

[PATCH] fix backtrace in s390 reipl support due to missing anaconda.id.fsset (#509877)
by Steffen Maier 06 Jul '09

06 Jul '09

anaconda.id.fsset does no longer exist and the reipl code did a back trace. Assuming anaconda.id.bootloader.device is always a disk device (not a partition) and it always contains the device /boot and hence the zipl bootloader is located on, this fixes the back trace. --- iutil.py | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) diff --git a/iutil.py b/iutil.py index 8649224..2457d4e 100644 --- a/iutil.py +++ b/iutil.py @@ -764,12 +764,6 @@ def reIPLonCCW(iplsubdev, reipl_path): device = "<unknown>" try: - iplbits = re.split ('([0-9]+)', iplsubdev) - if len (iplbits) != 3: - message = _("Error: %s splits into %s but not like we expect" % (iplsubdev,iplbits,)) - log.warning(message) - raise Exception (message) - device = os.readlink("/sys/block/" + iplbits[0] + "/device").split('/')[-1] writeReiplMethod(reipl_path, 'ccw') @@ -816,12 +810,6 @@ def reIPLonFCP(iplsubdev, reipl_path): fcpvalue = { "device": "<unknown>", "wwpn": "<unknown>", "lun": "<unknown>" } try: - iplbits = re.split ('([0-9]+)', iplsubdev) - if len (iplbits) != 3: - message = _("Error: %s splits into %s but not like we expect" % (iplsubdev,iplbits,)) - log.warning(message) - raise Exception (message) - syspath = "/sys/block/" + iplbits[0] + "/device" fcpprops = [ ("hba_id", "device"), ("wwpn", "wwpn"), ("fcp_lun", "lun") ] @@ -883,19 +871,7 @@ def reIPL(anaconda, loader_pid): reipl_path = "/sys/firmware/reipl" - iplfs = anaconda.id.fsset.getEntryByMountPoint("/boot") - if iplfs is None: - iplfs = anaconda.id.fsset.getEntryByMountPoint("/") - - if iplfs is None: - message = _("Could not get information for mount point /boot or /") - log.warning(message) - return (message, instruction) - - try: - ipldev = iplfs.device.device - except: - ipldev = None + ipldev = anaconda.id.bootloader.device if ipldev is None: message = _("Error determining mount point type") -- 1.6.3.1

2 2

[PATCH] de-busyboxify
by Chris Lumens 06 Jul '09

06 Jul '09

This set of patches removes all users of busybox from anaconda. If you're curious about the reason for this (besides the obvious), check out bug 505639. I'm tired of dealing with nonsense like this, so it's time for busybox to go. busybox.anaconda had about 250 programs linked to it. I have replaced them with the real versions of commands where appropriate, and removed at least 100 programs entirely. I've checked that all the programs we call in anaconda are still present, but these sorts of changes have the potential to break lots of things. If everyone likes this direction, I'll spend the day or two required to do a scratch build, then a scratch tree, then some testing. - Chris

2 6

We need to start thinking about writing kernel cmdline options to grub.conf for dracut
by Hans de Goede 05 Jul '09

05 Jul '09

Hi All, When we switch to dracut we will need to specify certain kernel commandline options to dracut. For example when / is on iscsi dracut will need information for configuring the nic and about the iscsi target present on the kernel cmdline. The easiest way to handle this would be to add a new attribute to all devices which returns a list of kernel cmdline options to add to bring up that device (which will be empty in most cases). The problem here is that we can need (for example) multiple iscsi disks, and the question then becomes how to merge the cmdlines returned from the various devices. Harald I've included you in the CC, because I think this is something which dracut cannot handle at all atm. The parameters like iscsi_target_name, etc. All only take one value AFAIK, but what then if we need to bring up 2 different iscsi targets, for example for doing a mirror on 2 different iscsi disks ? I'm thinking that it would be better to have an iscsi= option, which will then contain the rootdev= iscsi syntax from dhcp (so all info for one target in one string) and allow having this option multiple times, does that sound like a plan ? Regards, Hans

4 5

Re: Features/YumLangpackPlugin and anaconda consequences
by Jens Petersen 05 Jul '09

05 Jul '09

----- "Bill Nottingham" <notting(a)redhat.com> wrote: > Hans de Goede (hdegoede(a)redhat.com) said: > > If we do this through %_install_langs, we gain nothing as currently > that > > is set to "all languages" and not changable (during the install > atleast). I agree with others %_install_langs is probably not the way: I think it is not intuitive for users and hard to find. > Well, the other way is keying off $LANG/$LC_MESSAGES. That doesn't > allow for 'I want multiple languages' as well, though. My plan which I mean(t) to blog about is to have a meta-package per language for langpack support. So if you want Japanese and Spanish langpacks say, you would just install japanese-langpacks and spanish-langpacks (from the lang support groups) and yum would start listening. So if the yum plugin is available to anaconda it should be ok. Jens

2 2

[PATCH] Allow creating new groups through kickstart.
by Chris Lumens 02 Jul '09

02 Jul '09

This is executed before users are created, so new users may be added to the new groups immediately. --- instdata.py | 6 ++++++ kickstart.py | 1 + users.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/instdata.py b/instdata.py index 07984d5..7e44177 100644 --- a/instdata.py +++ b/instdata.py @@ -182,6 +182,12 @@ class InstallData: stdout="/dev/tty5", stderr="/dev/tty5", root=self.anaconda.rootPath) + for gd in self.ksdata.group.groupList: + if not self.users.createGroup(name=gd.name, + gid=gd.gid, + root=self.anaconda.rootPath): + log.error("Group %s already exists, not creating." % gd.name) + for ud in self.ksdata.user.userList: if not self.users.createUser(name=ud.name, password=ud.password, diff --git a/kickstart.py b/kickstart.py index ce99855..5147fa5 100644 --- a/kickstart.py +++ b/kickstart.py @@ -985,6 +985,7 @@ commandMap = { "firewall": Firewall, "firstboot": Firstboot, "graphical": commands.displaymode.FC3_DisplayMode, + "group": commands.group.F12_Group, "halt": Reboot, "harddrive": commands.method.FC6_Method, "ignoredisk": IgnoreDisk, diff --git a/users.py b/users.py index ec9aa05..6534a00 100644 --- a/users.py +++ b/users.py @@ -84,6 +84,41 @@ class Users: def __init__ (self): self.admin = libuser.admin() + def createGroup (self, name=None, gid=None, root="/mnt/sysimage"): + childpid = os.fork() + + if not childpid: + os.chroot(root) + + del(os.environ["LIBUSER_CONF"]) + self.admin = libuser.admin() + + try: + if self.admin.lookupGroupByName(name): + os._exit(1) + + groupEnt = self.admin.initGroup(name) + + if gid >= 0: + groupEnt.set(libuser.GIDNUMBER, gid) + + self.admin.addGroup(groupEnt) + os._exit(0) + except Exception, e: + log.critical("Error when creating new group: %s" % str(e)) + os._exit(1) + + try: + (pid, status) = os.waitpid(childpid, 0) + except OSError as e: + log.critical("exception from waitpid while creating a group: %s %s" % (e.errno, e.strerror)) + return False + + if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0): + return True + else: + return False + def createUser (self, name=None, password=None, isCrypted=False, groups=[], homedir=None, shell=None, uid=None, algo=None, lock=False, root="/mnt/sysimage"): -- 1.6.1.3

2 1

[PATCH 1/2] Initial FCoE support
by Hans de Goede 02 Jul '09

02 Jul '09

This patch adds support for using FCoE during the installation. This patch merely lays the initial ground work, there is more work todo: - The system will not boot without manual help after the install, as dracut / mkinitrd do not support FCoE yet - If FCoE is not used for / but for example for /srv, then information about the nic used for FCoE needs to be written in a to be defined config file in the system, and rc.sysinit needs to be thought to read this file and bring up FCoE SAN's / Fabrics not used for / - kickstart support for FCoE still needs to be done --- iw/autopart_type.py | 84 ++++++++++++++++++++++++++- storage/__init__.py | 5 ++ storage/fcoe.py | 92 +++++++++++++++++++++++++++++ textw/partition_text.py | 29 +++++++++- ui/adddrive.glade | 19 ++++++ ui/fcoe-config.glade | 149 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 376 insertions(+), 2 deletions(-) create mode 100644 storage/fcoe.py create mode 100644 ui/fcoe-config.glade diff --git a/iw/autopart_type.py b/iw/autopart_type.py index 8a12689..9c04e52 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -32,6 +32,7 @@ from iw_gui import * from flags import flags import network from storage import iscsi +from storage import fcoe from storage.deviceaction import * import gettext @@ -325,6 +326,81 @@ class PartitionTypeWindow(InstallWindow): return rc + def addFcoeDrive(self): + (dxml, dialog) = gui.getGladeWidget("fcoe-config.glade", + "fcoeDialog") + + # Populate the combo + combo = dxml.get_widget("fcoeNicCombo") + cell = gtk.CellRendererText() + combo.pack_start(cell, True) + combo.set_attributes(cell, text = 0) + cell.set_property("wrap-width", 525) + combo.set_size_request(480, -1) + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + combo.set_model(store) + + netdevs = self.anaconda.id.network.available() + keys = netdevs.keys() + keys.sort() + selected_interface = None + for dev in keys: + # Skip NIC's which are connected (iow in use for a net install) + if dev in network.getActiveNetDevs(): + continue + + i = store.append(None) + + desc = netdevs[dev].get("DESC") + if desc: + desc = "%s - %s" %(dev, desc) + else: + desc = "%s" %(dev,) + + mac = netdevs[dev].get("HWADDR") + if mac: + desc = "%s - %s" %(desc, mac) + + if selected_interface is None: + selected_interface = i + + store[i] = (desc, dev) + + if selected_interface: + combo.set_active_iter(selected_interface) + else: + combo.set_active(0) + + # Show the dialog + gui.addFrame(dialog) + dialog.show_all() + sg = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL) + sg.add_widget(dxml.get_widget("fcoeNicCombo")) + + while 1: + rc = dialog.run() + + if rc == gtk.RESPONSE_CANCEL: + break; + + iter = combo.get_active_iter() + if iter is None: + self.intf.messageWindow(_("Error"), + "Must select a NIC to use.", + type="warning", custom_icon="error") + continue; + + try: + self.storage.fcoe.addSan(store.get_value(iter, 1), self.intf) + except IOError, e: + self.intf.messageWindow(_("Error"), str(e)) + rc = gtk.RESPONSE_CANCEL + + break + + dialog.destroy() + return rc + def addZfcpDrive(self): (dxml, dialog) = gui.getGladeWidget("zfcp-config.glade", "zfcpDialog") @@ -366,6 +442,10 @@ class PartitionTypeWindow(InstallWindow): dxml.get_widget("iscsiRadio").set_sensitive(False) dxml.get_widget("iscsiRadio").set_active(False) + if not fcoe.has_fcoe(): + dxml.get_widget("fcoeRadio").set_sensitive(False) + dxml.get_widget("fcoeRadio").set_active(False) + #figure out what advanced devices we have available and set sensible default group = dxml.get_widget("iscsiRadio").get_group() for button in group: @@ -379,6 +459,8 @@ class PartitionTypeWindow(InstallWindow): return if dxml.get_widget("iscsiRadio").get_active() and iscsi.has_iscsi(): rc = self.addIscsiDrive() + elif dxml.get_widget("fcoeRadio").get_active() and fcoe.has_fcoe(): + rc = self.addFcoeDrive() elif dxml.get_widget("zfcpRadio") is not None and dxml.get_widget("zfcpRadio").get_active(): rc = self.addZfcpDrive() dialog.destroy() @@ -498,7 +580,7 @@ class PartitionTypeWindow(InstallWindow): self.xml.get_widget("bootDriveCombo").set_sensitive(False) self.xml.get_widget("encryptButton").set_sensitive(False) - if not iutil.isS390() and not iscsi.has_iscsi(): + if not iutil.isS390() and not iscsi.has_iscsi() and not fcoe.has_fcoe(): self.xml.get_widget("addButton").set_sensitive(False) sigs = { "on_partitionTypeCombo_changed": self.comboChanged, diff --git a/storage/__init__.py b/storage/__init__.py index 623eff1..6fdb086 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -46,6 +46,7 @@ from devicelibs.lvm import safeLvmName from devicelibs.dm import name_from_dm_node from udev import * import iscsi +import fcoe import zfcp import gettext @@ -204,6 +205,7 @@ class Storage(object): self.__luksDevs = {} self.iscsi = iscsi.iscsi() + self.fcoe = fcoe.fcoe() self.zfcp = zfcp.ZFCP() self._nextID = 0 @@ -269,6 +271,7 @@ class Storage(object): w = self.anaconda.intf.waitWindow(_("Finding Devices"), _("Finding storage devices...")) self.iscsi.startup(self.anaconda.intf) + self.fcoe.startup(self.anaconda.intf) self.zfcp.startup() if self.anaconda.id.getUpgrade(): clearPartType = CLEARPART_TYPE_NONE @@ -911,6 +914,7 @@ class Storage(object): def write(self, instPath): self.fsset.write(instPath) self.iscsi.write(instPath, self.anaconda) + self.fcoe.write(instPath, self.anaconda) self.zfcp.write(instPath) def writeKS(self, f): @@ -978,6 +982,7 @@ class Storage(object): f.write("\n") self.iscsi.writeKS(f) + self.fcoe.writeKS(f) self.zfcp.writeKS(f) diff --git a/storage/fcoe.py b/storage/fcoe.py new file mode 100644 index 0000000..46c5bcb --- /dev/null +++ b/storage/fcoe.py @@ -0,0 +1,92 @@ +# +# fcoe.py - fcoe class +# +# Copyright (C) 2009 Red Hat, Inc. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty 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, see <http://www.gnu.org/licenses/>. +# + +import os +import iutil +import logging +import time +log = logging.getLogger("anaconda") + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + +_fcoe_module_loaded = False + +def has_fcoe(): + global _fcoe_module_loaded + if not _fcoe_module_loaded: + iutil.execWithRedirect("modprobe", [ "fcoe" ], + stdout = "/dev/tty5", stderr="/dev/tty5", + searchPath = 1) + _fcoe_module_loaded = True + + return os.access("/sys/module/fcoe", os.X_OK) + +class fcoe(object): + def __init__(self): + self.started = False + self.nics = [] + + def _stabilize(self, intf = None): + if intf: + w = intf.waitWindow(_("Connecting to FCoE SAN"), + _("Connecting to FCoE SAN")) + + # I have no clue how long we need to wait, this ought to do the trick + time.sleep(10) + iutil.execWithRedirect("udevadm", [ "settle" ], + stdout = "/dev/tty5", stderr="/dev/tty5", + searchPath = 1) + if intf: + w.pop() + + def startup(self, intf = None): + if self.started: + return + + if not has_fcoe(): + return + + # Place holder for adding autodetection of FCoE setups based on + # firmware tables (like iBFT for iSCSI) + + self.started = True + + def addSan(self, nic, intf=None): + if not has_fcoe(): + raise IOError, _("FCoE not available") + + log.info("Activating FCoE SAN attached to %s" % nic) + + f = open("/sys/module/fcoe/parameters/create", "w") + f.write(nic) + f.close() + + self._stabilize(intf) + self.nics.append(nic) + + def writeKS(self, f): + # fixme plenty (including add ks support for fcoe in general) + return + + def write(self, instPath, anaconda): + # erm, do we need todo anything here ? + return + +# vim:tw=78:ts=4:et:sw=4 diff --git a/textw/partition_text.py b/textw/partition_text.py index fdf3496..f14a273 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -162,6 +162,9 @@ class PartitionTypeWindow: newdrv.append("Add iSCSI target") if iutil.isS390(): newdrv.append( "Add zFCP LUN" ) + from storage import fcoe + if fcoe.has_fcoe(): + newdrv.append("Add FCoE SAN") if len(newdrv) == 0: return INSTALL_BACK @@ -176,12 +179,18 @@ class PartitionTypeWindow: if button == TEXT_BACK_CHECK: return INSTALL_BACK - if choice == 1: + if newdrv[choice] == "Add zFCP LUN": try: return self.addZFCPDriveDialog(screen) except ValueError, e: ButtonChoiceWindow(screen, _("Error"), str(e)) return INSTALL_BACK + elif newdrv[choice] == "Add FCoE SAN": + try: + return self.addFcoeDriveDialog(screen) + except ValueError, e: + ButtonChoiceWindow(screen, _("Error"), str(e)) + return INSTALL_BACK else: try: return self.addIscsiDriveDialog(screen) @@ -206,6 +215,24 @@ class PartitionTypeWindow: return INSTALL_OK + def addFcoeDriveDialog(self, screen): + (button, entries) = EntryWindow(screen, + _("Add FCoE SAN"), + _("Enter the device name for the NIC which is connected to the FCoE SAN. For example \"eth0\"."), + prompts = [ _("NIC device name") ] ) + if button == TEXT_CANCEL_CHECK: + return INSTALL_BACK + + nic = entries[0].strip() + if nic not in self.anaconda.id.network.available(): + ButtonChoiceWindow(screen, _("Error"), + _("%s is not a valid NIC device name.") % nic) + return INSTALL_BACK + + self.anaconda.id.storage.fcoe.addSan(nic) + + return INSTALL_OK + def addIscsiDriveDialog(self, screen): if not network.hasActiveNetDev(): ButtonChoiceWindow(screen, _("Error"), diff --git a/ui/adddrive.glade b/ui/adddrive.glade index 599ed79..2d991ef 100644 --- a/ui/adddrive.glade +++ b/ui/adddrive.glade @@ -202,6 +202,25 @@ </child> <child> + <widget class="GtkRadioButton" id="fcoeRadio"> + <property name="visible">True</property> + <property name="label" translatable="yes" context="yes">Add _FCoE SAN</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">iscsiRadio</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> <widget class="GtkRadioButton" id="radiobutton1"> <property name="visible">True</property> <property name="sensitive">False</property> diff --git a/ui/fcoe-config.glade b/ui/fcoe-config.glade new file mode 100644 index 0000000..7034064 --- /dev/null +++ b/ui/fcoe-config.glade @@ -0,0 +1,149 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkDialog" id="fcoeDialog"> + <property name="title" translatable="yes">Configure FCoE Parameters</property> + <property name="window_position">center</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="spacing">12</property> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please select the network interface which is connected to +your FCoE switch.</property> + <property name="wrap">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <widget class="GtkTable" id="fcoeTable"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">NIC</property> + </widget> + </child> + <child> + <widget class="GtkComboBox" id="fcoeNicCombo"> + <property name="visible">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <widget class="GtkButton" id="button1"> + <property name="label">gtk-cancel</property> + <property name="response_id">-6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="button2"> + <property name="response_id">-10</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon-size">4</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Add FCoE Disk(s)</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> -- 1.6.2.2

2 5

[PATCH 1/3] Add FCoE support to storage/udev.py
by Hans de Goede 02 Jul '09

02 Jul '09

Add the ability to identify if a disk is an FCoE device and to get the identifier of the disk and the name of the NIC used to connect to an FCoE disk --- storage/udev.py | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/storage/udev.py b/storage/udev.py index af3ee12..d057cf2 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -386,3 +386,30 @@ def udev_device_get_iscsi_port(info): path_components = info["ID_PATH"].split("-") return path_components[1].split(":")[1] + +# fcoe disks have ID_PATH in the form of: +# pci-eth#-fc-${id} +# fcoe parts look like this: +# pci-eth#-fc-${id}-part# +def udev_device_is_fcoe(info): + try: + path_components = info["ID_PATH"].split("-") + + if info["ID_BUS"] == "scsi" and len(path_components) >= 4 and \ + path_components[0] == "pci" and path_components[2] == "fc" and \ + path_components[1][0:3] == "eth": + return True + except KeyError: + pass + + return False + +def udev_device_get_fcoe_nic(info): + path_components = info["ID_PATH"].split("-") + + return path_components[1] + +def udev_device_get_fcoe_identifier(info): + path_components = info["ID_PATH"].split("-") + + return path_components[3] -- 1.6.2.2

2 3

[PATCH] Update /etc/hosts with hostname for loopback IP address (#506384)
by Radek Vykydal 02 Jul '09

02 Jul '09

Note: Compared to writing out of our own /etc/hosts which was removed in bug 491808, we do not write line for localhosthost IP address. --- network.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/network.py b/network.py index 5c08e18..1c06fb6 100644 --- a/network.py +++ b/network.py @@ -670,6 +670,29 @@ class Network: if domainname: self.domains = [domainname] + # /etc/hosts + # update lines for 127.0.0.1 and ::1 with hostname if the file exists + if instPath and os.path.isfile(instPath + "/etc/hosts"): + of = open(instPath + "/etc/hosts", "r") + updatedlines = [] + update = False + for line in of: + line = line.strip() + if line.startswith('127.0.0.1') or line.startswith('::1'): + if self.hostname not in line.split(): + line += " %s" % self.hostname + update = True + updatedlines.append(line) + of.close() + + if update: + nf = open(instPath + "/etc/hosts", "w") + upd_comment = "# hostname %s added to /etc/hosts by anaconda\n" % self.hostname + nf.write(upd_comment + '\n'.join(updatedlines) + '\n') + nf.close() + log.info("/etc/hosts updated with hostname %s" % self.hostname) + + # /etc/resolv.conf if (not instPath) or (not os.path.isfile(instPath + '/etc/resolv.conf')) or flags.livecdInstall: if os.path.isfile('/etc/resolv.conf') and instPath != '': -- 1.6.0.6

2 1

RFC: writing kernel cmdline options to grub.conf for dracut
by Hans de Goede 02 Jul '09

02 Jul '09

Hi, This morning I've been talking to Harald Hoyer about what sort of commandline options dracut will be needing to find the / filesystem beside root=UUID=1234567890 . In most cases (normal disks, dmraid, mdraid, lvm, dmcrypt) root=UUID=1234567890 should suffice. However in certain cases for example dracut will need additional info to find the disks. We've come to the following plan for iscsi targets: 1) Extend the dhcp_root dhcp variable iscsi syntax to be able include a username password, so: iscsi:192.168.50.2::::iqn.2009-06.dracut:target66 Can become: iscsi:user:pass@192.168.50.2::::iqn.2009-06.dracut:target66 Or: iscsi:user:pass:reverse_user:reverse_pass@192.168.50.2::::iqn.2009-06.dracut:target66 2) Pass root-path=iscsi:... on the kernel cmdline, for each needed iscsi target, so if necessary this will be passed multiple times, dracut will be modified to be able handle multiple root-path arguments being passed in 3) chmod /proc/cmdline 400, so that it cannot be read by ordinary users, plugging the passwork leak problem Now the remaining question is how to implement the adding of the needed cmdline options to grub.conf. For the iscsi case (and atleast fcoe will be similar) I see the following 2 options, both of which are feasible: 1) Add code to iscsi.py to get the needed cmdline options 2) Add a dracutCmdlineOptions property to all Device classes, which will return the needed options (if any) to make the device in question available inside dracut. One of the issues here is that onlining an iscsi target, may get us multiple disks as the target may have multiple LUN's. If more then one LUN of the same target is needed we might end up with having the same root-path=iscsi:... option twice on the cmdline, filtering this will be is easy though so this is not really an issue. Looking at this from the iscsi pov, doing this from iscsi.py is easier, as that already has a list of targets instead of a list of disks (so LUN's) as the rest of the storage code has. Looking at this from the pov of the rest of the code it might be cleaner in the long run to make this a device property though. So I'm not sure what to do, advice is / ideas are very welcome ? Regards, Hans

3 3

RHEL-5 patch to fix #448006
by David Cantrell 02 Jul '09

02 Jul '09

Regression introduced by me for the fix for #432011, this patch makes sure we grab the bootfile from the DHCP response. Tested locally using a RHEL 5.3 tree. The 'ks' argument works with this patch in place. -- David Cantrell <dcantrell(a)redhat.com> Red Hat, Inc. / Honolulu, HI

2 4

[PATCH] Rework tracking of devices containing install media (#497087)
by David Lehman 02 Jul '09

02 Jul '09

This set of patches changes the way we track devices containing installation media. It is a two-stage approach: First, we save the device specifications exactly as provided to us. Second, when populating the device tree, we set the protected attribute of devices matching the provided specs. This frees us from worrying about devices being renamed since the attribute indicating that a device is protected is part of the device instance itself.

3 9

[PATCH - 497334] change the basic assumption about kickstart network
by Chris Lumens 01 Jul '09

01 Jul '09

These two patches change one of the basic operating assumptions about the network command in kickstart. Before: No "network" command implies dhcp Now: No "network" command implies stop and ask in stage1 This brings the network command in line with how everything else in kickstart, and also gets rid of the obnoxious and short lived --bootproto=query, though it will still have to be recognized for compatibility reasons. - Chris

2 3

[PATCH] Set focus on hostname entry in network UI screen (#494135)
by Radek Vykydal 01 Jul '09

01 Jul '09

--- iw/network_gui.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/iw/network_gui.py b/iw/network_gui.py index 9f5ced7..ce2c879 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -44,13 +44,16 @@ class NetworkWindow(InstallWindow): self.hostnameEntry.set_text(self.hostname) self.hostnameEntry.connect("activate", lambda w: self.ics.setGrabNext(1)) - self.hostnameEntry.grab_focus() + self.hostnameEntry.connect("map-event", self.setFocus) # load the icon gui.readImageFromFile("network.png", image=self.icon) return self.align + def setFocus(self, area, data): + self.hostnameEntry.grab_focus() + def hostnameError(self): self.hostnameEntry.grab_focus() raise gui.StayOnScreen -- 1.6.0.6

2 1

[PATCH] two patches for rawhide, the second depends on the first
by Radek Vykydal 01 Jul '09

01 Jul '09

The 2/2 patch is "TAKE III", this one depends on the 1/2 patch.

1 5

RFC: proposal for handling isw dmraid -> mdraid upgrade path
by Hans de Goede 01 Jul '09

01 Jul '09

Hi, I've been thinking about $SUBJECT lately, and I would like to propose the following way to handle this: 1) Make the use of mdraid or dmraid for BIOS-raid supported by both configurable both in anaconda (it already is) and in the installed OS (so in relevant udev rules and / or in rc.sysinit). anaconda will have a cmdline option to override the defaults, and the installed system will have a /etc/sysconfig/biosraid file, with a single setting: PREFERRED_BIOSRAID_HANDLER Which can be either dmraid or mdraid 2) On a fresh install anaconda will use mdraid and will write "PREFERRED_BIOSRAID_HANDLER=mdraid" to /etc/sysconfig/biosraid (unless forced to use dmraid through the command line) 3) On an update anaconda will look for /etc/sysconfig/biosraid, and use what ever is there, if the file does not exist (as it will not an an upgrade from F-11), it will use dmraid as we did in previous releases and write "PREFERRED_BIOSRAID_HANDLER=dmraid" to /etc/sysconfig/biosraid, so that future upgrades will still use dmraid. This will result in an it just works experience for users, and offers the ability to keep using dmraid for BIOS-raid supported by path, which is something several people have indicated they want. The only hole I can poke into this is yum update's from F-11, but we can document what to do on the yum upgrade wiki page, which people doing yum upgrade's should always read. Regards, Hans

3 7

Features/YumLangpackPlugin and anaconda consequences
by Bill Nottingham 01 Jul '09

01 Jul '09

Crrently, in anaconda and yum, we install language specific addons via conditional packages in comps. It's generally agreed that this sucks as an intereface, but it's what we have. There is a proposal to move this to a yum plugin for Fedora 12. Whenever a package has language-specific extensions (such as 'openoffice.org-core'; these packages would be described in some metadata), the corresponding language pack (determined via %_install_langs, most likely) would be installed. However, this has two conseqences for anaconda. 1) Plugins Anaconda doesn't currently enable them. We would want this to work in some way in anaconda, which would require enabling at least this plugin. How possible is this? 2) The actual installation experience Right now, if you pick an install language, that language group is automatically enabled. Additional languages are offered via their comps groups through customized package selection. However, that has two issues: - We never show these groups if there are only conditional packages in it, at least according to various bugs I've seen filed (oops) - If we're doing this via a plugin only, how can we better set our install languages if these comps groups don't exist? For the latter question, we may want to run some ideas past design. Bill

4 4

More on the GUI (post FUDCon)
by Joel Granados 01 Jul '09

01 Jul '09

Hey list. Met with Mo at FUDCon and got lots of great ideas. This mail is intended to share some of these. 1. First of all she gave me a cool reference that can be used for general Human Interface design purposes. http://library.gnome.org/devel/hig-book/stable/. This is the most recent one I found, I believe its from 2008, if there is a more recent one, pls scream. 2. Help information. This refers to text that explains stuff that is not be trivial to understand. Instead of doing a help mechanism we could create a small explanation label, where needed, that goes under the concept that needs explaining. Much like http://library.gnome.org/misc/release-notes/2.26/figures/rnusers.brasero.pn… or http://library.gnome.org/misc/release-notes/2.26/figures/rnusers.epiphany.p… where the buttons have the name and the explanation in some other size and are slightly clear. 3. Have simplified device names. To have "sda" instead of "/dev/sda" and we would place the whole path "/dev/sda" as a small comment on the bottom of the device name. I'm guessing this would ease the user experience with dmraid type devices. 4. Use verbs for the actions. We have already been discussing this in the list. 5. Use Gig for the sizes. I had missed this in previous posts. But it be a good idea to have the size in Gb after 999 Mb. We can have a function that returns the show-able string. 6. Merge tree and bar view (This is my personal favorite, And I'll probably include it in a glade file in future posts. :). To have the bar information on the tree view. It would be on the far right and it would just have minimal information as most of it is contained in the tree view. I have to give Mo all the credit for this one :) 7. Put the type of installation (where we select "use entire drive", "Replace existing Linux system"...) in a separate window with additional comments on the options. This has two advantages, IMO, 1. We give the user more info so he/she can make an informed decision. 2. We don't show the encrypted check box when it is not needed (less confusion for the user). I still don't know exactly where to put the advanced configuration button in this case though. 8. Giving the user the possibility to select more than one device to shrink by using a checkbox instead of a drop down menu. Don't really know how much of a good idea this is, since I don't really know how that is coded, but its worth considering IMO. 9. The location of the action buttons would be better on the bottom left. This goes better with the look and feel of other gnome applications. So we would have the tree view, then the action buttons and then the "continue" & "Back" buttons. 10. We should pop up a window with all the "create" possibilities [1] for the customize partition "create" button. They would be handled with a comboboxe and would have a little explanation beneath the choice type. The user would select what he/she wants and a screan that creates the device would pop up. Mo: If I am forgetting something, pls chime in. Finally, considering that this will not be a complete re-write of the GUI for the storage section. I will probably start cleaning up the GUI files to get a better modularization and to easily move things around for the changes that we are planning. As always, suggestions are very much appreciated. [1] -> "LVM - physical volume", "LVM - Logical Volume" .... -- Joel Andres Granados Brno, Czech Republic, Red Hat.

4 6

[PATCH] Two unrelated patches for anaconda master
by David Lehman 30 Jun '09

30 Jun '09

2 3

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