Anaconda-devel December 2010

anaconda-devel@lists.stg.fedoraproject.org

23 participants
54 discussions

some brainstorming on location in anaconda
by Bill Nottingham 17 Jan '11

17 Jan '11

Today I was looking at https://bugzilla.redhat.com/show_bug.cgi?id=624158; part of that bug involved creating a locale mapping file in initscripts; this seemed like a bad idea. When considering that, I thought of lang-table, and wondered 'how could we get rid of that'. Some thinking later, and... anaconda currently has multiple locale/location screens: - language selection (custom anaconda) - keyboard selection (from s-c-keyboard, but nothing else uses that) - timezone selection (from s-c-date) anaconda needs the following bits of localization info: - locale/language - timezone - keyboard layout - text font anaconda uses the following data sources: - tzdata - lang-table (a custom anaconda file) anaconda does *zero* autodetection. The rest of this is driven by two assumptions: 1) We can do better. 2) We really shouldn't be driving off of configuration sources that only live in anaconda. ... Currently, we have the following data sources available to us: * iso-codes Includes: country subdivisions (state/province), indexed by country countries, and their country code languages Does not map: languages to countries * localedata Maps: languages to countries (more or less) Does not map: languages to a primary locale/country * tzdata Includes: timezones, indexed by country lat/lon for timezones Does not map: locales to country random cities to timezones (only specific timezone cities) * libgweather Includes: many many cities, organized by country - with timezone - with lat/lon - with weather codes Does not map cities/contries to locale * geoclue Maps: current location to: - country - city - lat/lon * xkeyboard-config Maps: language name to xkb layout (1:n, though) country name to xkb layout We also have the following widgetry: * system-config-date - timezone selector Uses: tzdata * system-config-keyboard - keyboard layout selector Uses: custom hardcoded mappings in the code, lang-table * system-config-language - language selector Uses: iso-codes * anaconda language selector - language selector Uses: lang-table and the following other codebases that don't have widgetry split out: * gdm - language and keyboard selectors Uses: iso-codes, xkeyboard-config * gnome-control-center datetime - timezone selecor Uses: tzdata http://live.gnome.org/Design/SystemSettings/DateAndTime * gnome-panel - location selector Uses: libgweather, tzdata and the following widgetry currently in development: * gnome locale configuration applet Uses: iso-codes, xkeyboard-config, and more http://live.gnome.org/Design/SystemSettings/RegionAndLanguage A modest proposal... On boot, as soon as there is networking available, start geoclue. Acquire location information. Then, feed the information as so: - country, lat/lon (from geoclue) -> timezone (from country, lat/lon, via tzdata) -> language (via ???????, see below) -> keyboard layout (from country/language combo, via xkeyboard-config) -> text font (hardcoded!) Notes: - What if we don't have network? Do DHCP always on link! - It's easy to get a list of possible languages given the country. There's no canonical data source of what to use for the *primary* language, though. We could make a mapping table (ugh), or do heuristics (double ugh). - text font is hardcoded to 'latarcyrheb-sun16'. We could conceivable have an override for the very few people who can't use that. We then display as so: ... Current settings: Location: United States [ change ] [ details ] If you click 'change', it pops up a selector dialog that either: - allows you to enter a location (similar to the gnome panel clock code) - allows you to click a location (similar to the control center timezone selector) Either of those resets country, timezone, language, keyboard layout, etc. If you select 'details', (or '>>>', or some expander, to be language-neutral), you get: Language: English [ change ] Country: USA [ change ] Time: 2:33 PM (US Eastern) [ change ] Keyboard Layout: us [ change ] Then, each of those options pops up a single-purpose configuration dialog. anaconda can either use the gnome capplet once it's done, or roll its own. Thoughts? Bill

6 14

rhel6 mpath patches
by Ales Kozumplik 10 Jan '11

10 Jan '11

Once I started untangling BZ 659324 using a mpathed PPC64 machine I discovered more than one problem. The last patch has a detailed explanation of why those problems exist. I'll only push the set after it's acked, your questions answered and it's confirmed by the reporter that the fix works. All of the set is to be merged to master too except "mpath: remove a harmful udev_trigger() in filter_gui" where I am going to remove add udev_trigger calls instead (will post the patch before pushing there). Ales

5 20

[PATCH rhel6-branch] Add network --activate option (#638131)
by Radek Vykydal 04 Jan '11

04 Jan '11

So that we can activate more than one network device in installer environment using kickstart. Note: I am using flag option instead of option with (yes/no) values because the point of the option is allowing device activation. Moreover, we can't guarantee honoring of "no" setting in these two cases: 1) --onboot=yes activates device as side effect when we write out ifcfg files before packages are downloaded. 2) If there is no active device and network method (repo) is used, first device in ks will be activated. --- isys/isys.py | 2 ++ kickstart.py | 12 ++++++++++-- network.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/isys/isys.py b/isys/isys.py index 449ba5c..82ad8d8 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -50,6 +50,8 @@ NM_CONNECTION_IFACE = "org.freedesktop.NetworkManagerSettings.Connection" NM_DEVICE_IFACE = "org.freedesktop.NetworkManager.Device" NM_IP4CONFIG_IFACE = "org.freedesktop.NetworkManager.IP4Config" NM_IP6CONFIG_IFACE = "org.freedesktop.NetworkManager.IP6Config" +NM_SETTINGS_SERVICE = "org.freedesktop.NetworkManagerSystemSettings" +NM_SETTINGS_PATH = "/org/freedesktop/NetworkManagerSettings" NM_STATE_UNKNOWN = 0 NM_STATE_ASLEEP = 1 diff --git a/kickstart.py b/kickstart.py index 65f557d..406d4aa 100644 --- a/kickstart.py +++ b/kickstart.py @@ -553,7 +553,7 @@ class Logging(commands.logging.FC6_Logging): elif self.host != "": logger.addSysLogHandler(log, self.host) -class NetworkData(commands.network.F8_NetworkData): +class NetworkData(commands.network.RHEL6_NetworkData): def execute(self, anaconda): devices = anaconda.id.network.netdevices @@ -638,6 +638,14 @@ class NetworkData(commands.network.F8_NetworkData): if self.gateway != "": anaconda.id.network.setGateway(self.gateway, dev.iface) + if self.activate and dev.iface not in network.getActiveNetDevs(): + log.info("Activating network device %s in stage2 kickstart ..." % + dev.iface) + dev.writeIfcfgFile() + rc = (dev.activate() + and len(anaconda.id.network.waitForDevicesActivation([dev.iface])) == 0) + log.info("Activation %s" % 'succeeded' if rc else 'failed') + needs_net = (anaconda.methodstr and (anaconda.methodstr.startswith("http:") or anaconda.methodstr.startswith("ftp:") or @@ -1131,7 +1139,7 @@ dataMap = { "VolGroupData": VolGroupData, } -superclass = returnClassForVersion() +superclass = returnClassForVersion(RHEL6) class AnacondaKSHandler(superclass): def __init__ (self, anaconda): diff --git a/network.py b/network.py index 3d9d014..ced7d60 100644 --- a/network.py +++ b/network.py @@ -317,6 +317,49 @@ class NetworkDevice(IfcfgFile): return True return False + def activate(self): + + bus = dbus.SystemBus() + nm = bus.get_object(isys.NM_SERVICE, isys.NM_MANAGER_PATH) + + # get dbus path of connection setting object + settings = bus.get_object(isys.NM_SETTINGS_SERVICE, + isys.NM_SETTINGS_PATH) + connection_paths = settings.ListConnections() + for con_path in connection_paths: + con = bus.get_object(isys.NM_SERVICE, con_path) + cs = con.GetSettings() + try: + mac_bytes = cs[cs['connection']['type']]['mac-address'] + except KeyError as e: + log.info("exception caught: %s" % e) + mac_addr = '{0:02X}:{1:02X}:{2:02X}:{3:02X}:{4:02X}:{5:02X}'.format(*mac_bytes) + if mac_addr == self.get('HWADDR'): + break + else: + log.info("DBus connection path for device %s not found" % self.iface) + return False + + # get dbus path of this device + device_object_path = None + device_paths = nm.GetDevices() + for device_path in device_paths: + device = bus.get_object(isys.NM_SERVICE, device_path) + device_props_iface = dbus.Interface(device, isys.DBUS_PROPS_IFACE) + iface = str(device_props_iface.Get(isys.NM_DEVICE_IFACE, "Interface")) + if iface == self.iface: + device_object_path = device_path + break + else: + log.info("DBus object path of device %s not found" % self.iface) + return False + + nm.ActivateConnection(isys.NM_SETTINGS_SERVICE, + con_path, + device_path, + dbus.ObjectPath("/")) + return True + class Network: def __init__(self): -- 1.7.2

2 3

RFE: mount newly formatted volumes with barrier=0
by Avi Kivity 03 Jan '11

03 Jan '11

If Anaconda has just formatted a volume, we know that there is no data on that volume that can be lost. We can therefore mount it, for the duration of the installation, with barriers disabled (and make other tradeoffs in the performance/integrity equation, like using data=writeback for ext4). The installed image should enable barriers as usual. The result would be faster installation, and thus a better user experience. -- error compiling committee.c: too many arguments to function

2 5

[master rhel6-branch] Use s390-tools commands to free devices
by David Cantrell 03 Jan '11

03 Jan '11

Two patches that modify linuxrc.s390 to use the s390-tools commands to free devices for use. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 4

[rhel6-branch 1/2] Merge rsyslogd from master, the buildinstall parts.
by Ales Kozumplik 03 Jan '11

03 Jan '11

Original commits: 0fde437ad02a7cfb170472bad0ddf3b3faf4e7b0 e8cdfc480ccec62cfb2b70598dd792bbab43a1b2 (jkeating) 66e12bec0d1e4afeabda8ab5c0ad663cea5f8135 (pjones) Original commit msg: Introduces rsylogd to anaconda (part of #524980) A proper syslog daemon allows for remote logging that includes installed system's syslog. Removes the init.c code that simulated syslog activity until now. Related: rhbz#601337 --- scripts/mk-images | 47 +++++++++++++++++++++++++++++++++++++++++++++++ scripts/upd-instroot | 5 ++++- 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 9e0e025..4271a2e 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -565,6 +565,7 @@ makeinitrd() { mkdir -p $MBD_DIR/tmp mkdir -p $MBD_DIR/usr/libexec mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager + mkdir -p $MBD_DIR/$LIBDIR/rsyslog mkdir -p $MBD_DIR/usr/share/dbus-1/system-services mkdir -p $MBD_DIR/var/cache/hald mkdir -p $MBD_DIR/var/lib/dbus @@ -812,6 +813,52 @@ makeinitrd() { instbin $IMGPATH /usr/sbin/mdadm $MBD_DIR /sbin/mdadm instbin $IMGPATH /usr/sbin/mdmon $MBD_DIR /sbin/mdmon + # rsyslog + instbin $IMGPATH /usr/sbin/rsyslogd $MBD_DIR /sbin/rsyslogd + ( cd $IMGPATH/$LIBDIR/rsyslog + for f in *.so; do + instbin $IMGPATH /$LIBDIR/rsyslog/$f $MBD_DIR /$LIBDIR/rsyslog/$f + done + ) + # \EOF has a quote in the first character on purpose; see man bash on here documents + cat > $MBD_DIR/etc/rsyslog.conf <<\EOF +#### MODULES #### +$ModLoad imuxsock.so # provides support for local system logging +$ModLoad imklog.so # provides kernel logging support + +#### GLOBAL DIRECTIVES #### +# Use default timestamp format +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +#### TEMPLATES #### + +$template anaconda_tty4, "%syslogseverity-text:::uppercase% %programname%:%msg%\n" +$template anaconda_syslog, "%timestamp:8:$:date-rfc3164%,%timestamp:1:3:date-subseconds% %syslogseverity-text:::uppercase% %programname%:%msg%\n" + +#### RULES #### +# log everything except anaconda-specific records from local1 (those are stored +# directly into files via python logging) +*.*;\ +authpriv.none;\ +local1.none /tmp/syslog;anaconda_syslog + & /dev/tty4;anaconda_tty4 + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +$ActionQueueMaxDiskSpace 1m # space limit (use as much as possible) +$ActionQueueSaveOnShutdown off # do not save messages to disk on shutdown +$ActionQueueType LinkedList # run asynchronously +$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +# ### end of the forwarding rule ### + +EOF + # Misc instbin $IMGPATH /usr/sbin/dmidecode $MBD_DIR /sbin/dmidecode instbin $IMGPATH /usr/bin/egrep $MBD_DIR /sbin/egrep diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 5ba880b..dae7b6e 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -192,7 +192,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda python-libs python-nss python-pyblock python-sqlite python-epdb python-urlgrabber python-volume_key pyxf86config rdate readline redhat-artwork reiserfs-utils report-config-default report-gtk report-newt rpm rpm-libs - rpm-python sed selinux-policy-targeted + rpm-python rsyslog sed selinux-policy-targeted setup slang smc-meera-fonts specspo sqlite startup-notification subscription-manager synaptics system-config-date system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release @@ -307,6 +307,7 @@ $LIBDIR/libwrap*.so* $LIBDIR/libsmime3.so $LIBDIR/libssl3.so $LIBDIR/multipath/* +$LIBDIR/rsyslog/* $LIBDIR/security/pam_* bin/arch bin/basename @@ -486,6 +487,7 @@ sbin/resize_reiserfs sbin/resize2fs sbin/rmmod sbin/route +sbin/rsyslogd sbin/setfiles sbin/sfdisk sbin/silo @@ -517,6 +519,7 @@ usr/$LIBDIR/python?.? usr/$LIBDIR/rpm/rpmpopt usr/lib/rpm/rpmrc usr/lib/rpm/macros +$LIBDIR/rsyslog usr/$LIBDIR/libiscsi.so* usr/$LIBDIR/libfreebl3.so usr/$LIBDIR/libfreebl3.chk -- 1.7.3.3

2 3

[PATCH] Allow existing /var/log
by Brian C. Lane 03 Jan '11

03 Jan '11

During a liveinst /var/log/ already exists. --- anaconda | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/anaconda b/anaconda index 1db5e38..3602cfd 100755 --- a/anaconda +++ b/anaconda @@ -532,7 +532,7 @@ if __name__ == "__main__": setupEnvironment() # make sure we have /var/log soon, some programs fail to start without it - os.mkdir("/var/log", 0755) + iutil.mkdirChain("/var/log") pidfile = open("/var/run/anaconda.pid", "w") pidfile.write("%s\n" % (os.getpid(),)) -- 1.7.3.3

2 1

Anaconda rhel6 https.
by Patrik Martinsson 03 Jan '11

03 Jan '11

Hello Everybody, I'm curious about the ssl-verification when using an https-address for the repo-option in kickstart. When I'm trying to use https I get the result "Peer cert cannot be verified or peer cert invalid" in the debug output from anaconda. I know the cert is valid, but I guess it cant be verified against the CA anaconda is using ? I noticed in later versions (>14.19-1) of anaconda the --noverifyssl flag was added which I'm pretty sure would solve my problem. My question really boils down to, - Can I somehow add our rootca to the CA anaconda is looking in, or make it validate our certs in some other way ? ________________________________________________________________________ Patrik Martinsson ITi SMHI Telefon 011-4958417 Fax 011-4958350 Mobil 011-4958417 Epost patrik.martinsson(a)smhi.se 601 76 Norrköping Besöksadress Folkborgsvägen 1 www.smhi.se

2 1

[master rhel6-branch] Remove MainframeDiskDevice class
by David Cantrell 21 Dec '10

21 Dec '10

Explanation in the patch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[rhel6-branch 1/2] edd: use pci_dev as an additional clue for disk boot priority (#621175)
by Ales Kozumplik 21 Dec '10

21 Dec '10

In general there is not always mbrsig on a disk (new device), so we can't always succeed in creating the disk -> bios id mapping. On the other hand, the pci_dev symlink in edd does not give us complete information about the device. So we have to consider both in compareDisks(). --- kickstart.py | 4 +- storage/__init__.py | 18 ++++-- storage/devicelibs/edd.py | 167 ++++++++++++++++++++++++++++++--------------- 3 files changed, 126 insertions(+), 63 deletions(-) diff --git a/kickstart.py b/kickstart.py index b606ab8..67b1480 100644 --- a/kickstart.py +++ b/kickstart.py @@ -665,8 +665,8 @@ class PartitionData(commands.partition.F12_PartData): storage.doAutoPart = False if self.onbiosdisk != "": - for (disk, biosdisk) in storage.eddDict.iteritems(): - if str(biosdisk) == self.onbiosdisk: + for (disk, eddinfo) in storage.eddDict.iteritems(): + if str(eddinfo.biosdisk) == self.onbiosdisk: self.disk = disk break diff --git a/storage/__init__.py b/storage/__init__.py index 464eebf..09dab1f 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -1180,18 +1180,26 @@ class Storage(object): return self.fsset.rootDevice def compareDisks(self, first, second): - if self.eddDict.has_key(first) and self.eddDict.has_key(second): - one = self.eddDict[first] - two = self.eddDict[second] + # if exactly one of the devices has a pcidev, prefer it + if bool(self.eddDict[first].pcidev) ^ bool(self.eddDict[second].pcidev): + if self.eddDict[first].pcidev: + return -1 + if self.eddDict[second].pcidev: + return 1 + + # next, compare the biosdev numbers + if self.eddDict[first].biosdev and self.eddDict[second].biosdev: + one = self.eddDict[first].biosdev + two = self.eddDict[second].biosdev if (one < two): return -1 elif (one > two): return 1 # if one is in the BIOS and the other not prefer the one in the BIOS - if self.eddDict.has_key(first): + if self.eddDict[first].biosdev: return -1 - if self.eddDict.has_key(second): + if self.eddDict[second].biosdev: return 1 if first.startswith("hd"): diff --git a/storage/devicelibs/edd.py b/storage/devicelibs/edd.py index da03914..db2ba57 100644 --- a/storage/devicelibs/edd.py +++ b/storage/devicelibs/edd.py @@ -21,77 +21,132 @@ # import os +import os.path import struct import logging log = logging.getLogger("storage") +class EddInfo: + def __init__(self, biosdev): + self.biosdev = biosdev + self.pcidev = None + def get_edd_dict(devices): - """Given an array of devices return a dict with the BIOS ID for them.""" + """ + Given an array of devices return a mapping from their devices names to their + EddInfo. + + CAVEATS: It is important to note that the current implementation of the edd + kernel module is incomplete and does not give us a reliable method about + discovering the complete device <-> BIOS device mapping. Checking the MBR + signature works in most cases but will always fail e.g. on new disks that do + not contain an MBR yet. On the other hand, the pcidev entry which is + guaranteed to exist is shared across all disks connected through the same + PCI device and so does not provide a one-to-one relation. + """ + + # initialize the dict with blank info edd_dict = {} + for dev in devices: + edd_dict[dev.name] = EddInfo(None) for biosdev in range(80, 80 + 15): + sysfspath = "/sys/firmware/edd/int13_dev%d" % biosdev if not os.path.exists(sysfspath): break # We are done - sysfspath = "/sys/firmware/edd/int13_dev%d/mbr_signature" % biosdev - if not os.path.exists(sysfspath): - log.warning("No mbrsig for biosdev: %d" % biosdev) - continue + dev = _find_device_from_mbrsig(devices, biosdev) + if dev: + edd_dict[dev].biosdev = biosdev + + (pcidev, devs_for_pcidev) = _devices_for_pcidev(devices, biosdev) + for d in devs_for_pcidev: + edd_dict[d.name].pcidev = pcidev + + _dump_dict(edd_dict) + return edd_dict + +def _dump_dict(edd_dict): + log.debug("edd:generated dict:") + for key in edd_dict: + log.debug("%s: biosdev: %s, pcidev: %s" % + (key, edd_dict[key].biosdev, edd_dict[key].pcidev)) + log.debug("edd:end of generated dict dump") + +def _find_device_from_mbrsig(devices, biosdev): + sysfspath = "/sys/firmware/edd/int13_dev%d/mbr_signature" % biosdev + if not os.path.exists(sysfspath): + log.info("edd: no mbrsig for biosdev: %d" % biosdev) + return None + + try: + file = open(sysfspath, "r") + eddsig = file.read() + file.close() + except (IOError, OSError) as e: + log.info("edd: error reading EDD mbrsig for %d: %s" % + (biosdev, str(e))) + return None + sysfspath = "/sys/firmware/edd/int13_dev%d/sectors" % biosdev + try: + file = open(sysfspath, "r") + eddsize = file.read() + file.close() + except (IOError, OSError) as e: + eddsize = None + + found = [] + for dev in devices: try: - file = open(sysfspath, "r") - eddsig = file.read() - file.close() - except (IOError, OSError) as e: - log.warning("Error reading EDD mbrsig for %d: %s" % - (biosdev, str(e))) + fd = os.open(dev.path, os.O_RDONLY) + os.lseek(fd, 440, 0) + mbrsig = struct.unpack('I', os.read(fd, 4)) + os.close(fd) + except OSError as e: + log.info("edd: error reading mbrsig from disk %s: %s" % + (dev.name, str(e))) continue - sysfspath = "/sys/firmware/edd/int13_dev%d/sectors" % biosdev - try: - file = open(sysfspath, "r") - eddsize = file.read() - file.close() - except (IOError, OSError) as e: - eddsize = None - - found = [] - for dev in devices: - try: - fd = os.open(dev.path, os.O_RDONLY) - os.lseek(fd, 440, 0) - mbrsig = struct.unpack('I', os.read(fd, 4)) - os.close(fd) - except OSError as e: - log.warning("Error reading mbrsig from disk %s: %s" % - (dev.name, str(e))) - continue - - mbrsigStr = "0x%08x\n" % mbrsig - if mbrsigStr == eddsig: - if eddsize: - sysfspath = "/sys%s/size" % dev.sysfsPath - try: - file = open(sysfspath, "r") - size = file.read() - file.close() - except (IOError, OSError) as e: - log.warning("Error getting size for: %s" % dev.name) - continue - if eddsize != size: - continue - found.append(dev.name) - - if not found: - log.error("No matching mbr signature found for biosdev %d" % - biosdev) - elif len(found) > 1: - log.error("Multiple signature matches found for biosdev %d: %s" % - (biosdev, str(found))) - else: - log.info("Found %s for biosdev %d" %(found[0], biosdev)) - edd_dict[found[0]] = biosdev + mbrsigStr = "0x%08x\n" % mbrsig + if mbrsigStr == eddsig: + if eddsize: + sysfspath = "/sys%s/size" % dev.sysfsPath + try: + file = open(sysfspath, "r") + size = file.read() + file.close() + except (IOError, OSError) as e: + log.warning("Error getting size for: %s" % dev.name) + continue + if eddsize != size: + continue + found.append(dev.name) - return edd_dict + if not found: + log.error("edd: no matching mbr signature found for biosdev %d" % + biosdev) + return None + elif len(found) > 1: + log.error("edd: multiple signature matches found for biosdev %d: %s" % + (biosdev, str(found))) + return None + else: + return found[0] + +def _devices_for_pcidev(devices, biosdev): + edd_dir = "/sys/firmware/edd/int13_dev%d" % biosdev + try: + dereferenced = os.readlink("%s/pci_dev" % edd_dir) + except OSError as e: + log.info ("edd: no pci_dev for biosdev %d" % biosdev) + return (None, []) + # get absolute and normalized path + sysfs_path = os.path.normpath(os.path.join(edd_dir, dereferenced)) + if sysfs_path.startswith("/sys/"): + sysfs_path = sysfs_path[4:] + return (sysfs_path, + [dev for dev in devices if dev.sysfsPath.startswith(sysfs_path)] + ) -- 1.7.3.3

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel December 2010