Anaconda-devel July 2009

anaconda-devel@lists.fedoraproject.org

29 participants
100 discussions

[PATCH 1/3] Fix lvm on top of dmraid
by Hans de Goede 15 Jul '09

15 Jul '09

The lvm rules were failing to identify PV's on mdraid because blkid/vol_id has not been run on md raidsets by previous rules. --- modules.d/90lvm/64-lvm-vol_id.rules | 1 + modules.d/90lvm/64-lvm.rules | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules.d/90lvm/64-lvm-vol_id.rules b/modules.d/90lvm/64-lvm-vol_id.rules index d3a07c1..f5f3a6f 100644 --- a/modules.d/90lvm/64-lvm-vol_id.rules +++ b/modules.d/90lvm/64-lvm-vol_id.rules @@ -8,6 +8,7 @@ SUBSYSTEM!="block", GOTO="lvm_end" ACTION!="add|change", GOTO="lvm_end" KERNEL=="dm-*", IMPORT{program}="vol_id --export $tempnode" +KERNEL=="md*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" ENV{ID_FS_TYPE}=="LVM2_member", \ TEST!="/tmp/.lvm_scan-%k", \ diff --git a/modules.d/90lvm/64-lvm.rules b/modules.d/90lvm/64-lvm.rules index 3403020..a1c2d1f 100644 --- a/modules.d/90lvm/64-lvm.rules +++ b/modules.d/90lvm/64-lvm.rules @@ -8,6 +8,7 @@ SUBSYSTEM!="block", GOTO="lvm_end" ACTION!="add|change", GOTO="lvm_end" KERNEL=="dm-*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" +KERNEL=="md*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" ENV{ID_FS_TYPE}=="LVM2_member", \ TEST!="/tmp/.lvm_scan-%k", \ -- 1.6.2.2

2 4

[PATCH] Run firstaidkit-qs script instead of the shell (shows rescue menu) (#508512)
by Martin Sivak 14 Jul '09

14 Jul '09

--- rescue.py | 25 ++++++++++++++++++++++++- scripts/upd-instroot | 4 +++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/rescue.py b/rescue.py index 665c56c..ba8455c 100644 --- a/rescue.py +++ b/rescue.py @@ -34,6 +34,7 @@ import iutil import shutil import time import network +import subprocess import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -128,6 +129,22 @@ def makeMtab(instPath, fsset): finally: f.close() +def makeFStab(instPath = ""): + if os.access("/etc/mtab", os.R_OK): + f = open("/etc/mtab" %(instPath,), "r") + buf = f.read() + f.close() + else: + buf = "" + + try: + f = open(instPath + "/etc/fstab", "w+") + if buf: + f.write(buf) + f.close() + except IOError, e: + log.info("failed to write /etc/fstab: %s" % e) + # make sure they have a resolv.conf in the chroot def makeResolvConf(instPath): if not os.access("/etc/resolv.conf", os.R_OK): @@ -183,7 +200,10 @@ def runShell(screen = None, msg=""): "system will reboot.")) print - if os.path.exists("/bin/bash"): + if os.path.exists("/usr/bin/firstaidkit-qs") and os.path.exists("/usr/bin/dialog"): + proc = subprocess.Popen(["/bin/firstaidkit-qs"]) + proc.wait() + elif os.path.exists("/bin/bash"): iutil.execConsole() else: print(_("Unable to find /bin/sh to execute! Not starting shell")) @@ -436,6 +456,9 @@ def runRescue(anaconda, instClass): log.error("error making a resolv.conf: %s" %(e,)) msgStr = _("Your system is mounted under the %s directory.") % (anaconda.rootPath,) + #create /etc/fstab in ramdisk, so it is easier to work with RO mounted filesystems + makeFStab() + # run %post if we've mounted everything if anaconda.isKickstart: from kickstart import runPostScripts diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 8a6ddca..31e5d89 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -235,7 +235,7 @@ PACKAGESRESCUE="bzip2 bzip2-libs dump libidn modutils mtools mt-st mtr net-tools open smartmontools openssh openssh-clients pciutils rsh traceroute tar rsync device-mapper device-mapper-libs dmraid ntfsprogs samba-client - firstaidkit-plugin-all" + firstaidkit firstaidkit-plugin-all dialog" if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then PACKAGESRESCUE="$PACKAGESRESCUE gpart grub" @@ -815,6 +815,8 @@ usr/sbin/smartctl usr/sbin/traceroute usr/$LIBDIR/firstaidkit/plugins/ usr/lib/python?.?/site-packages/pyfirstaidkit/ +usr/bin/dialog +usr/bin/firstaidkit-qs EOF if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then -- 1.5.4.3

3 5

breaking exn handling out of rhpl & anaconda
by Chris Lumens 13 Jul '09

13 Jul '09

I've spent the last few days trying to break the exception handling out of both rhpl and anaconda, combining them into their own project. The benefits for this are obvious: helping to get rid of rhpl, and letting tons of other programs make use of save-to-bugzilla. Anyway, my current work in progress is here: http://clumens.fedorapeople.org/exn/ Making this generic enough is a little annoying but I think I've managed it. The UI is probably the most complicated part. My reasoning for doing it like you see is so we can still support text and graphical interfaces, and so that anaconda can provide its own wacky UI classes that override what I've done. That's why the abstract interfaces look awful familiar. test.py is obviously not a part of this module, but it does show how to use the thing from a programmer's point of view. This is likely to get a little more complicated when I work on bugzilla support but that's just the nature of working with bugzilla. Things still left to do: - test save to bugzilla - it should "compile", but probably doesn't do anything - work up a patch for anaconda, rhpl, firstboot, system-config-*, etc. - do all the typical project stuff (translations, spec file, etc.) - add wait dialogs as well - there's a bug about this somewhere - write docs describing how to make this easier to use - make sure everything's robust - your pet requirement here Any questions? - Chris

1 0

ADP Anaconda Patches, 7/9/2009 Edition
by Alford, Seth 13 Jul '09

13 Jul '09

The ADP Anaconda Patches, 7/9/2009 Edition $Id: README /main/10 2009/07/10 00:12:59 alfords Exp $ Copyright (c) 2001-2009 Automatic Data Processing Inc. NOTICE: This is a README which describes a series of anaconda patches which ADP is redistributing. We are publishing this software to fulfill the requirements of the GPL. This software is offered with NO WARRANTY and NO SUPPORT of any kind. If you are reading this and you are not an ADP employee, see subsection 1.2, "Licensing, Intended Audience, and a Note for Non-ADP Readers", below. CHANGELOG: 6/30/2009 Completely rewrote this README from a previous version. I deleted a lot of extraneous information, including syslinux changes, and some suggestions for how to debug anaconda. The syslinux changes are described in a separate posting I made to the syslinux mailing list. Other features or debugging techniques are described in documentation from RedHat. I also included information specific to individual patches with those specific patches, rather than having all that documentation here. That makes this README much shorter. Since it's shorter, people might actually read it. Since this is a complete rewrite, I restarted the CHANGELOG. TABLE OF CONTENTS: 1. INTRODUCTION 1.1 What is this? 1.2 Licensing, Intended Audience, and a Note for Non-ADP Readers 1.3 What ADP Needed versus Anaconda's Capabilities 2. HELPFUL RESOURCES 2.1 What to Read 2.2 Preparing for Anaconda Development 1. INTRODUCTION 1.1 What is this? Some years ago, ADP modified the anaconda which came with RedHat 7.0, and, later, RedHat 8.0. To comply with the GPL, we redistributed changes that we made to those versions of anaconda. To explain what we did, we wrote a large README which we posted with the modifications. ADP has now modified the anaconda which came with CentOS 5.3. The newer version of anaconda is more powerful than the older versions. The newer anaconda is much closer to what ADP needs. But, we still had to modify anaconda itself to get it to do what we wanted. We're now sharing those modifications. That's so that: 1. We fulfill the requirements of the GPL 2. Our modifications might be picked up and included in the base code. That way we don't have to make the same modifications again, later. Also, rather than produce a single large README, I split up the information between this smaller README and each patch. 1.2 Licensing, Intended Audience, and a Note for Non-ADP Readers An intended audience for this README are developers at ADP, who might have to further modify anaconda in the future. Note that I said "might". ADP makes no promise that ADP will make any further modifications to this software. As I said above, this software is offered with NO WARRANTY and NO SUPPORT of any kind. A secondary intended audience for this README are people who are not at ADP. We could have written two versions of this README file: one for ADP readers, and one for non-ADP readers. But, we did not want to have to maintain internal and external versions of this README and/or the accompanying software. Hence these patches may contain some references to non-GPL'd software, or ADP's build environment, which are "independent and separate works" under section 2 of the GPL, and therefore not covered by the GPL. THEREFORE, WE ARE NOT PUBLISHING ANYTHING ELSE UNDER THE GPL, INCLUDING BUT NOT LIMITED TO: * files which do not appear in the patches, * ADP's proprietary backup and restore software, * our build environment, * other ADP proprietary software referenced or included by this README, including but not limited to DSDA. That means: * this README may contain some references which won't make sense to non-ADP readers. These include, but are not limited to, our build environment, and build process. We don't provide explanation for these references, either. * other parts of anaconda, as modified, may also be non-functional. * some readers may find themselves saying, "yes, I know about that already." Other readers may say, "I don't understand that reference, it must be an ADP-ism." 1.3 What ADP Needed versus Anaconda's Capabilities For ADP's purposes, anaconda, even with a customized kickstart file, lacked several features, including: * simplified messages for the user * completely automatic partitioning on a variety of disk configurations, and support for some specific-to-ADP disk partitioning requirements * support for tape restore * --userinput flag to pre and post install scripts * -s flag passed to pre and post install scripts when running on a serial console * support for a restore install type 2. HELPFUL RESOURCES 2.1 What to Read Here is an incomplete list of resources that I think will help you in learning how to modify anaconda and kickstart: * Beazley's _Python Essential Reference_. Remember, anaconda is written in Python. Check which version of Python comes with your version of anaconda. Make sure that your version of Beazley addresses a matching version of Python. Otherwise, you may find yourself trying to take advantage of a new Python feature that doesn't exist in your environment. Or, you might find you are puzzled by a Python feature in one of the anaconda sources that Beazley does not explain. * The RedHat Enterprise Linux Installation Guide, available at http://www.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/5/html/Installati… * The kickstart-list and anaconda-dev mailing lists. You can join at www.redhat.com. The list archives are located there, too. * Most importantly, read Chris Lumens' pykickstart documentation. You should be able to get this by installing the pykickstart rpm then looking in /usr/share/doc/pykickstart*/programmers-guide . 2.2 Preparing for Anaconda Development Install at least the python, python-devel, pykickstart, anaconda, and anaconda-runtime packages and their dependencies on your Linux development system. This message and any attachments are intended only for the use of the addressee and may contain information that is privileged and confidential. If the reader of the message is not the intended recipient or an authorized representative of the intended recipient, you are hereby notified that any dissemination of this communication is strictly prohibited. If you have received this communication in error, please notify us immediately by e-mail and delete the message and any attachments from your system.

2 15

[PATCH][RHEL5.4] update support for ext4 in anaconda
by Jeffrey Bastian 13 Jul '09

13 Jul '09

ext4 support is being updated in RHEL 5.4 from an early development release to the stable code from Fedora 10. See https://bugzilla.redhat.com/show_bug.cgi?id=485315 As a result, the kernel module has changed names from ext4dev.ko to just ext4.ko, and anaconda no longer lists ext4/ext4dev as an available filesystem (if the 'ext4' command line option is used). See https://bugzilla.redhat.com/show_bug.cgi?id=510634 The attached patch updates anaconda to use the new module name. More work is probably needed to drop ext4dev. Jeff

2 1

[PATCH] Support for bootloader on md raid devices.
by Radek Vykydal 13 Jul '09

13 Jul '09

In f10, for /boot on md raid 1 we used to have only option to install bootloader on partition but in fact, we installed on MBR. In f11 we added option to instal to MBR in UI, and we are still installing on MBR for both options. In rhel 5 we are always installing bootloader on MBR too. Also grub-install /dev/md0 installs on MBR, so maybe this is not something we want to do at all, but in that case, we should probably remove the option to install bootloader on /dev/md0 raid device from UI. Two issues: * The patch assumes that 'mdX' bootloader target is md raid 1 device with members being partitions. Intel bios raid using mdraid (or whole-disk md devices in general?) need to be handled/considered. * If we allow (start to do) installing on md raid partitions, upgrade should be patched to count with this possibility. A little problem is that up to f11 boot=/dev/md0 we write into /etc/sysconfig/grub or grub.conf means that bootloader was installed on mbr, and after patching it would mean that it is on raid device (partitions). --- booty/x86.py | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/booty/x86.py b/booty/x86.py index 3890e69..8527442 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -112,14 +112,13 @@ class x86BootloaderInfo(efiBootloaderInfo): for bootDev in bootDevs: cmds = [] - gtPart = self.getMatchingPart(bootDev, grubTarget) - gtDisk = self.grubbyPartitionName(getDiskPart(gtPart, self.storage)[0]) + gtDisk = self.grubbyPartitionName(getDiskPart(bootDev, self.storage)[0]) bPart = self.grubbyPartitionName(bootDev) cmd = "root %s\n" % (bPart,) stage1Target = gtDisk if target == "partition": - stage1Target = self.grubbyPartitionName(gtPart) + stage1Target = bPart cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \ (args, grubPath, stage1Target, grubPath, bPart, grubPath) @@ -155,7 +154,8 @@ class x86BootloaderInfo(efiBootloaderInfo): if grubTarget[-2] == 'p' or \ (grubTarget[-2].isdigit() and grubTarget[-3] == 'p'): target = "partition" - elif grubTarget[-1].isdigit() and not path.startswith('md'): + # NOTE: this includes also mdX grub targets + elif grubTarget[-1].isdigit(): target = "partition" f = open(cf, "w+") @@ -362,15 +362,6 @@ class x86BootloaderInfo(efiBootloaderInfo): return 0 - def getMatchingPart(self, bootDev, target): - bootName, bootPartNum = getDiskPart(bootDev, self.storage) - devices = self.getPhysicalDevices(target) - for device in devices: - name, partNum = getDiskPart(device, self.storage) - if name == bootName: - return device - return devices[0] - def grubbyDiskName(self, name): return "hd%d" % self.drivelist.index(name) -- 1.6.0.6

2 3

[PATCH] Use tail process to ensure line buffered output to screen and log file at the same moment... (#506664)
by Martin Sivak 13 Jul '09

13 Jul '09

--- iutil.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 68 insertions(+), 16 deletions(-) diff --git a/iutil.py b/iutil.py index ba1d0b4..0a4adfa 100644 --- a/iutil.py +++ b/iutil.py @@ -33,6 +33,7 @@ from flags import flags from constants import * from rhpl.translate import _ import re +import select import logging log = logging.getLogger("anaconda") @@ -81,37 +82,88 @@ def execWithRedirect(command, argv, stdin = None, stdout = None, runningLog = open("/tmp/program.log", "a") runningLog.write("Running... %s\n" % ([command] + argv,)) + + #prepare os pipes for feeding tee proceses + pstdout, pstdin = os.pipe() + perrout, perrin = os.pipe() env = os.environ.copy() env.update({"LC_ALL": "C"}) + #prepare "empty" tee proceses so we can properly detect errors + proc_std = None + proc_err = None + try: - proc = subprocess.Popen([command] + argv, stdin=stdin, - stdout=subprocess.PIPE, + #create output pipes with logging (it needs to be different process to avoid deadlock and EOF detection..) + proc_std = subprocess.Popen(["tee", "-a", "/tmp/program.log"], stdin=pstdout, + stdout=stdout, stderr=subprocess.PIPE, + cwd=root, + env=env, bufsize = 1) + + proc_err = subprocess.Popen(["tee", "-a", "/tmp/program.log"], stdin=perrout, + stdout=stderr, + stderr=subprocess.PIPE, + cwd=root, + env=env, bufsize = 1) + + #run the command + proc = subprocess.Popen([command] + argv, stdin=stdin, + stdout=pstdin, + stderr=perrin, preexec_fn=chroot, cwd=root, - env=env) + env=env, bufsize = 1) + + proc.wait() + + #close the output pipes + if proc_std: + proc_std.terminate() + proc_std.wait() + proc_std = None + + if proc_err: + proc_err.terminate() + proc_err.wait() + proc_err = None + + ret = proc.returncode - while True: - (outStr, errStr) = proc.communicate() - if outStr: - os.write(stdout, outStr) - runningLog.write(outStr) - if errStr: - os.write(stderr, errStr) - runningLog.write(errStr) - if proc.returncode is not None: - ret = proc.returncode - break except OSError as e: errstr = "Error running %s: %s" % (command, e.strerror) log.error(errstr) + + #free descriptors + os.close(pstdout) + os.close(perrout) + os.close(pstdin) + os.close(perrin) + + #close the output pipes + if proc_std: + proc_std.terminate() + proc_std.wait() + proc_std = None + + if proc_err: + proc_err.terminate() + proc_err.wait() + proc_err = None + runningLog.write(errstr) runningLog.close() raise RuntimeError, errstr runningLog.close() + + #free descriptors + os.close(pstdout) + os.close(perrout) + os.close(pstdin) + os.close(perrin) + return ret ## Run an external program and capture standard out. -- 1.5.4.3

1 1

[PATCH] rhel5 include graphical libs.
by Joel Granados Moreno 13 Jul '09

13 Jul '09

Hello List The libdrm is needed to make ATI Technologies Inc M24 work on rhel5. make sure we include the sofile in the image. Review appreciated. Regards. Joel Andres Granados Brno, Czech Republic, Red Hat.

2 2

[master] expand info in initialize disk dialog (#460697)
by David Cantrell 11 Jul '09

11 Jul '09

Originally filed for RHEL-5. I posted a patch earlier and Steffen Maier commented on it saying it would be useful to have more information for the drive in question, especially if you have a large number of the same type in the system. The dialog box could probably be improved, but I'm mostly just going for functionality with this patch. In addition to displaying the device model string and the size in megabytes (as originally requested in the BZ), I added a device details string if we can find it in /dev/disk/by-path on the system. Example output on my system: Error processing drive sda 305243MB (ATA ST3320620AS). Maybe it needs to be reinitialized. YOU WILL LOSE ALL DATA ON THIS DRIVE IN YOUR REINITIALIZE IT! Device details: pci-0000:00:1f.2-scsi-0:0:0:0 For DASD and zFCP, you'll get a slightly different clown barf string for the device details. I think the dialog wording could be improved, but since Peter and Andy are working on error string cleanups, I would like to leave that to them. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 3

[PATCH] Don't write removable devices to /etc/fstab (#505697).
by Chris Lumens 10 Jul '09

10 Jul '09

--- storage/__init__.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/storage/__init__.py b/storage/__init__.py index 03b9876..7996d00 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -1851,6 +1851,10 @@ class FSSet(object): if not device.format.mountable and device.format.type != "swap": continue + # Don't write removable devices, either. Let the desktop do it. + if device.removable: + continue + fstype = getattr(device.format, "mountType", device.format.type) if fstype == "swap": mountpoint = "swap" -- 1.6.1.3

4 4

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel July 2009