December 2010 - Anaconda-devel - Fedora mailing-lists

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

[PATCH 1/2] Change the device reinitialization dialog
by Martin Gracik 20 Dec '10

20 Dec '10

Resolves: rhbz#657376 --- data/ui/reinitialize-dialog.glade | 257 ++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + pyanaconda/gui.py | 60 +++++++++ pyanaconda/installinterfacebase.py | 18 +-- 4 files changed, 321 insertions(+), 15 deletions(-) create mode 100644 data/ui/reinitialize-dialog.glade diff --git a/data/ui/reinitialize-dialog.glade b/data/ui/reinitialize-dialog.glade new file mode 100644 index 0000000..6b1ec5a --- /dev/null +++ b/data/ui/reinitialize-dialog.glade @@ -0,0 +1,257 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="reinitializeDialog"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Storage Device Warning</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button1"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Yes, discard any data</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button2"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="label" translatable="yes">No, keep any data</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-9</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">10</property> + <property name="column_spacing">10</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon_size">6</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">The storage device below may contain data.</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-harddisk</property> + <property name="icon_size">6</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="disk_label"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">We could not detect partitions or filesystems on this device. + +This could be because the device is blank, unpartitioned, or virtual. If not, +there may be data on the device that can not be recovered if you use it in this +installation. We can remove the device from this installation to protect the data. + +Are you sure this device does not contain valuable data?</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="apply_to_all"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Apply my choice to all devices with undetected partitions or filesystems</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">10</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> diff --git a/po/POTFILES.in b/po/POTFILES.in index 7a14f6e..73b48c4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -161,6 +161,7 @@ data/ui/lukspassphrase.glade.h data/ui/network.glade.h data/ui/tasksel.glade.h data/ui/zfcp-config.glade.h +data/ui/reinitialize-dialog.glade.h # lang-table data/lang-table.h diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index 48537f7..36bcc76 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -758,6 +758,56 @@ class MessageWindow: except SystemError: pass +class ReinitializeWindow(MessageWindow): + + def __init__ (self, title, path, size, description, details, + default=None, run=True, parent=None, destroyAfterRun=True): + + self.debugRid = None + self.title = title + if flags.autostep: + self.rc = 1 + return + self.rc = None + self.framed = False + self.doCustom = False + + xml = gtk.glade.XML(findGladeFile("reinitialize-dialog.glade"), + domain="anaconda") + + self.dialog = xml.get_widget("reinitializeDialog") + self.apply_to_all = xml.get_widget("apply_to_all") + + self.label = xml.get_widget("disk_label") + text = "%s\n%s MB\t%s" % (description, size, path) + self.label.set_markup(text) + + if parent: + self.dialog.set_transient_for(parent) + self.dialog.set_position(gtk.WIN_POS_CENTER) + + if flags.debug: + widget = self.dialog.add_button(_("_Debug"), 2) + self.debugRid = 2 + + defaultchoice = 0 #no + self.dialog.set_default_response(defaultchoice) + + if run: + self.run(destroyAfterRun) + + def run(self, destroy=False): + MessageWindow.run(self, destroy) + apply_all = self.apply_to_all.get_active() + + # doCustom is false, so we will have self.rc set up as following: + # if "Yes, discard" was clicked - self.rc = 1 + # if "No, keep" was clicked - self.rc = 0 + if self.rc == 1: #yes + self.rc = 3 if apply_all else 2 + elif self.rc == 0: #no + self.rc = 1 if apply_all else 0 + class DetailedMessageWindow(MessageWindow): def __init__(self, title, text, longText=None, type="ok", default=None, custom_buttons=None, custom_icon=None, run=True, parent=None, destroyAfterRun=True, expanded=False): self.title = title @@ -1043,6 +1093,16 @@ class InstallInterface(InstallInterfaceBase): custom_buttons, custom_icon, run=True, parent=parent).getrc() return rc + def reinitializeWindow(self, title, path, size, description, details): + if self.icw: + parent = self.icw.window + else: + parent = None + + rc = ReinitializeWindow(title, path, size, description, details, + parent=parent).getrc() + return rc + def createRepoWindow(self): from iw.task_gui import RepoCreator dialog = RepoCreator(self.anaconda) diff --git a/pyanaconda/installinterfacebase.py b/pyanaconda/installinterfacebase.py index 2dba067..e349268 100644 --- a/pyanaconda/installinterfacebase.py +++ b/pyanaconda/installinterfacebase.py @@ -79,21 +79,9 @@ class InstallInterfaceBase(object): "using cached answer: %s" % self._initLabelAnswers["all"]) return self._initLabelAnswers["all"] - rc = self.messageWindow(_("Warning"), - _("Error processing drive:\n\n" - "%(path)s\n%(size)-0.fMB\n%(description)s\n\n" - "This device may need to be reinitialized.\n\n" - "REINITIALIZING WILL CAUSE ALL DATA TO BE LOST!\n\n" - "This action may also be applied to all other disks " - "needing reinitialization.%(details)s") - % {'path': path, 'size': size, - 'description': description, 'details': details}, - type="custom", - custom_buttons = [ _("_Ignore"), - _("Ignore _all"), - _("_Re-initialize"), - _("Re-ini_tialize all") ], - custom_icon="question") + rc = self.reinitializeWindow(_("Storage Device Warning"), + path, size, description, details) + if rc == 0: retVal = False elif rc == 1: -- 1.7.3.2

2 3

[PATCH rhel5 1/2] Pass --noeject to anaconda (#477887)
by Brian C. Lane 17 Dec '10

17 Dec '10

Flags need to be explicitly passed to anaconda from loader. Resolves: rhbz#477887 --- loader2/loader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/loader2/loader.c b/loader2/loader.c index 8b922d9..91dbbe1 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1907,6 +1907,9 @@ int main(int argc, char ** argv) { if (FL_NOIPV6(flags)) *argptr++ = "--noipv6"; + if (FL_NOEJECT(flags)) + *argptr++ = "--noeject"; + if (FL_RESCUE(flags)) { *argptr++ = "--rescue"; if (FL_SERIAL(flags)) -- 1.7.3.3

3 5

lorax for Fedora 15
by John Reiser 17 Dec '10

17 Dec '10

I nominate lorax as ready to be part of Fedora 15, replacing the buildinstall portion of anaconda. I have built two install DVDs for x86_64 from Fedora 15 rawhide using pungi+lorax. Today's DVD using anaconda-15.11 installed successfully on non-virtualized "bare hardware", and the installed system booted and is now running. There was a problem with firstboot, so I ran 'adduser' by hand. Creating the DVD.iso was much faster: about 20 minutes for pungi+lorax, versus about 40 minutes for pungi+buildinstall. The lorax run also cached the .rpm for the installer itself, instead of re-downloading all of them each time. Congratulations and "Thank you" to Martin Gracik for a large part of the recent work in making lorax ready for Fedora! --

3 3

[PATCH] Improve support for mac partition tables with logical sector size != 512
by Peter Jones 17 Dec '10

17 Dec '10

On mac partition tables which specify a sector size larger than the physical sector size, we need to reallocate the buffer after we determine the correct sector size. This appears to be a normal condition on disks in the wild that are >2TB and use Mac partition tables (for example, the rescue image for the MacBookAir3,1), so also don't raise an exception in _disk_analyse_block_size() when we find that. Also simplify the code in _disk_analyse_block_size() a bit since there's no reason to ever do the byteswapping more than once or convert everything to 512-byte multiples since we neither load nor store it that way. --- libparted/labels/mac.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/libparted/labels/mac.c b/libparted/labels/mac.c index 49a236e..418343e 100644 --- a/libparted/labels/mac.c +++ b/libparted/labels/mac.c @@ -643,35 +643,22 @@ _rawpart_get_partmap_size (MacRawPartition* raw_part, PedDisk* disk) static int _disk_analyse_block_size (PedDisk* disk, MacRawDisk* raw_disk) { - PedSector block_size; + PedSector block_size = PED_BE16_TO_CPU(raw_disk->block_size); - if (PED_BE16_TO_CPU (raw_disk->block_size) % 512) { + if (block_size % 512) { #ifndef DISCOVER_ONLY ped_exception_throw ( PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, _("Weird block size on device descriptor: %d bytes is " "not divisible by 512."), - (int) PED_BE16_TO_CPU (raw_disk->block_size)); + (int) block_size); #endif goto error; } - block_size = PED_BE16_TO_CPU (raw_disk->block_size) / 512; - if (block_size != disk->dev->sector_size / 512) { -#ifndef DISCOVER_ONLY - if (ped_exception_throw ( - PED_EXCEPTION_WARNING, - PED_EXCEPTION_IGNORE_CANCEL, - _("The driver descriptor says the physical block size " - "is %d bytes, but Linux says it is %d bytes."), - (int) block_size * 512, - (int) disk->dev->sector_size) - != PED_EXCEPTION_IGNORE) - goto error; -#endif - disk->dev->sector_size = block_size * 512; - } + if (block_size != disk->dev->sector_size) + disk->dev->sector_size = block_size; return 1; @@ -729,6 +716,7 @@ mac_read (PedDisk* disk) PedPartition* part; int num; PedSector ghost_size; + PedSector sector_size; PedConstraint* constraint_exact; int last_part_entry_num = 0; @@ -746,8 +734,28 @@ mac_read (PedDisk* disk) if (!_check_signature (raw_disk)) goto error; + sector_size = disk->dev->sector_size; if (!_disk_analyse_block_size (disk, raw_disk)) goto error; + + /* If dev->sector_size changed when we did ptt_read_sector(), + then the buffer size is wrong and we'll take a segfault + down the line unless we re-allocate it here. */ + if (disk->dev->sector_size != sector_size) { + free(buf); + buf = 0; + if (!ptt_read_sector(disk->dev, 0, &buf)) + return 0; + + MacRawDisk *raw_disk = (MacRawDisk *) buf; + + if (!_check_signature (raw_disk)) + goto error; + + if (!_disk_analyse_block_size (disk, raw_disk)) + goto error; + } + if (!_disk_analyse_ghost_size (disk)) goto error; ghost_size = mac_disk_data->ghost_size; -- 1.7.2.2

1 2

Prevent a module from loading during boot up RHEL6
by abhilash sankar 17 Dec '10

17 Dec '10

Hi, I am not sure this is the correct way to ask a question in this forum, pardon me if not, I am new to this forum. I am trying to install a driver (of driver disk v3 format) in RHEL6. The issue is I already have an inbox driver which handles the same device. I want to replace the driver with an entirely new driver. Installation of my driver is occurring correctly and my module is installed. But always Inbox driver is getting preference and getting loaded. While installation itself I need my driver to be loaded. Is there any way i can disable the inbox driver module from getting loaded (on install time and in later bootup also) /is there anyway to change the precedence. Please help me....

2 1

Use anaconda-cleanup for all of liveinst's device teardown needs
by David Lehman 16 Dec '10

16 Dec '10

This set of patches switches liveinst to use anaconda-cleanup both to unmount and teardown devices prior to live install and to do the same after image install.

2 5

Firstboot password strength
by Martin Gracik 16 Dec '10

16 Dec '10

So, I've changed the ProgressBar showing the password strength to a custom widget, based on the one that is in Gnome's Accounts Dialog, so please let me know what you think. Looks like this http://mgracik.fedorapeople.org/Screenshot.png Thanks. -- Martin Gracik <mgracik(a)redhat.com>

5 5

[rhel6-branch] ppc: do not worry about having more than one PReP boot partition (#625831)
by Ales Kozumplik 16 Dec '10

16 Dec '10

Reverts 93535b2a0c24acd96c26470e485516d093ace5a2. Related: rhbz#579715 --- storage/partitioning.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index 06c078b..203725b 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -94,10 +94,6 @@ def _schedulePartitions(anaconda, disks): if request.fstype is None: request.fstype = anaconda.id.storage.defaultFSType - elif request.fstype == "prepboot" and anaconda.platform.bootDevice(): - # there should never be a need for more than one PReP partition - continue - # This is a little unfortunate but let the backend dictate the rootfstype # so that things like live installs can do the right thing if request.mountpoint == "/" and anaconda.backend.rootFsType != None: -- 1.7.3.3

2 3

[PATCH master rhel6-branch] Fix looking up storage device IDs when writing out anaconda-ks.cfg (#591713).
by Chris Lumens 15 Dec '10

15 Dec '10

I plan to commit the attached patch to both master and rhel6-branch, though for now I have only tested against master. - Chris

2 2

[PATCH] Raise an exception if X*Display functions fail (#663294).
by Chris Lumens 15 Dec '10

15 Dec '10

--- pyanaconda/isys/isys.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c index 392a42c..e28fcad 100644 --- a/pyanaconda/isys/isys.c +++ b/pyanaconda/isys/isys.c @@ -603,6 +603,7 @@ static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args) { XkbStateRec state; if ((d = XOpenDisplay(NULL)) == NULL) { + PyErr_SetString(PyExc_RuntimeError, "XOpenDisplay failed"); return NULL; } @@ -610,6 +611,7 @@ static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args) { XkbGetState(d, XkbUseCoreKbd, &state); if (XCloseDisplay(d)) { + PyErr_SetString(PyExc_RuntimeError, "XCloseDisplay failed"); return NULL; } -- 1.7.1.1

2 1

[PATCH] Don't write out a duplicate mtab to /mnt/sysimage (#568539).
by Chris Lumens 15 Dec '10

15 Dec '10

We write out out in doPreInstall, so there should be no need to still write one out in doMethodComplete. The latter one just confuses kickstart %post scripts these days. --- pyanaconda/installmethod.py | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/pyanaconda/installmethod.py b/pyanaconda/installmethod.py index 17f1d3a..e96c54d 100644 --- a/pyanaconda/installmethod.py +++ b/pyanaconda/installmethod.py @@ -45,12 +45,3 @@ def doMethodComplete(anaconda): dev = _ejectDevice() if dev: dev.eject() - - mtab = "/dev/root / ext3 ro 0 0\n" - rootDevice = anaconda.storage.rootDevice - if rootDevice: - mtab = "/dev/root / %s ro 0 0\n" % rootDevice.format.type - - f = open(anaconda.rootPath + "/etc/mtab", "w+") - f.write(mtab) - f.close() -- 1.7.1.1

2 1

[RHEL6] Change the device reinitialization dialog
by Martin Gracik 15 Dec '10

15 Dec '10

Resolves: rhbz#657376 --- gui.py | 78 ++++++++++--- ui/reinitialize-dialog.glade | 257 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 320 insertions(+), 15 deletions(-) create mode 100644 ui/reinitialize-dialog.glade diff --git a/gui.py b/gui.py index eb6dc22..3dfbddb 100755 --- a/gui.py +++ b/gui.py @@ -810,6 +810,56 @@ class MessageWindow: except SystemError: pass +class ReinitializeWindow(MessageWindow): + + def __init__ (self, title, path, size, description, details, + default=None, run=True, parent=None, destroyAfterRun=True): + + self.debugRid = None + self.title = title + if flags.autostep: + self.rc = 1 + return + self.rc = None + self.framed = False + self.doCustom = False + + xml = gtk.glade.XML(findGladeFile("reinitialize-dialog.glade"), + domain="anaconda") + + self.dialog = xml.get_widget("reinitializeDialog") + self.apply_to_all = xml.get_widget("apply_to_all") + + self.label = xml.get_widget("disk_label") + text = "%s\n%s MB\t%s" % (description, size, path) + self.label.set_markup(text) + + if parent: + self.dialog.set_transient_for(parent) + self.dialog.set_position(gtk.WIN_POS_CENTER) + + if flags.debug: + widget = self.dialog.add_button(_("_Debug"), 2) + self.debugRid = 2 + + defaultchoice = 0 #no + self.dialog.set_default_response(defaultchoice) + + if run: + self.run(destroyAfterRun) + + def run(self, destroy=False): + MessageWindow.run(self, destroy) + apply_all = self.apply_to_all.get_active() + + # doCustom is false, so we will have self.rc set up as following: + # if "Yes, discard" was clicked - self.rc = 1 + # if "No, keep" was clicked - self.rc = 0 + if self.rc == 1: #yes + self.rc = 3 if apply_all else 2 + elif self.rc == 0: #no + self.rc = 1 if apply_all else 0 + class DetailedMessageWindow(MessageWindow): def __init__(self, title, text, longText=None, type="ok", default=None, custom_buttons=None, custom_icon=None, run=True, parent=None, destroyAfterRun=True, expanded=False): self.title = title @@ -1072,6 +1122,16 @@ class InstallInterface(InstallInterfaceBase): custom_buttons, custom_icon, run=True, parent=parent).getrc() return rc + def reinitializeWindow(self, title, path, size, description, details): + if self.icw: + parent = self.icw.window + else: + parent = None + + rc = ReinitializeWindow(title, path, size, description, details, + parent=parent).getrc() + return rc + def createRepoWindow(self): from task_gui import RepoCreator dialog = RepoCreator(self.anaconda) @@ -1178,21 +1238,9 @@ class InstallInterface(InstallInterfaceBase): "using cached answer: %s" % self._initLabelAnswers["all"]) return self._initLabelAnswers["all"] - rc = self.messageWindow(_("Warning"), - _("Error processing drive:\n\n" - "%(path)s\n%(size)-0.fMB\n%(description)s\n\n" - "This device may need to be reinitialized.\n\n" - "REINITIALIZING WILL CAUSE ALL DATA TO BE LOST!\n\n" - "This action may also be applied to all other disks " - "needing reinitialization.%(details)s") - % {'path': path, 'size': size, - 'description': description, 'details': details}, - type="custom", - custom_buttons = [ _("_Ignore"), - _("Ignore _all"), - _("_Re-initialize"), - _("Re-ini_tialize all") ], - custom_icon="question") + rc = self.reinitializeWindow(_("Storage Device Warning"), + path, size, description, details) + if rc == 0: retVal = False elif rc == 1: diff --git a/ui/reinitialize-dialog.glade b/ui/reinitialize-dialog.glade new file mode 100644 index 0000000..6b1ec5a --- /dev/null +++ b/ui/reinitialize-dialog.glade @@ -0,0 +1,257 @@ +<?xml version="1.0" standalone="no"?>  +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkDialog" id="reinitializeDialog"> + <property name="border_width">5</property> + <property name="visible">True</property> + <property name="title" translatable="yes">Storage Device Warning</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="modal">True</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button1"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Yes, discard any data</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-8</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button2"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="label" translatable="yes">No, keep any data</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-9</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">10</property> + <property name="column_spacing">10</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon_size">6</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">The storage device below may contain data.</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-harddisk</property> + <property name="icon_size">6</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="disk_label"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes">We could not detect partitions or filesystems on this device. + +This could be because the device is blank, unpartitioned, or virtual. If not, +there may be data on the device that can not be recovered if you use it in this +installation. We can remove the device from this installation to protect the data. + +Are you sure this device does not contain valuable data?</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="apply_to_all"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Apply my choice to all devices with undetected partitions or filesystems</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">10</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> -- 1.7.3.2

3 4

[PATCH] Conditionalize use of UEFI on boot.iso
by Peter Jones 15 Dec '10

15 Dec '10

This conditionalizes adding support for UEFI when creating boot.iso --- scripts/mk-images | 8 +++++--- scripts/mk-images.x86 | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index e9a44d7..7d842f4 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -447,10 +447,12 @@ if [ ${BUILDARCH} = s390x ]; then elif [ ${BUILDARCH} = ppc64 ]; then # ... and similar for ppc64 source $TOPDIR/mk-images.ppc -elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then +elif [ ${BUILDARCH} = "x86_64" ]; then + export UEFI_BOOT_ISO="no" + source $TOPDIR/mk-images.x86 + source $TOPDIR/mk-images.efi +elif [ ${BUILDARCH} = "i386" ]; then source $TOPDIR/mk-images.x86 - # Only generate EFI images on 64bit - test ${BUILDARCH} = "x86_64" && source $TOPDIR/mk-images.efi elif [ ${BUILDARCH} = "sparc64" -o ${BUILDARCH} = "sparcv9" ]; then source $TOPDIR/mk-images.sparc else diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index d8fb867..20aef71 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -142,7 +142,8 @@ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" EFIGRAFT="" - if [ -f $TOPDESTPATH/images/efiboot.img ]; then + if [ $UEFI_BOOT_ISO = "yes" -a \ + -f $TOPDESTPATH/images/efiboot.img ]; then echo "Found efiboot.img, making an EFI-capable boot.iso" EFIARGS="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot" EFIGRAFT="EFI/BOOT=$TOPDESTPATH/EFI/BOOT" -- 1.7.2.2

3 3

three small mpath patches (more or less) related to #636570
by Ales Kozumplik 14 Dec '10

14 Dec '10

The first one is to make debugging mpath problems easier in the future. The second one is the actual fix and, because it is specific to interactive kickstart which we have dully killed with fire upstream, won't be merged to master. The last one is to improve my development comfort a bit, but is general enough and could be needed later anyway. Ales

4 6

[PATCH] Don't crash if losetup doesn't know anything about a device. (#662513)
by David Lehman 13 Dec '10

13 Dec '10

--- pyanaconda/storage/devicelibs/loop.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/devicelibs/loop.py b/pyanaconda/storage/devicelibs/loop.py index e0dc4f7..4ed52e4 100644 --- a/pyanaconda/storage/devicelibs/loop.py +++ b/pyanaconda/storage/devicelibs/loop.py @@ -57,7 +57,7 @@ def get_device_path(name): start = buf.index("(") + 1 end = buf.rindex(")") path = buf[start:end] - except IndexError: + except (IndexError, ValueError): path = "" log.debug("get_device_path(%s) got '%s'" % (name, path)) -- 1.7.2.3

2 1

Anaconda Installer testing
by Vijay N. Majagaonkar 13 Dec '10

13 Dec '10

Hi all, I am new to this anaconda installer, can someone please tell me the way to debug for changes that we do for Installer or how to test the changes..... Thanks for your help Vijay.

2 2

[firstboot 1/4] Fix firstboot for s390 architecture (#463564)
by Martin Gracik 13 Dec '10

13 Dec '10

Run firstboot the first time root user logs in with a capable terminal --- firstboot.spec | 15 +++++++++++++-- scripts/firstboot.csh | 19 +++++++++++++++++++ scripts/firstboot.sh | 21 +++++++++++++++++++++ setup.py | 18 +++++++++++++----- 4 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 scripts/firstboot.csh create mode 100644 scripts/firstboot.sh diff --git a/firstboot.spec b/firstboot.spec index ce925e1..3382f34 100644 --- a/firstboot.spec +++ b/firstboot.spec @@ -46,8 +46,13 @@ rm %{buildroot}/%{_datadir}/firstboot/modules/additional_cds.py* rm -rf %{buildroot} %post -if ! [ -f /etc/sysconfig/firstboot ]; then - chkconfig --add firstboot +if [ ! -f /etc/sysconfig/firstboot ]; then + platform="$(arch)" + if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then + echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot + else + chkconfig --add firstboot + fi fi %preun @@ -71,6 +76,12 @@ fi %{_datadir}/firstboot/modules/eula.py* %{_datadir}/firstboot/modules/welcome.py* %{_datadir}/firstboot/themes/default/* +%ifarch s390 s390x +%dir %{_sysconfdir}/profile.d +%{_sysconfdir}/profile.d/firstboot.sh +%{_sysconfdir}/profile.d/firstboot.csh +%endif + %changelog * Tue Aug 10 2010 Martin Gracik <mgracik(a)redhat.com> 1.110.8-1 diff --git a/scripts/firstboot.csh b/scripts/firstboot.csh new file mode 100644 index 0000000..07a4ab7 --- /dev/null +++ b/scripts/firstboot.csh @@ -0,0 +1,19 @@ +# firstboot.csh + +set FIRSTBOOT_EXEC = /usr/sbin/firstboot +set FIRSTBOOT_CONF = /etc/sysconfig/firstboot + +# check if we should run firstboot +grep -i "RUN_FIRSTBOOT=NO" $FIRSTBOOT_CONF >/dev/null +if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then + # check if we're not on 3270 terminal and root + if (( `/sbin/consoletype` == "pty" ) && ( `/usr/bin/id -u` == 0 )) then + set args = "" + grep -i "reconfig" /proc/cmdline >/dev/null + if (( $? == 0 ) || ( -e /etc/reconfigSys )) then + set args = "--reconfig" + endif + + $FIRSTBOOT_EXEC $args + endif +endif diff --git a/scripts/firstboot.sh b/scripts/firstboot.sh new file mode 100644 index 0000000..5b4ec9d --- /dev/null +++ b/scripts/firstboot.sh @@ -0,0 +1,21 @@ +# firstboot.sh + +FIRSTBOOT_EXEC=/usr/sbin/firstboot +FIRSTBOOT_CONF=/etc/sysconfig/firstboot + +# source the config file +[ -f $FIRSTBOOT_CONF ] && . $FIRSTBOOT_CONF + +# check if we should run firstboot +if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then + # check if we're not on 3270 terminal and root + if [ $(/sbin/consoletype) = "pty" ] && [ $EUID -eq 0 ]; then + args="" + if grep -i "reconfig" /proc/cmdline >/dev/null || [ -f /etc/reconfigSys ]; then + args="--reconfig" + fi + + . /etc/sysconfig/i18n + $FIRSTBOOT_EXEC $args + fi +fi diff --git a/setup.py b/setup.py index 6249be6..e98ecfd 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,22 @@ from distutils.core import setup from glob import * +import os + +data_files = [('/usr/sbin', ['progs/firstboot']), + ('/etc/rc.d/init.d', ['init/firstboot']), + ('/usr/share/firstboot/themes/default', + glob('themes/default/*.png')), + ('/usr/share/firstboot/modules', glob('modules/*.py'))] + +# add the firstboot start script for s390 architectures +if os.uname()[4].startswith('s390'): + data_files.append(('/etc/profile.d', ['scripts/firstboot.sh'])) + data_files.append(('/etc/profile.d', ['scripts/firstboot.csh'])) setup(name='firstboot', version='1.110', description='Post-installation configuration utility', author='Chris Lumens', author_email='clumens(a)redhat.com', url='http://fedoraproject.org/wiki/FirstBoot', - data_files=[('/usr/sbin', ['progs/firstboot']), - ('/etc/rc.d/init.d', ['init/firstboot']), - ('/usr/share/firstboot/themes/default', glob('themes/default/*.png')), - ('/usr/share/firstboot/modules', glob('modules/*.py')), - ], + data_files=data_files, packages=['firstboot']) -- 1.7.3.2

1 2

Disk image install patches
by David Lehman 10 Dec '10

10 Dec '10

These enabled me to do some kickstart installs to disk image files. It is necessary to specify a primary repo on the anaconda command line even if one is defined in the kickstart config.

2 5

[PATCH] Add losetup to the install image, re-remove it from isys (#662183).
by Chris Lumens 10 Dec '10

10 Dec '10

Part of the removal never happened in the first place, and part of it got overwritten when I pushed the install image merging patch series. --- pyanaconda/isys/isys.c | 40 ---------------------------------------- scripts/upd-instroot | 2 +- 2 files changed, 1 insertions(+), 41 deletions(-) diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c index f09d0b8..3df23da 100644 --- a/pyanaconda/isys/isys.c +++ b/pyanaconda/isys/isys.c @@ -123,8 +123,6 @@ static PyMethodDef isysModuleMethods[] = { { "devSpaceFree", (PyCFunction) doDevSpaceFree, METH_VARARGS, NULL }, { "wiperaidsb", (PyCFunction) doWipeRaidSuperblock, METH_VARARGS, NULL }, { "getraidchunk", (PyCFunction) doGetRaidChunkSize, METH_VARARGS, NULL }, - { "losetup", (PyCFunction) doLoSetup, METH_VARARGS, NULL }, - { "unlosetup", (PyCFunction) doUnLoSetup, METH_VARARGS, NULL }, { "mount", (PyCFunction) doMount, METH_VARARGS, NULL }, { "umount", (PyCFunction) doUMount, METH_VARARGS, NULL }, { "resetresolv", (PyCFunction) doResetResolv, METH_VARARGS, NULL }, @@ -151,44 +149,6 @@ static PyMethodDef isysModuleMethods[] = { { NULL, NULL, 0, NULL } } ; -static PyObject * doUnLoSetup(PyObject * s, PyObject * args) { - int loopfd; - - if (!PyArg_ParseTuple(args, "i", &loopfd)) return NULL; - if (ioctl(loopfd, LOOP_CLR_FD, 0)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - Py_INCREF(Py_None); - return Py_None; -} - -static PyObject * doLoSetup(PyObject * s, PyObject * args) { - int loopfd; - int targfd; - struct loop_info loopInfo; - char * loopName; - - if (!PyArg_ParseTuple(args, "iis", &loopfd, &targfd, &loopName)) - return NULL; - if (ioctl(loopfd, LOOP_SET_FD, targfd)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - memset(&loopInfo, 0, sizeof(loopInfo)); - strncpy(loopInfo.lo_name, basename(loopName), 63); - - if (ioctl(loopfd, LOOP_SET_STATUS, &loopInfo)) { - PyErr_SetFromErrno(PyExc_SystemError); - return NULL; - } - - Py_INCREF(Py_None); - return Py_None; -} - static PyObject * doUMount(PyObject * s, PyObject * args) { char *err = NULL, *mntpoint = NULL; int rc; diff --git a/scripts/upd-instroot b/scripts/upd-instroot index d980033..14e7c2a 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -529,6 +529,7 @@ sbin/killall5 sbin/kpartx sbin/ldconfig sbin/load_policy +sbin/losetup sbin/lspci sbin/lvm* sbin/mdadm @@ -1054,7 +1055,6 @@ install -m 644 $DEST/usr/share/anaconda/loader.tr $DEST/etc/loader.tr cp $DEST/usr/share/anaconda/raidstart-stub $DEST/usr/bin/raidstart cp $DEST/usr/share/anaconda/raidstop-stub $DEST/usr/bin/raidstop -cp $DEST/usr/share/anaconda/losetup-stub $DEST/usr/bin/losetup cp $DEST/usr/share/anaconda/list-harddrives-stub $DEST/usr/bin/list-harddrives cp $DEST/usr/share/anaconda/loadkeys-stub $DEST/usr/bin/loadkeys cp $DEST/usr/share/anaconda/mknod-stub $DEST/usr/bin/mknod -- 1.7.1.1

2 1

[rhel6-branch] three s390x patches
by David Cantrell 09 Dec '10

09 Dec '10

1) A patch clarifying the ssh instructions to begin installation. 2) A patch to not run zfcp.shutdown() during device discovery. 3) Three patches that replace the existing reIPL code with a call to chreipl(8) from s390utils. These patches are also applicable to the master branch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 7

[PATCH 1/2] Override the BaseHandler.dispatcher method.
by Chris Lumens 09 Dec '10

09 Dec '10

This allows me to set an "anaconda" attribute on every command handler we've got, so parse execute methods can refer to self.anaconda. --- pyanaconda/kickstart.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index fda0517..dd33de8 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1184,6 +1184,14 @@ class AnacondaKSHandler(superclass): # Data objects can be seen over and over again. self._dataObjs.append(obj) + def dispatcher(self, args, lineno): + cmd = args[0] + + if self.commands.has_key(cmd): + self.commands[cmd].anaconda = self.anaconda + + return superclass.dispatcher(self, args, lineno) + def execute(self): try: for obj in filter(lambda o: hasattr(o, "execute"), self._dataObjs): -- 1.7.1.1

2 2

"Parallelization" of installation configuration and file copying
by Hugo Osvaldo Barrera 09 Dec '10

09 Dec '10

Hi list! I'm new to this list, so I hope I'm not breaking any netiquette. (I think not). I recently had to re-install my GF's computer which runs ubuntu, and noticed something rather neat, efficient, and, honestly, simple in it's latest installer. The installer only asks about target disks before starting file copying. Information about time-zone, user accounts, etc., is done while the file are copied ("in parallel"). I find this to be really neat and efficient. Some users may take their time to read and think about steps that are not required to copy the OS files to disk. Waiting for the user to complete these step before copying files is just... not efficient. I *might* be able to pick up anaconda's source and see if I can pull this off myself, but not until about 3 weeks from now (I just moved, and have no internet at home). What's the general process for this sort of thing? Does it need some formal approval? Can I just submit a patch and expect it to go though if everything's ok? Is anyone else interested in this as I am? Cheers!

3 2

[master 1/2] filter_gui: device discovery configuration is under anaconda.storage.config.
by Ales Kozumplik 09 Dec '10

09 Dec '10

must have slipped from 53da5c53b40f6f1d7bc77269fbcdc1e4e43a9001. --- pyanaconda/iw/filter_gui.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py index 7144ebc..c5319f5 100644 --- a/pyanaconda/iw/filter_gui.py +++ b/pyanaconda/iw/filter_gui.py @@ -434,7 +434,7 @@ class FilterWindow(InstallWindow): custom_icon="error") raise gui.StayOnScreen - self.anaconda.storage.exclusiveDisks = list(selected) + self.anaconda.storage.config.exclusiveDisks = list(selected) def _add_advanced_clicked(self, button): from advanced_storage import addDrive @@ -550,7 +550,7 @@ class FilterWindow(InstallWindow): def getScreen(self, anaconda): # We skip the filter UI in basic storage mode if anaconda.simpleFilter: - anaconda.storage.exclusiveDisks = [] + anaconda.storage.config.exclusiveDisks = [] return None (self.xml, self.vbox) = gui.getGladeWidget("filter.glade", "vbox") @@ -593,8 +593,8 @@ class FilterWindow(InstallWindow): fcoe.fcoe().startup(anaconda.intf) zfcp.ZFCP().startup(anaconda.intf) dasd.DASD().startup(anaconda.intf, - anaconda.storage.exclusiveDisks, - anaconda.storage.zeroMbr) + anaconda.storage.config.exclusiveDisks, + anaconda.storage.config.zeroMbr) disks = self._getFilterDisks() mcw = MultipathConfigWriter() @@ -684,11 +684,11 @@ class FilterWindow(InstallWindow): name = udev_device_get_name(info) - if self.anaconda.storage.exclusiveDisks and \ - name in self.anaconda.storage.exclusiveDisks: + if self.anaconda.storage.config.exclusiveDisks and \ + name in self.anaconda.storage.config.exclusiveDisks: return True - elif self.anaconda.storage.ignoredDisks and \ - name not in self.anaconda.storage.ignoredDisks: + elif self.anaconda.storage.config.ignoredDisks and \ + name not in self.anaconda.storage.config.ignoredDisks: return True else: return False -- 1.7.3.2

2 3

[rhel6-branch] logging: put timestamps in /tmp/syslog.
by Ales Kozumplik 09 Dec '10

09 Dec '10

Related: rhbz#636570 --- loader/init.c | 139 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 101 insertions(+), 38 deletions(-) diff --git a/loader/init.c b/loader/init.c index 175f1d7..44da5ec 100644 --- a/loader/init.c +++ b/loader/init.c @@ -52,6 +52,7 @@ #include <sys/reboot.h> #include <linux/vt.h> #include <termios.h> +#include <time.h> #include <libgen.h> #include "init.h" @@ -138,35 +139,103 @@ static void fatal_error(int usePerror) { #endif } -static int logChunk(int len, char *inbuf, char *outbuf) { - int inctr, outctr; +struct log_chunk_context { + int starts_message; + int log1_fd; /* always nonzero */ + int log2_fd; +}; + +static char* get_time_string() +{ + struct timeval current_time; + struct tm *t; + int msecs; + char *ret_string; + int rc; + + gettimeofday(&current_time, NULL); + t = gmtime(&current_time.tv_sec); + msecs = current_time.tv_usec / 1000; + rc = asprintf(&ret_string, "%02d:%02d:%02d,%03d ", + t->tm_hour, t->tm_min, t->tm_sec, msecs); + if (rc < 0) + return NULL; + return ret_string; +} + +static void log_chunk_context_init(struct log_chunk_context *context, + int log1, int log2) +{ + context->starts_message = 1; + context->log1_fd = log1; + context->log2_fd = log2; +} - for (inctr = 0, outctr = 0; inctr < len; inctr++) { - /* If the character is a NULL that's immediately followed by a open - * bracket, we've found the beginning of a new kernel message. Put in - * a line separator. +static void log_chunk_flush(struct log_chunk_context *context, + char *buf, int length) +{ + int rc; + rc = write(context->log1_fd, buf, length); + if (context->log2_fd > 0) { + rc = write(context->log2_fd, buf, length); + } +} + +static void log_chunk(struct log_chunk_context *context, + int len, char *inbuf) +{ + int inctr, outctr = 0; + const unsigned BSIZE = 4; + char outbuf[512]; + char *time_str = NULL; + + + /* We finished the previous chunk on message boundary. Put in the time + * stamp. + */ + if (context->starts_message) { + time_str = get_time_string(0); + log_chunk_flush(context, time_str, strlen(time_str)); + context->starts_message = 0; + free(time_str); + } + + + for (inctr = 0; inctr < len; ++inctr) { + /* If the character is a NULL or a newline, immediately followed by an + * open bracket, we've found the beginning of a new kernel message. Put + * in a line separator and the time stamp. */ - if (inbuf[inctr] == '\0' && inctr+1 < len && inbuf[inctr+1] == '<') { - outbuf[outctr] = '\n'; - outctr++; + if ((inbuf[inctr] == '\0' || inbuf[inctr] == '\n') && + inctr+1 < len && inbuf[inctr+1] == '<') { + outbuf[outctr++] = '\n'; + log_chunk_flush(context, outbuf, outctr); + outctr = 0; + time_str = get_time_string(0); + log_chunk_flush(context, time_str, strlen(time_str)); + free(time_str); } - - /* Or, if we see a NULL right before the end of the chunk, that's also - * a good place to add a separator. + /* Or, if we see a NULL or a newline right before the end of the chunk, + add a separator and remember timestamp should be added the next time. */ - else if (inbuf[inctr] == '\0' && inctr+1 == len) { - outbuf[outctr] = '\n'; - outctr++; + else if ((inbuf[inctr] == '\0' || inbuf[inctr] == '\n') && + inctr+1 == len) { + outbuf[outctr++] = '\n'; + context->starts_message = 1; + } + else { + outbuf[outctr++] = inbuf[inctr]; } - /* Otherwise, simply output the character as long as it's not NULL. */ - else if (inbuf[inctr] != '\0') { - outbuf[outctr] = inbuf[inctr]; - outctr++; + /* flush everything if we've filled up the buffer */ + if (outctr == BSIZE) { + log_chunk_flush(context, outbuf, outctr); + outctr = 0; } } - return outctr; + /* flush everything */ + log_chunk_flush(context, outbuf, outctr); } static void doklog(char * fn) { @@ -176,7 +245,7 @@ static void doklog(char * fn) { socklen_t s; int sock = -1; struct sockaddr_un sockaddr; - char inbuf[1024], outbuf[1024]; + char inbuf[1024]; int readfd; int ret; @@ -188,7 +257,7 @@ static void doklog(char * fn) { } out = open(fn, O_WRONLY, 0); - if (out < 0) + if (out < 0) printf("couldn't open %s for syslog -- still using /tmp/syslog\n", fn); log = open("/tmp/syslog", O_WRONLY | O_CREAT, 0644); @@ -196,7 +265,7 @@ static void doklog(char * fn) { /* FIXME: was perror */ printstr("error opening /tmp/syslog"); sleep(5); - + close(in); return; } @@ -210,7 +279,7 @@ static void doklog(char * fn) { close(log); return; } - close(0); + close(0); close(1); close(2); @@ -226,7 +295,7 @@ static void doklog(char * fn) { sleep(5); } printstr("got socket\n"); - if (bind(sock, (struct sockaddr *) &sockaddr, sizeof(sockaddr.sun_family) + + if (bind(sock, (struct sockaddr *) &sockaddr, sizeof(sockaddr.sun_family) + strlen(sockaddr.sun_path))) { printf("bind error: %d\n", errno); sleep(5); @@ -241,6 +310,9 @@ static void doklog(char * fn) { syslog(8, NULL, 1); + struct log_chunk_context context; + log_chunk_context_init(&context, log, out); + FD_ZERO(&unixs); while (1) { memcpy(&readset, &unixs, sizeof(unixs)); @@ -256,24 +328,15 @@ static void doklog(char * fn) { if (FD_ISSET(in, &readset)) { i = read(in, inbuf, sizeof(inbuf)); if (i > 0) { - int loggedLen = logChunk(i, inbuf, outbuf); - - if (out >= 0) - ret = write(out, outbuf, loggedLen); - ret = write(log, outbuf, loggedLen); + log_chunk(&context, i, inbuf); } - } + } for (readfd = 0; readfd < 20; ++readfd) { if (FD_ISSET(readfd, &readset) && FD_ISSET(readfd, &unixs)) { i = read(readfd, inbuf, sizeof(inbuf)); if (i > 0) { - int loggedLen = logChunk(i, inbuf, outbuf); - - if (out >= 0) - ret = write(out, outbuf, loggedLen); - - ret = write(log, outbuf, loggedLen); + log_chunk(&context, i, inbuf); } else if (i == 0) { /* socket closed */ close(readfd); @@ -295,7 +358,7 @@ static void doklog(char * fn) { FD_SET(readfd, &unixs); } } - } + } } static int setupTerminal(int fd) { -- 1.7.3.2

2 2

Re: User Experience improvements for Anaconda
by allen＠doobie.itdl.ds.boeing.com 08 Dec '10

08 Dec '10

On Dec 7, 12:58pm, =?ISO-8859-1?Q?M=E1ir=EDn?= Duffy wrote: } Subject: Re: User Experience improvements for Anaconda >On Mon, 2010-11-29 at 22:08 +0000, Chris Lumens wrote: >> > In the end, that's what I object to. It feels like an attempt to enforce >> > a policy that I don't agree with. Let it be default to set up a local user >> > account. But also let it be an option to bypass that and (or in addition) >> > set the root password. >> >> Part of having this discussion on the mailing list is to see what other >> people's opinions on this are. We're always open to different >> viewpoints and haven't really decided anything one way or the other on >> this. I'm not willing to make a decision on it until we see some more >> mockups, personally. > >Sorry it's been a week or so; I've been looking at the storage >re-initialization popup [1]. > >Anyway, here's a couple of different mockups (sorry if the blue is too >much, if the aesthetics are too scary just ignore them for the meat): > >https://fedoraproject.org/wiki/Anaconda/UX_Redesign/Sudo_By_Default > >I did two versions; > >- version #1 is where you can simply use 'root' as your username and >it'll set a root password instead of create a first user. One >potentially weird/awkward thing here is that I don't think it's so nice >to set a real person's name on a root account (is it even possible?) So >I think the right thing to do in the case of setting the username = root >is to blank out the 'Full Name' field and grey it out as well when >'root' is typed in the field. > >- version #2 is where you can 'opt-in' to setting a root password with a >bit of an explanation as to why you don't want to do it (to discourage >folks who might not be up for it from doing it.) The explanation on that >screen may be BS though, I made it up. :) > >In both versions, you get extra screens by 'opting-in' to them via >checkboxes (similar to how the partitioning screen works today.) > >What do you think? They would both let me do what I need, so I find both to be acceptable. An idea, just for grins, for version #1 is to put the username above the real name, and if the operator types in 'root' for the username, then it could pre-fill the real name with 'Charlie Root' (like BSD has had for ages ;-). Thanks, Steve

1 0

Re: User Experience improvements for Anaconda
by Martin Gracik 08 Dec '10

08 Dec '10

Is it such a big deal to have one normal local user account on your system? Are there any downsides to this? What if the NIS server dies, how will you login in an emergency? I like the idea of not having root, and having only a local user setup with sudo rights in anaconda. Then if I really need the root account, I can do it in command line manually. In my opinion anaconda+firstboot should make life easier for people who don't know much about the system. If you're an advanced user, and really need a root user account, you should already have the knowledge how to create it in command line by yourself. You shouldn't need a GUI wizard for that. -- Martin Gracik ----- "Steve Allen" <allen(a)doobie.itdl.ds.boeing.com> wrote: > M�ir�n Duffy <duffy(a)fedoraproject.org> wrote: > > On Mon, 2010-11-22 at 17:45 +0000, Steve Allen wrote: > > > I already skip the creation of a local account, and set up NIS. > And yes, > > > I do want to set a root password. > > > > I know you already skip it today, but you wouldn't be able to do > that in > > Chris' original proposal I think. I can make sure in the redesign > that > > we handle your case. Thanks! > > And thank you for the consideration. > > Steve > > -- > Steven R. Allen - Linux Admin Weenie > Unix sysadmin: Linux, IRIX, NetBSD, OS X, Solaris, HP/UX, CX/UX > Phone: 206-544-0910 M/S: 4J-06 > > > _______________________________________________ > Anaconda-devel-list mailing list > Anaconda-devel-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/anaconda-devel-list

9 27

[PATCH] Device destroy actions can only require other destroy actions. (#651589)
by David Lehman 07 Dec '10

07 Dec '10

--- pyanaconda/storage/deviceaction.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/deviceaction.py b/pyanaconda/storage/deviceaction.py index e020a57..47de6b8 100644 --- a/pyanaconda/storage/deviceaction.py +++ b/pyanaconda/storage/deviceaction.py @@ -292,7 +292,7 @@ class ActionDestroyDevice(DeviceAction): and this partition has a lower number """ rc = False - if action.device.dependsOn(self.device): + if action.device.dependsOn(self.device) and action.isDestroy: rc = True elif (action.isDestroy and action.isDevice and isinstance(self.device, PartitionDevice) and -- 1.7.2.3

2 1

[PATCH] Use wipefs from util-linux-ng instead of dd to wipe old sigs.
by David Lehman 07 Dec '10

07 Dec '10

This should cover all the formats recognized by blkid. Finally. --- pyanaconda/storage/formats/__init__.py | 39 ++++++++++++------------------- scripts/upd-instroot | 1 + 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pyanaconda/storage/formats/__init__.py b/pyanaconda/storage/formats/__init__.py index f84b160..5edada4 100644 --- a/pyanaconda/storage/formats/__init__.py +++ b/pyanaconda/storage/formats/__init__.py @@ -22,7 +22,9 @@ import os -from pyanaconda.iutil import notify_kernel, get_sysfs_path_by_name +from pyanaconda.iutil import notify_kernel +from pyanaconda.iutil import get_sysfs_path_by_name +from pyanaconda.iutil import execWithRedirect from ..storage_log import log_method_call from ..errors import * from ..devicelibs.dm import dm_node_from_name @@ -268,31 +270,20 @@ class DeviceFormat(object): def destroy(self, *args, **kwargs): log_method_call(self, device=self.device, type=self.type, status=self.status) - # zero out the 1MB at the beginning and end of the device in the - # hope that it will wipe any metadata from filesystems that - # previously occupied this device - log.debug("zeroing out beginning and end of %s..." % self.device) - fd = None - try: - fd = os.open(self.device, os.O_RDWR) - buf = '\0' * 1024 * 1024 - os.write(fd, buf) - os.lseek(fd, -1024 * 1024, 2) - os.write(fd, buf) - os.close(fd) - except OSError as e: - if getattr(e, "errno", None) == 28: # No space left in device - pass - else: - log.error("error zeroing out %s: %s" % (self.device, e)) - - if fd: - os.close(fd) + rc = execWithRedirect("wipefs", ["-a", self.device], + stderr="/dev/tty5", + stdout="/dev/tty5") except Exception as e: - log.error("error zeroing out %s: %s" % (self.device, e)) - if fd: - os.close(fd) + err = str(e) + else: + err = "" + if rc: + err = str(rc) + + if err: + msg = "error wiping old signatures from %s: %s" % (self.device, err) + raise FormatDestroyError(msg) self.exists = False diff --git a/scripts/upd-instroot b/scripts/upd-instroot index f3bd76b..4255ad0 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -572,6 +572,7 @@ sbin/tune2fs sbin/udev* sbin/umount* sbin/vconfig +sbin/wipefs sbin/xfs_repair sbin/xfsrestore sbin/ybin -- 1.7.2.3

2 1

[PATCH rhel6-branch] Set installer environment hostname for sw raid LABELs (#640743)
by Radek Vykydal 07 Dec '10

07 Dec '10

mdadm tool will use it when creating the device. --- iw/network_gui.py | 2 +- network.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/iw/network_gui.py b/iw/network_gui.py index 4188cc5..702d227 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -95,7 +95,7 @@ class NetworkWindow(InstallWindow): custom_icon="error") self.hostnameError() - self.anaconda.id.network.hostname = hostname + self.anaconda.id.network.setHostname(hostname) return None def NMCEExited(pid, condition, anaconda): diff --git a/network.py b/network.py index f66d62f..a3a6b96 100644 --- a/network.py +++ b/network.py @@ -387,6 +387,9 @@ class Network: def setHostname(self, hn): self.hostname = hn + log.info("setting installation environment hostname to %s" % hn) + iutil.execWithRedirect("hostname", [ "-v", hn ], + stdout = "/dev/tty5", stderr="/dev/tty5") def unsetDNS(self, devname): """Unset all DNS* ifcfg parameters.""" -- 1.7.2

2 1

[PATCH rhel6 1/3] Move setProxy to AnacondaYum (#634655)
by Brian C. Lane 07 Dec '10

07 Dec '10

Move setProxy over to AnacondaYum so that it can be used for repos and for setting up proxy info for the initial grab of .treeinfo Related: rhbz#634655 --- yuminstall.py | 131 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 55 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 6a55273..9c8c210 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -294,54 +294,6 @@ class AnacondaYumRepo(YumRepository): anacondaBaseURLs = property(_getAnacondaBaseURLs, _setAnacondaBaseURLs, doc="Extends AnacondaYum.baseurl to store non-yum urls:") - def setProxy(self, obj): - """ - Set the proxy settings from a string in obj.proxy - If the string includes un/pw use those, otherwise set the un/pw from - obj.proxyUsername and obj.proxyPassword - """ - # This is the same pattern as from loader/urls.c:splitProxyParam - # except that the POSIX classes have been replaced with character - # ranges - # NOTE: If this changes, update tests/regex/proxy.py - # - # proxy=[protocol://][username[:password]@]host[:port][path] - pattern = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?") - - m = pattern.match(obj.proxy) - - if m and m.group(5): - # If both a host and port was found, just paste them - # together using the colon at the beginning of the port - # match as a separator. Otherwise, just use the host. - if m.group(6): - proxy = m.group(5) + m.group(6) - else: - proxy = m.group(5) - - # yum also requires a protocol. If none was given, - # default to http. - if m.group(1): - proxy = m.group(1) + proxy - else: - proxy = "http://" + proxy - - # Set the repo proxy. NOTE: yum immediately parses this and - # raises an error if it isn't correct - self.proxy = proxy - - if m and m.group(3): - self.proxy_username = m.group(3) - elif getattr(obj, "proxyUsername", None): - self.proxy_username = obj.proxyUsername - - if m and m.group(4): - # Skip the leading colon. - self.proxy_password = m.group(4)[1:] - elif getattr(obj, "proxyPassword", None): - self.proxy_password = obj.proxyPassword - - class YumSorter(yum.YumBase): def _transactionDataFactory(self): return SplitMediaTransactionData() @@ -383,6 +335,14 @@ class AnacondaYum(YumSorter): self.updates = [] self.localPackages = [] + # Parse proxy values from anaconda + self.proxy = None + self.proxy_url = None + self.proxy_username = None + self.proxy_password = None + if self.anaconda.proxy: + self.setProxy(self.anaconda, self) + def setup(self): # yum doesn't understand all our method URLs, so use this for all # except FTP and HTTP installs. @@ -577,7 +537,7 @@ class AnacondaYum(YumSorter): log.info("set mediaid of repo %s to: %s" % (rid, repo.mediaid)) if self.anaconda.proxy: - repo.setProxy(self.anaconda) + self.setProxy(self.anaconda, repo) repo.enable() self.repos.add(repo) @@ -649,9 +609,70 @@ class AnacondaYum(YumSorter): return repo - # Given the baseurl for a repository, see if it has any valid addon repos and - # if so, return a list of (repo name, repo URL). - def _getAddons(self, baseurl): + def setProxy(self, src, dest): + """ + Set the proxy settings from a string in src.proxy + If the string includes un/pw use those, otherwise set the un/pw from + src.proxyUsername and src.proxyPassword + + dest has dest.proxy set to the host and port (no un/pw) + dest.proxy_username and dest.proxy_password are set if present in src + """ + # This is the same pattern as from loader/urls.c:splitProxyParam + # except that the POSIX classes have been replaced with character + # ranges + # NOTE: If this changes, update tests/regex/proxy.py + # + # proxy=[protocol://][username[:password]@]host[:port][path] + pattern = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?") + + m = pattern.match(src.proxy) + + if m and m.group(3): + dest.proxy_username = m.group(3) + elif getattr(src, "proxyUsername", None): + dest.proxy_username = src.proxyUsername + + if m and m.group(4): + # Skip the leading colon. + dest.proxy_password = m.group(4)[1:] + elif getattr(src, "proxyPassword", None): + dest.proxy_password = src.proxyPassword + + if dest.proxy_username or dest.proxy_password: + proxy_auth = "%s:%s@" % (dest.proxy_username or '', + dest.proxy_password or '') + else: + proxy_auth = "" + + if m and m.group(5): + # If both a host and port was found, just paste them + # together using the colon at the beginning of the port + # match as a separator. Otherwise, just use the host. + if m.group(6): + proxy = m.group(5) + m.group(6) + else: + proxy = m.group(5) + + # yum also requires a protocol. If none was given, + # default to http. + if m.group(1): + dest.proxy_url = m.group(1) + proxy_auth + proxy + proxy = m.group(1) + proxy + else: + dest.proxy_url = "http://" + proxy_auth + proxy + proxy = "http://" + proxy + + # Set the repo proxy. NOTE: yum immediately parses this and + # raises an error if it isn't correct + dest.proxy = proxy + + def _getAddons(self, repo): + """ + Check the baseurl or mirrorlist for a repository, see if it has any + valid addon repos and if so, return a list of (repo name, repo URL). + """ + baseurl = repo.mirrorlist or repo.baseurl[0] retval = [] c = ConfigParser() @@ -819,21 +840,21 @@ class AnacondaYum(YumSorter): repo.includepkgs = ksrepo.includepkgs if ksrepo.proxy: - repo.setProxy(ksrepo) + self.setProxy(ksrepo, repo) repo.enable() extraRepos.append(repo) initialRepos = self.repos.repos.values() + extraRepos for repo in initialRepos: - addons = self._getAddons(repo.mirrorlist or repo.baseurl[0]) + addons = self._getAddons(repo) for addon in addons: addonRepo = AnacondaYumRepo(addon[0]) addonRepo.name = addon[1] addonRepo.baseurl = [ addon[2] ] if self.anaconda.proxy: - addonRepo.setProxy(self.anaconda) + self.setProxy(self.anaconda, addonRepo) extraRepos.append(addonRepo) -- 1.7.3.2

3 6

Miscellaneous patches for master
by David Lehman 06 Dec '10

06 Dec '10

A new unit test, a fix for running unit tests as non-root, and a new flag to allow DeviceTree to deactivate arbitrary device configurations, including active LUKS devices.

2 4

[PATCH] Preserve and otherwise ignore noauto fstab entries. (#660017)
by David Lehman 06 Dec '10

06 Dec '10

--- pyanaconda/storage/__init__.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index e815c20..bb5bc02 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -1618,10 +1618,16 @@ class FSSet(object): return filesystems def _parseOneLine(self, (devspec, mountpoint, fstype, options, dump, passno)): + # no sense in doing any legwork for a noauto entry + if "noauto" in options: + log.info("ignoring noauto entry") + raise UnrecognizedFSTabEntryError() + # find device in the tree device = self.devicetree.resolveDevice(devspec, cryptTab=self.cryptTab, blkidTab=self.blkidTab) + if device: # fall through to the bottom of this block pass -- 1.7.2.3

2 1

[PATCHES rhel6-branch] miscellaneous
by Chris Lumens 06 Dec '10

06 Dec '10

Here's three unrelated rhel6-branch patches. - Chris

3 12

[rhel6-branch] misc patches
by David Cantrell 06 Dec '10

06 Dec '10

Two patches for s390 and one to restore the list-harddrives command to the previous functionality. These patches are also applicable to the master branch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 4

Using Kickstart to force a local boot
by Matthew Macdonald-Wallace 06 Dec '10

06 Dec '10

Hi, I've got a system which delivers kickstarts based on the kssendmac values and it works fine for building systems, however it means I need to update the tftp pxelinux.cfg dir everytime a server builds to avoid it rebuilding on every boot. Is there a flag that I can return as part of a kickstart file which will 'force' the system to boot from local disk instead, or am I dreaming? ;) Thanks in advance, Matt

4 3

[PATCH rhel5-branch] Gtk package %post script has changed (#659309)
by Radek Vykydal 06 Dec '10

06 Dec '10

Ray Strode proposed a solution, see https://bugzilla.redhat.com/show_bug.cgi?id=659309#c14. Given where we are in the release cycle, I'd prefer this simple patch. --- scripts/upd-instroot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a3b9243..8f08ea9 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -1148,7 +1148,7 @@ ModuleFiles=/etc/pango/pango.modules EOF fi -host=`rpm --nodigest --nosignature -qp --qf "%{POSTIN}\n" $PACKAGEDIR/gtk2*.$ARCH.rpm |grep update-gdk-pixbuf |awk {'print $2;'}` +host=`rpm --nodigest --nosignature -qp --qf "%{POSTIN}\n" $PACKAGEDIR/gtk2*.$ARCH.rpm |grep update-gdk-pixbuf |awk {'print $3;'}` case "$host" in *linux) canonhost="$host-gnu" -- 1.7.2

3 2

[rhel6-branch] Do not backtrace if repo is specified through kickstart only (#659781).
by Ales Kozumplik 06 Dec '10

06 Dec '10

Related: rhbz#632526 --- yuminstall.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 6a55273..994a9bc 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -682,6 +682,8 @@ class AnacondaYum(YumSorter): return retval def _getTreeinfo(self, baseurl): + if not baseurl: + return None if baseurl.startswith("http") or baseurl.startswith("ftp"): if not network.hasActiveNetDev(): if not self.anaconda.intf.enableNetwork(): -- 1.7.3.2

3 3

Seeding certificates at install time
by Philip Prindeville 04 Dec '10

04 Dec '10

Regarding a posting recently on fedora-devel, I'm considering what would be involved in making the self-signed certificates that various RPM's install as part of their %post/%pre section (openssl, sendmail, mod_ssl, proftpd, cyrus-imapd, etc) be a bit more meaningful than just: # rpm -q --scripts cyrus-imapd preinstall scriptlet (using /bin/sh): ... if [ ! -f /etc/pki/cyrus-imapd/cyrus-imapd.pem ]; then pushd /etc/pki/tls/certs umask 077 /bin/cat<< EOF | make cyrus-imapd.pem -- SomeState SomeCity SomeOrganization SomeOrganizationalUnit localhost.localdomain root(a)localhost.localdomain EOF /bin/chown root.mail cyrus-imapd.pem /bin/chmod 640 cyrus-imapd.pem mv cyrus-imapd.pem /etc/pki/cyrus-imapd/cyrus-imapd.pem popd fi ... and to that end, I wanted to have Anaconda/Kickstart allow one to populate a file such as /etc/certinfo with a few fields: # # Certificate seed data, generated XX/XX/XXXX # C='US' ST='Idaho' L='Boise' O='Redfish Solutions, LLC' OU='' as an example. Then the various scripts could use this as seed data. The other thing that would be useful to have, but this is more of a packaging issue, would be to be able to re-run the %post/%pre scripts (or the idempotent sections of them) that generate certificates or otherwise network identity-derived configuration. In cases where the CN (common name) of a certificate is generated from the hostname, for instance, and the hostname has changed (for instance the machine was rebooted in a production network with a DHCP configured to give it out a hostname). An example of this is in the mod_ssl scripting: # rpm -q --scripts mod_ssl postinstall scriptlet (using /bin/sh): umask 077 if [ ! -f /etc/pki/tls/private/localhost.key ] ; then /usr/bin/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024> /etc/pki/tls/private/localhost.key 2> /dev/null fi FQDN=`hostname` if [ "x${FQDN}" = "x" ]; then FQDN=localhost.localdomain fi if [ ! -f /etc/pki/tls/certs/localhost.crt ] ; then cat<< EOF | /usr/bin/openssl req -new -key /etc/pki/tls/private/localhost.key \ -x509 -days 365 -set_serial $RANDOM \ -out /etc/pki/tls/certs/localhost.crt 2>/dev/null -- SomeState SomeCity SomeOrganization SomeOrganizationalUnit ${FQDN} root@${FQDN} EOF fi So, my question is basically this: what would be involved in modifying Anaconda and Kickstart to include (a) UI support for entering this information in a separate configure screen at install time, or (b) additional options for scripted installs? It shouldn't be too much, right? Thanks, -Philip

2 2

[PATCH rhel6 pykickstart] Add network --activate option (#638131)
by Radek Vykydal 03 Dec '10

03 Dec '10

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. If/when acked, I'd duplicate the bug for pykickstart so we can track pykickstart build the bug is fixed in. --- pykickstart/commands/network.py | 30 ++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/pykickstart/commands/network.py b/pykickstart/commands/network.py index e2a3101..b0a7026 100644 --- a/pykickstart/commands/network.py +++ b/pykickstart/commands/network.py @@ -156,6 +156,22 @@ class RHEL4_NetworkData(FC3_NetworkData): return retval +class RHEL6_NetworkData(F8_NetworkData): + removedKeywords = F8_NetworkData.removedKeywords + removedAttrs = F8_NetworkData.removedAttrs + + def __init__(self, *args, **kwargs): + F8_NetworkData.__init__(self, *args, **kwargs) + self.activate = kwargs.get("activate", False) + + def _getArgsAsStr(self): + retval = F8_NetworkData._getArgsAsStr(self) + + if self.activate: + retval += " --activate" + + return retval + class FC3_Network(KickstartCommand): removedKeywords = KickstartCommand.removedKeywords removedAttrs = KickstartCommand.removedAttrs @@ -287,3 +303,17 @@ class RHEL5_Network(FC6_Network): default=BOOTPROTO_DHCP, choices=self.bootprotoList) return op + +class RHEL6_Network(F9_Network): + removedKeywords = F9_Network.removedKeywords + removedAttrs = F9_Network.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + F9_Network.__init__(self, writePriority, *args, **kwargs) + self.activate = kwargs.get("activate", False) + + def _getParser(self): + op = F9_Network._getParser(self) + op.add_option("--activate", dest="activate", action="store_true", + default=False) + return op diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 2d4b11f..a90c262 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -843,7 +843,7 @@ commandMap = { "mediacheck": mediacheck.FC4_MediaCheck, "monitor": monitor.F10_Monitor, "multipath": multipath.FC6_MultiPath, - "network": network.F9_Network, + "network": network.RHEL6_Network, "nfs": method.F13_Method, "part": partition.F12_Partition, "partition": partition.F12_Partition, @@ -1070,7 +1070,7 @@ dataMap = { "IscsiData": iscsi.F10_IscsiData, "LogVolData": logvol.F12_LogVolData, "MultiPathData": multipath.FC6_MultiPathData, - "NetworkData": network.F8_NetworkData, + "NetworkData": network.RHEL6_NetworkData, "PartData": partition.F12_PartData, "RaidData": raid.F13_RaidData, "RepoData": repo.F13_RepoData, -- 1.7.2

1 0

Various patches for master
by David Lehman 03 Dec '10

03 Dec '10

Various cleanups and one bugfix.

3 8

call for tests
by Chris Lumens 02 Dec '10

02 Dec '10

As you know, we've got this automated storage test system for anaconda now. I've got enough tests to cover all the partitioning parts of the Fedora test matrix (except for resizing, which kickstart cannot express). You can see the list of tests for yourself here: http://git.fedorahosted.org/git/?p=autoqa.git;a=tree;f=tests/anaconda_stora… What I'm interested in is more suggestions for tests. If you can come up with a good description of what the disks look like when we start, what we should do to them, and what they should look like when we're done that would be very helpful. I'll keep a list in git. What'd be even more helpful would be if people were interested in writing tests themselves. I might try to offer training for this at FUDCon or perhaps in irc one day given enough interest. If you wanted to write a test, you'd need to: * Know python well. I'm not willing to teach people how to program. * Have some familiarity with python's unittest module. This is easy. If you can program, you can pick it up in about five minutes. * Know kickstart well. The tests themselves are run through kickstart files, so you need to know how to express various partitioning setups. I can teach this. * Be really picky. * Know what anaconda's expected behavior is. This is pretty tough, but I'm willing to explain this as needed. - Chris

1 0

[PATCH][master] Support installing to disk image files.
by David Lehman 02 Dec '10

02 Dec '10

Patches 1, 2, 6, 8, 9, 10, 13, 14, 15, and 16 are just various cleanups. Patch 3 fixes a bug in handling partitions on device-mapper disks. Patches 4, 5, 7, 11, and 12 add support for installing to disk image files. Some known issues: - There's no way to determine product name from liveinst for image installs. - There's no way to ensure the host system can run anaconda correctly. - There's no way to configure network devices for the installed system. - Already-active LUKS devices break devicetree.populate as of now, which renders anaconda-image-cleanup useless if you encrypt any devices in/on your disk images. To create image files you can use dd or qemu-img (raw format). Then, to do an install to the images, you would run something like this (after installing the anaconda rpm): LIVECMD="anaconda --image=/opt/disk1.img --image=/opt/disk2.img -m http://cannonball/install/rawhide/20101110/x86_64/os/" liveinst

4 31

partial offload for bnx2i
by Ales Kozumplik 02 Dec '10

02 Dec '10

Hi, after elaborate experimenting, reading and failing I have a patchset and this is the Anaconda part. Combined with the new libiscsi one can log into the target specified in the firmware of his bnx2i card and utilize its partial offload capabilities for transfers. I'd like to have it in soon, especially the first patch that pulls drivers and the extra daemon into the image so I can verify it works soon. The important part is the libiscsi change but I don't think that anyone is interested in that (or ping me). Ales

6 16

[rhel6-branch] Add rdate, tty, which to install image
by Martin Gracik 01 Dec '10

01 Dec '10

Resolves: rhbz#654432 --- scripts/upd-instroot | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a4ec858..a9e3866 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -190,7 +190,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda pam pango parted pciutils pcre psmisc pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-nss python-pyblock python-sqlite python-epdb - python-urlgrabber python-volume_key pyxf86config readline redhat-artwork + 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 setup slang smc-meera-fonts specspo sqlite startup-notification @@ -199,7 +199,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda sysvinit-tools tcp_wrappers tcp_wrappers-libs telnet tzdata udev un-core-dotum-fonts urw-fonts util-linux-ng tigervnc-server tigervnc-server-module vconfig vlgothic-fonts vim-minimal - wget wpa_supplicant xcb-util xkeyboard-config xfsprogs xorg-x11-xauth + wget which wpa_supplicant xcb-util xkeyboard-config xfsprogs xorg-x11-xauth xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic xorg-x11-fonts-misc xorg-x11-server-utils xorg-x11-server-Xorg xorg-x11-xkb-utils xorg-x11-xfs yum @@ -567,6 +567,7 @@ usr/bin/nslookup usr/bin/pango* usr/bin/python usr/bin/python?.? +usr/bin/rdate usr/bin/readlink usr/bin/reduce-font usr/bin/report @@ -581,12 +582,14 @@ usr/bin/tee usr/bin/telnet usr/bin/tilo usr/bin/top +usr/bin/tty usr/bin/wc usr/bin/udev* usr/bin/uniq usr/bin/vncconfig usr/bin/vncpasswd usr/bin/wget +usr/bin/which usr/bin/xkbcomp usr/bin/xrandr usr/bin/zenity -- 1.7.3.2

2 1

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel December 2010