Anaconda-devel May 2010

anaconda-devel@lists.fedoraproject.org

25 participants
180 discussions

Re-thinking the filter-ui
by Hans de Goede 01 Jun '10

01 Jun '10

Hi all, During my bug triaging I've encountered several bugs, mostly wrt bootloader issues, caused by people not understanding the filter-ui. People think that they need to select the disks which they want to install to, so if they for example have 2 disks, 1 with windows, and 1 free disk, they only select the free disk. But as this is the filter ui, anaconda then only sees the free disk, and will write a grub device.map like this: (hd0) /dev/sdb While correct for these systems usually is: (hd0) /dev/sda (hd1) /dev/sdb Now one can simply argue that this is a user error, but I have to agree with the users filing these bugs, that the filter UI is rather confusing if you don't know what the idea behind it is. Also note that in the above scenario, we also have a problem on the clear_disks ui, as one may want to only select sdb to clear, yet still boot from sda, which is impossible too. Thus I think we need to re-think how these things works UI-wise. Some ideas (for F-14): 1) When basic storage configuration is shown, simply skip the filter UI completely (leaving exclusive disks empty, and behaving as pre filter-ui and as kickstart still works). This has the IMHO large advantage of removing the confusion with having 2 disk selection screens. 2) In the clear disks ui, make the boot device a drop down below the 2 disk panes, much like it was before the UI changes. As the bugs we've been getting about it being unclear how to select which disk to boot from, and the above use case illustrate what we currently have does not work all that well from a UI pov. Regards, Hans

2 4

[PATCH] Make sure we still have an elf interpreter after unmounting fs (#598222)
by Hans de Goede 01 Jun '10

01 Jun '10

When moving to stage2 we rename the initrd /lib to /lib_old and add a symlink from /lib to /mnt/runtime/lib. When shutting down we unmount filesystems and then after unmount try to run mdadm to wait for any Intel BIOS RAID arrays to have their metadata updated that they were cleanly shutdown to avoid a resync of the entire array on the next boot. But at this point /lib is a dangling symlink, so no elf interpreter gets found (nor libc) and the mdadm call we do fails, leaving the array unclean. --- loader/shutdown.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/loader/shutdown.c b/loader/shutdown.c index 3b481f2..8177399 100644 --- a/loader/shutdown.c +++ b/loader/shutdown.c @@ -28,6 +28,7 @@ #include <string.h> #include <sys/reboot.h> #include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> #include "init.h" @@ -50,6 +51,7 @@ static void performTerminations(void) { static void performUnmounts(void) { int ignore; + struct stat st_buf; printf("disabling swap...\n"); disableSwap(); @@ -57,6 +59,24 @@ static void performUnmounts(void) { printf("unmounting filesystems...\n"); unmountFilesystems(); + /* We've lost /mnt/runtime where /lib is a link to put the old + /lib back so that our mdadm invocation below works. */ + if (stat("/lib64", &st_buf) == 0) { + if (unlink("/lib64")) + perror("unlink /lib64"); + if (rename("/lib64_old", "/lib64")) + perror("rename /lib64_old /lib64"); + } else { + if (unlink("/lib")) + perror("unlink /lib"); + if (rename("/lib_old", "/lib")) + perror("rename /lib_old /lib"); + } + if (unlink("/usr")) + perror("unlink /usr"); + if (rename("/usr_old", "/usr")) + perror("rename /usr_old /usr"); + printf("waiting for mdraid sets to become clean...\n"); ignore = system("/sbin/mdadm --wait-clean --scan"); } -- 1.7.0.1

2 2

[PATCH rhel6-branch master 1/2] Extra debugging output (#587442)
by Brian C. Lane 31 May '10

31 May '10

Add extra debugging info for LVM and MD RAID size calculations. Related: rhbz#587442 --- storage/devices.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index 448fa44..3b277c9 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2014,6 +2014,7 @@ class LVMVolumeGroupDevice(DMDevice): lv.size > self.freeSpace: raise DeviceError("new lv is too large to fit in free space", self.name) + log.debug("Adding %s/%dMB to %s" % (lv.name, lv.size, self.name)) self._lvs.append(lv) def _removeLogVol(self, lv): @@ -2076,6 +2077,7 @@ class LVMVolumeGroupDevice(DMDevice): # sum up the sizes of the PVs and align to pesize size = 0 for pv in self.pvs: + log.debug("PV size == %s" % pv.size) size += max(0, self.align(pv.size - pv.format.peStart)) return size @@ -2529,8 +2531,10 @@ class MDRaidArrayDevice(StorageDevice): elif self.level == mdraid.RAID10: size = (self.memberDevices / 2.0) * smallestMemberSize size -= size % self.chunkSize + log.debug("non-existant RAID %s size == %s" % (self.level, size)) else: size = self.partedDevice.getSize() + log.debug("existing RAID %s size == %s" % (self.level, size)) return size -- 1.6.6.1

2 3

Booty cleanup patchset
by Hans de Goede 31 May '10

31 May '10

It is about time someone put a firehose on booty to thoroughly clean it up, attached is a first attempt at making booty cleaner. The attached patchset moves booty over from using device names to devices one function at a time, this leads to some bits of code coming and going between patches, the end result as one big patch would be: bootloader.py | 16 ++++----- booty/alpha.py | 16 +-------- booty/bootloaderInfo.py | 3 + booty/checkbootloader.py | 76 +++++++++-------------------------------------- booty/ppc.py | 1 booty/sparc.py | 5 +-- booty/util.py | 38 ++++------------------- booty/x86.py | 62 +++++++++++++++++++------------------- 8 files changed, 68 insertions(+), 149 deletions(-) And more importantly a whole lot of getDeviceByName, devpathToName, etc calls are gone. Note this is entirely untested sofar, and now it is weekend for me :) Regards, Hans

2 16

[PATCH rhel6-branch] Don't overwrite 70-persistent-net.rules (#597625)
by Radek Vykydal 31 May '10

31 May '10

I accidentally dropped commit f62ac02d6923230e7cf501d3db24c07f14791e6b during nm-c-e integration. --- network.py | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/network.py b/network.py index 8b0d109..531ba9d 100644 --- a/network.py +++ b/network.py @@ -653,36 +653,37 @@ class Network: # /etc/udev/rules.d/70-persistent-net.rules rules = "/etc/udev/rules.d/70-persistent-net.rules" - f = open(rules, "w") - f.write(""" + if not os.path.isfile(rules): + f = open(rules, "w") + f.write(""" # This file was automatically generated by the /lib/udev/write_net_rules # program run by the persistent-net-generator.rules rules file. # # You can modify it, as long as you keep each rule on a single line. """) - for dev in self.netdevices.values(): - addr = dev.get("HWADDR") - if not addr: - continue - devname = dev.get("DEVICE") - basename = devname - while basename != "" and basename[-1] in string.digits: - basename = basename[:-1] + for dev in self.netdevices.values(): + addr = dev.get("HWADDR") + if not addr: + continue + devname = dev.get("DEVICE") + basename = devname + while basename != "" and basename[-1] in string.digits: + basename = basename[:-1] - # rules are case senstive for address. Lame. - addr = addr.lower() + # rules are case senstive for address. Lame. + addr = addr.lower() - s = "" - if len(dev.description) > 0: - s = "# %s (rule written by anaconda)\n" % (dev.description,) - else: - s = "# %s (rule written by anaconda)\n" % (devname,) - s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", KERNEL=="%s*", NAME="%s"\n' % (addr, basename, devname,) + s = "" + if len(dev.description) > 0: + s = "# %s (rule written by anaconda)\n" % (dev.description,) + else: + s = "# %s (rule written by anaconda)\n" % (devname,) + s = s + 'SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS=="?*", ATTR{address}=="%s", ATTR{type}=="1", KERNEL=="%s*", NAME="%s"\n' % (addr, basename, devname,) - f.write(s) + f.write(s) - f.close() + f.close() def waitForDevicesActivation(self, devices): waited_devs_props = {} -- 1.6.0.6

3 3

Repo layout change in master branch
by Martin Sivak 31 May '10

31 May '10

Hi all, As both David and Chris agreed to my changes to repo layout, I pushed the changesets to master branch. Building should still work as expected and I also included some changes to the test/ directory so we can start working on internal unit tests here in Brno. The only script which may have problems now is the upd-updates, but we are going to fix it soon, together with the double imports bug.. To get a clean working directory after pulling, use git clean -d --force. It will delete all now non-used directories and most of the leftover files. -- Martin Sivák msivak(a)redhat.com Red Hat Czech Anaconda team / Brno, CZ

1 0

[rhel6-branch] Add the .sshd.hmac file to initrd (#592186)
by Martin Gracik 31 May '10

31 May '10

The sshd binary is in initrd and appears in the /sbin directory when installer is running. That's why we also need the .sshd.hmac file in initrd because otherwise fipscheck won't find it. --- scripts/mk-images | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 2ae76b7..233c133 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -496,6 +496,7 @@ EOF instbin $IMGPATH /sbin/nologin $MBD_DIR /sbin/nologin instbin $IMGPATH /bin/login $MBD_DIR /sbin/login instbin $IMGPATH /usr/sbin/sshd $MBD_DIR /sbin/sshd + cp -a $IMGPATH/usr/sbin/.sshd.hmac $MBD_DIR/sbin/ instbin $IMGPATH /usr/bin/ssh-keygen $MBD_DIR /sbin/ssh-keygen } -- 1.6.6.1

2 1

Two for master, one for rhel6-branch
by David Lehman 29 May '10

29 May '10

Patch 1 is for both rhel6-branch and master. Patch 2 is just for master.

2 4

[PATCH] Make sure the product.img directory is mounted before copying (#587696).
by Chris Lumens 28 May '10

28 May '10

copyUpdatesImg and copyProductImg require that their argument be mounted and accessible before the copy is performed. --- loader/nfsinstall.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index 660106a..09a2109 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -324,15 +324,22 @@ char * mountNfsImage(struct installMethod * method, free(buf); - checked_asprintf(&buf, "%s/updates.img", fullPath); - logMessage(INFO, "Looking for updates in %s", buf); - copyUpdatesImg(buf); - free(buf); - - checked_asprintf(&buf, "%s/product.img", fullPath); - logMessage(INFO, "Looking for product in %s", buf); - copyProductImg(buf); - free(buf); + if (!doPwMount(fullPath, "/tmp/disk-image", "nfs", mountOpts, NULL)) { + logMessage(INFO, "Looking for updates in %s/updates.img", fullPath); + checked_asprintf(&buf, "/tmp/disk-image/updates.img"); + copyUpdatesImg(buf); + free(buf); + + logMessage(INFO, "Looking for product in %s/product.img", fullPath); + checked_asprintf(&buf, "/tmp/disk-image/product.img"); + copyProductImg(buf); + free(buf); + + umount("/tmp/disk-image"); + unlink("/tmp/disk-image"); + } else { + logMessage(INFO, "Couldn't mount %s for updates and product", fullPath); + } stage = NFS_STAGE_DONE; break; -- 1.7.0.1

2 1

[PATCH master rhel6-branch] Add more sanity checks to the mountpoint (#592185)
by Brian C. Lane 28 May '10

28 May '10

Resolves: rhbz#592185 --- partIntfHelpers.py | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/partIntfHelpers.py b/partIntfHelpers.py index c2b77f8..9fb2f72 100644 --- a/partIntfHelpers.py +++ b/partIntfHelpers.py @@ -83,10 +83,25 @@ def sanityCheckMountPoint(mntpt): """Sanity check that the mountpoint is valid. mntpt is the mountpoint being used. + + The Rules + Start with one / + Don't end with / + No spaces + No /../ + No /./ + No // + Don't end with /.. + Don't end with /. """ if not mntpt.startswith("/") or \ (len(mntpt) > 1 and mntpt.endswith("/")) or \ - " " in mntpt: + " " in mntpt or \ + "/../" in mntpt or \ + "/./" in mntpt or \ + "//" in mntpt or \ + mntpt.endswith("/..") or \ + mntpt.endswith("/.") : return _("The mount point %s is invalid. Mount points must start " "with '/' and cannot end with '/', and must contain " "printable characters and no spaces.") % mntpt -- 1.6.6.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel May 2010