October 2009 - Anaconda-devel - Fedora mailing-lists

[PATCH] - change our default partitioning scheme
by Chris Lumens 30 Apr '10

30 Apr '10

Here's a patch series that ends up with creating a /home by default. The algorithm is basically: - VG < 50 GB: make /boot, swap, rest as / - VG >= 50 GB: make /boot, swap, / with a 50 GB max, rest as /home Let the arguing begin. - Chris

11 26

[master] Clean up partitioning and rework partition growing
by David Lehman 04 Nov '09

04 Nov '09

partitioning.py | 931 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 657 insertions(+), 274 deletions(-) Lots of cleanups to partitioning code in general. The functional changes are how we allocate growable partitions and the addition of per-disk partition alignment. Partition growing is completely reimplemented. A map of free space regions is collected prior to partition allocation. During partition allocation we choose which disk each growable partition will be allocated from, as well as which free space region on that disk. Partitions are grown as a group within each free space region. Growth rates are determined by the relative base sizes of the partitions within a free space region. All new partitions are aligned for the device from which they are allocated. For now, getDiskAlignment returns an alignment with offset 0 and grainSize of 1 sector, which is sort of a no-op alignment. Once pyparted exports functions/methods to determine the minimal alignment of devices we can replace this no-op alignment with the real deal.

4 26

[master] & [rhel6-branch] various fixes
by David Cantrell 03 Nov '09

03 Nov '09

These patches are intended for master and rhel6-branch. 1) In execWithCallback(), allow callers to disable the stdout printing. Useful when dasdfmt is run because without it all the of the progress information from dasdfmt scrolls by on the 3270 console and obscures other messages. 2) Stop writing the user-supplied hostname to the localhost line in /etc/hosts. What we do currently is breaking virt systems and other programs. 3) Copy over cio_ignore parameter on s390 systems to the /etc/zipl.conf file during post installation setup. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 12

[PATCH][master] Select drives in partition dialog, preserving settings. (#529931)
by David Lehman 01 Nov '09

01 Nov '09

--- iw/partition_dialog_gui.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index bc40faa..c9781e0 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -402,9 +402,9 @@ class PartitionEditor: lbl = createAlignedLabel(_("Allowable _Drives:")) maintable.attach(lbl, 0, 1, row, row + 1) + req_disk_names = [d.name for d in self.origrequest.req_disks] self.driveview = createAllowedDrivesList(self.storage.disks, - self.origrequest.req_disks, - selectDrives=False, + req_disk_names, disallowDrives=[self.anaconda.updateSrc]) lbl.set_mnemonic_widget(self.driveview) sw = gtk.ScrolledWindow() -- 1.6.2.5

2 1

Update the icon used for liveinst (529267)
by Jesse Keating 30 Oct '09

30 Oct '09

Just sending this in so that it gets reviewed. -- Jes

2 4

[PATCH] Regardless of where load_policy is, we still need it in the intird (#532016).
by Chris Lumens 30 Oct '09

30 Oct '09

--- scripts/mk-images | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 1ddbe7b..3d32d7d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -772,6 +772,7 @@ makeinitrd() { instbin $IMGPATH /usr/bin/grep $MBD_DIR /sbin/grep instbin $IMGPATH /usr/bin/kill $MBD_DIR /sbin/kill instbin $IMGPATH /usr/bin/ln $MBD_DIR /sbin/ln + instbin $IMGPATH /usr/sbin/load_policy $MBD_DIR /sbin/load_policy instbin $IMGPATH /usr/bin/mkdir $MBD_DIR /sbin/mkdir instbin $IMGPATH /usr/bin/readlink $MBD_DIR /sbin/readlink instbin $IMGPATH /usr/bin/rm $MBD_DIR /sbin/rm -- 1.6.5.1

2 1

[PATCH] [master] Fix logging of isys mount/umount into program.log.
by Radek Vykydal 30 Oct '09

30 Oct '09

--- isys/imount.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/isys/imount.c b/isys/imount.c index 30b6302..a62e223 100644 --- a/isys/imount.c +++ b/isys/imount.c @@ -119,7 +119,7 @@ int mountCommandWrapper(int mode, char *dev, char *where, char *fs, } programLogFD = open("/tmp/program.log", - O_APPEND|O_CREAT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); + O_APPEND|O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (pipe(pipefd)) return IMOUNT_ERR_ERRNO; -- 1.6.0.6

2 1

[PATCH parted 1/7] libparted: add ped_device_get_xxx_alignment() functions
by Hans de Goede 30 Oct '09

30 Oct '09

Add ped_device_get_minimum_alignment() and ped_device_get_optimum_alignment() functions to libparted. Note this is a resent of my previous patchset with a number of typos corrected: aligment -> alignment minimal_alignment -> minimum_aligment optimal_alignment -> optimum_aligment Sorry for the noise. --- include/parted/device.h | 8 ++++++++ include/parted/natmath.h | 1 + libparted/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/parted/device.h b/include/parted/device.h index 151305f..5095b18 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -92,6 +92,8 @@ struct _PedDevice { void* arch_specific; }; +#include <parted/natmath.h> + /** * List of functions implementing architecture-specific operations. */ @@ -112,6 +114,9 @@ struct _PedDeviceArchOps { PedSector (*check) (PedDevice* dev, void* buffer, PedSector start, PedSector count); void (*probe_all) (); + /* These functions are optional */ + PedAlignment *(*get_minimum_alignment)(const PedDevice *dev); + PedAlignment *(*get_optimum_alignment)(const PedDevice *dev); }; #include <parted/constraint.h> @@ -141,6 +146,9 @@ extern PedSector ped_device_check (PedDevice* dev, void* buffer, PedSector start, PedSector count); extern PedConstraint* ped_device_get_constraint (PedDevice* dev); +extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev); +extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev); + /* private stuff ;-) */ extern void _ped_device_probe (const char* path); diff --git a/include/parted/natmath.h b/include/parted/natmath.h index cd7679d..eaa84d1 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -31,6 +31,7 @@ typedef struct _PedAlignment PedAlignment; #include <parted/disk.h> #include <parted/device.h> +#include <parted/geom.h> #define PED_MIN(a, b) ( ((a)<(b)) ? (a) : (b) ) #define PED_MAX(a, b) ( ((a)>(b)) ? (a) : (b) ) diff --git a/libparted/device.c b/libparted/device.c index 294fec4..4fec1a9 100644 --- a/libparted/device.c +++ b/libparted/device.c @@ -444,5 +444,48 @@ ped_device_get_constraint (PedDevice* dev) return c; } +/** + * Get an alignment that represents minimum hardware requirements on alignment. + * When for example using media that has a physical sector size that is a + * multiple of the logical sector size, it is desirable to have disk accesses + * (and thus partitions) properly aligned. Having partitions not aligned to + * the minimum hardware requirements may lead to a performance penalty. + * + * The returned alignment describes the alignment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * alignment decrease the returned alignment's offset by 1. + * + * \return the minimum alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_minimum_alignment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_minimum_alignment) + return ped_architecture->dev_ops->get_minimum_alignment(dev); + + return NULL; /* ped_alignment_none */ +} + +/** + * Get an alignment that represents the hardware requirements for optimal + * performance. + * + * The returned alignment describes the alignment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * alignment decrease the returned alignment's offset by 1. + * + * \return the optimal alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_optimum_alignment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_optimum_alignment) + return ped_architecture->dev_ops->get_optimum_alignment(dev); + + return NULL; /* ped_alignment_none */ +} + /** @} */ -- 1.6.5.1

1 6

[PATCH parted 1/2] linux: fix crash (un-initialized pointer) when operating on regular files
by Hans de Goede 30 Oct '09

30 Oct '09

* libparted/arch/linux.c (linux_new): When compiled with blkid support initialize arch_specific->probe and arch_specific->topology to NULL, as get_blkid_topology(), which sets them, does not get called for regular files. * libparted/arch/linux.c (get_blkid_topology): No need to set arch_specific->topology to NULL, as this now gets done by linux_new(). --- libparted/arch/linux.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index 3069c59..7908c46 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -598,8 +598,6 @@ _have_kern26 () static void get_blkid_topology (LinuxSpecific *arch_specific) { - arch_specific->topology = NULL; - arch_specific->probe = blkid_new_probe (); if (!arch_specific->probe) return; @@ -1249,6 +1247,10 @@ linux_new (const char* path) goto error_free_path; arch_specific = LINUX_SPECIFIC (dev); arch_specific->dmtype = NULL; +#if USE_BLKID + arch_specific->probe = NULL; + arch_specific->topology = NULL; +#endif dev->open_count = 0; dev->read_only = 0; -- 1.6.5.1

1 1

[PATCH parted 1/7] libparted: add ped_device_get_xxx_alignment() functions
by Hans de Goede 30 Oct '09

30 Oct '09

Add ped_device_get_minimum_alignment() and ped_device_get_optimum_alignment() functions to libparted. Note this is a resent of my previous patchset with a number of typos corrected: aligment -> alignment minimal_alignment -> minimum_aligment optimal_alignment -> optimum_aligment Sorry for the noise. --- include/parted/device.h | 8 ++++++++ include/parted/natmath.h | 1 + libparted/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/parted/device.h b/include/parted/device.h index 151305f..5095b18 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -92,6 +92,8 @@ struct _PedDevice { void* arch_specific; }; +#include <parted/natmath.h> + /** * List of functions implementing architecture-specific operations. */ @@ -112,6 +114,9 @@ struct _PedDeviceArchOps { PedSector (*check) (PedDevice* dev, void* buffer, PedSector start, PedSector count); void (*probe_all) (); + /* These functions are optional */ + PedAlignment *(*get_minimum_alignment)(const PedDevice *dev); + PedAlignment *(*get_optimum_alignment)(const PedDevice *dev); }; #include <parted/constraint.h> @@ -141,6 +146,9 @@ extern PedSector ped_device_check (PedDevice* dev, void* buffer, PedSector start, PedSector count); extern PedConstraint* ped_device_get_constraint (PedDevice* dev); +extern PedAlignment *ped_device_get_minimum_alignment(const PedDevice *dev); +extern PedAlignment *ped_device_get_optimum_alignment(const PedDevice *dev); + /* private stuff ;-) */ extern void _ped_device_probe (const char* path); diff --git a/include/parted/natmath.h b/include/parted/natmath.h index cd7679d..eaa84d1 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -31,6 +31,7 @@ typedef struct _PedAlignment PedAlignment; #include <parted/disk.h> #include <parted/device.h> +#include <parted/geom.h> #define PED_MIN(a, b) ( ((a)<(b)) ? (a) : (b) ) #define PED_MAX(a, b) ( ((a)>(b)) ? (a) : (b) ) diff --git a/libparted/device.c b/libparted/device.c index 294fec4..4fec1a9 100644 --- a/libparted/device.c +++ b/libparted/device.c @@ -444,5 +444,48 @@ ped_device_get_constraint (PedDevice* dev) return c; } +/** + * Get an alignment that represents minimum hardware requirements on alignment. + * When for example using media that has a physical sector size that is a + * multiple of the logical sector size, it is desirable to have disk accesses + * (and thus partitions) properly aligned. Having partitions not aligned to + * the minimum hardware requirements may lead to a performance penalty. + * + * The returned alignment describes the alignment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * alignment decrease the returned alignment's offset by 1. + * + * \return the minimum alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_minimum_alignment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_minimum_alignment) + return ped_architecture->dev_ops->get_minimum_alignment(dev); + + return NULL; /* ped_alignment_none */ +} + +/** + * Get an alignment that represents the hardware requirements for optimal + * performance. + * + * The returned alignment describes the alignment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * alignment decrease the returned alignment's offset by 1. + * + * \return the optimal alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_optimum_alignment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_optimum_alignment) + return ped_architecture->dev_ops->get_optimum_alignment(dev); + + return NULL; /* ped_alignment_none */ +} + /** @} */ -- 1.6.5.1

2 8

[f12-branch] & [master] fix "resize failed: 1"
by David Cantrell 29 Oct '09

29 Oct '09

Fixes an install test case that the Fedora QA people are doing and an F12 blocker. Comment on the patch is self-explanatory. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[f12, master] Use a "change" event instead of "add" to populate udev db
by David Lehman 29 Oct '09

29 Oct '09

For F12, these go in just as they are. For rawhide, I want to remove the attr_nomatch keyword argument from baseudev.udev_trigger and change the udev_trigger calls to instead specify a "change" event, effectively making master look like f12 after these patches.

3 6

[rhel6-branch] & [master] zerombr for dasdfmt
by David Cantrell 29 Oct '09

29 Oct '09

These patches use 'zerombr' during kickstart installs to force dasdfmt. If the user is doing an interactive kickstart install and zerombr is not present but needs to run, the question is presented just as in a non kickstart install. I've tested this on RHEL-6 Alpha 3 on s390 with kickstart and non kickstart installs. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 5

[PATCH] Only try to split proxy commands out if there's actually one specified.
by Peter Jones 29 Oct '09

29 Oct '09

If we try to regexec() on NULL it segfaults, so let's try not to do that... --- loader/urlinstall.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/loader/urlinstall.c b/loader/urlinstall.c index cdffab8..b03efce 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -429,8 +429,12 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, loaderData->method = METHOD_URL; } - splitProxyParam(proxy, &loaderData->proxyUser, &loaderData->proxyPassword, - &loaderData->proxy, &loaderData->proxyPort); + if (proxy) { + splitProxyParam(proxy, &loaderData->proxyUser, + &loaderData->proxyPassword, + &loaderData->proxy, + &loaderData->proxyPort); + } logMessage(INFO, "results of url ks, url %s", url); } -- 1.6.5.rc2

2 1

[rhel6-branch] & [master] better text.py detailedMessageWindow
by David Cantrell 29 Oct '09

29 Oct '09

Do what ButtonChoiceWindow does, but an additional row containing a padded/scrolling text box for longText. Not great, but better than using ListboxChoiceWindow. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[rhel6-branch] & [master] remove IUCV support
by David Cantrell 29 Oct '09

29 Oct '09

The kernel no longer has CONFIG_NETIUCV set, so remove support for these devices on s390. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 4

[PATCH] TypeError: '_ped.DiskType' object is not callable (#531730)
by Hans de Goede 29 Oct '09

29 Oct '09

platform.X86.__init__ did: self.diskLabelType = foo instead of self._diskLabelType = foo. So it was overriding the method from the base class. --- platform.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform.py b/platform.py index c0cc602..ca4bf9e 100644 --- a/platform.py +++ b/platform.py @@ -257,7 +257,7 @@ class Alpha(Platform): disk = req.disk.format.partedDisk # Check that we're a BSD disk label - if not disk.type == self.diskLabelType.name: + if not disk.type == self._diskLabelType.name: errors.append(_("%s must have a bsd disk label.") % req.disk.name) # The first free space should start at the beginning of the drive and @@ -400,7 +400,7 @@ class NewWorldPPC(PPC): disk = req.disk.format.partedDisk # Check that we're a Mac disk label - if not disk.type == self.diskLabelType.name: + if not disk.type == self._diskLabelType.name: errors.append(_("%s must have a mac disk label.") % req.disk.name) # All of the above just checks the appleboot partitions. We still @@ -460,9 +460,9 @@ class X86(EFI): EFI.__init__(self, anaconda) if self.isEfi: - self.diskLabelType = parted.diskType["gpt"] + self._diskLabelType = parted.diskType["gpt"] else: - self.diskLabelType = parted.diskType["msdos"] + self._diskLabelType = parted.diskType["msdos"] def bootDevice(self): if self.isEfi: -- 1.6.5.1

2 1

[PATCH] FIX: TypeError: '_ped.DiskType' object is not callable (#531730)
by Hans de Goede 29 Oct '09

29 Oct '09

platform.X86.__init__ did: self.diskLabelType = foo instead of self._diskLabelType = foo. So it was overriding the method from the base class. --- platform.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform.py b/platform.py index c0cc602..8187eb5 100644 --- a/platform.py +++ b/platform.py @@ -460,9 +460,9 @@ class X86(EFI): EFI.__init__(self, anaconda) if self.isEfi: - self.diskLabelType = parted.diskType["gpt"] + self._diskLabelType = parted.diskType["gpt"] else: - self.diskLabelType = parted.diskType["msdos"] + self._diskLabelType = parted.diskType["msdos"] def bootDevice(self): if self.isEfi: -- 1.6.5.1

2 2

[PATCH parted 1/7] libparted: add ped_device_get_xxx_aligment() functions
by Hans de Goede 29 Oct '09

29 Oct '09

Add ped_device_get_minimal_aligment() and ped_device_get_optimal_aligment() functions to libparted. --- include/parted/device.h | 8 ++++++++ include/parted/natmath.h | 1 + libparted/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/parted/device.h b/include/parted/device.h index 151305f..7c34081 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -92,6 +92,8 @@ struct _PedDevice { void* arch_specific; }; +#include <parted/natmath.h> + /** * List of functions implementing architecture-specific operations. */ @@ -112,6 +114,9 @@ struct _PedDeviceArchOps { PedSector (*check) (PedDevice* dev, void* buffer, PedSector start, PedSector count); void (*probe_all) (); + /* These functions are optional */ + PedAlignment *(*get_minimal_aligment)(const PedDevice *dev); + PedAlignment *(*get_optimal_aligment)(const PedDevice *dev); }; #include <parted/constraint.h> @@ -141,6 +146,9 @@ extern PedSector ped_device_check (PedDevice* dev, void* buffer, PedSector start, PedSector count); extern PedConstraint* ped_device_get_constraint (PedDevice* dev); +extern PedAlignment *ped_device_get_minimal_aligment(const PedDevice *dev); +extern PedAlignment *ped_device_get_optimal_aligment(const PedDevice *dev); + /* private stuff ;-) */ extern void _ped_device_probe (const char* path); diff --git a/include/parted/natmath.h b/include/parted/natmath.h index cd7679d..eaa84d1 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -31,6 +31,7 @@ typedef struct _PedAlignment PedAlignment; #include <parted/disk.h> #include <parted/device.h> +#include <parted/geom.h> #define PED_MIN(a, b) ( ((a)<(b)) ? (a) : (b) ) #define PED_MAX(a, b) ( ((a)>(b)) ? (a) : (b) ) diff --git a/libparted/device.c b/libparted/device.c index 294fec4..34b8eb5 100644 --- a/libparted/device.c +++ b/libparted/device.c @@ -444,5 +444,48 @@ ped_device_get_constraint (PedDevice* dev) return c; } +/** + * Get an alignment that represents minimum hardware requirements on aligment. + * When for example using media that has a physical sector size that is a + * multiple of the logical sector size, it is desirable to have disk accesses + * (and thus partitions) properly aligned. Having partitions not aligned to + * the minimum hardware requirements may lead to a performance penalty. + * + * The returned alignment describes the aligment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * aligment decrease the returned alignment's offset by 1. + * + * \return the minimum alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_minimal_aligment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_minimal_aligment) + return ped_architecture->dev_ops->get_minimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + +/** + * Get an alignment that represents the hardware requirements for optimal + * performance. + * + * The returned alignment describes the aligment for the start sector of the + * partition, the end sector should be aligned too, to get the end sector + * aligment decrease the returned alignment's offset by 1. + * + * \return the optimal alignment of partition start sectors, or NULL if this + * information is not available. + */ +PedAlignment* +ped_device_get_optimal_aligment(const PedDevice *dev) +{ + if (ped_architecture->dev_ops->get_optimal_aligment) + return ped_architecture->dev_ops->get_optimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + /** @} */ -- 1.6.5.1

1 6

[rhel6-branch] & [master] updated #528386 patches
by David Cantrell 29 Oct '09

29 Oct '09

Updated patches for #586386. What's here: 1) Converted /dev/dasdX to /dev/disk/by-path/ccw-STUFF for log entries and display in dialog boxes. 2) Use DetailedMessageWindow in iw mode to show the list of all DASDs that need formatting. 3) Fix detailedMessageWindow() in text.py so we get something similar to DetailedMessageWindow from gui.py. Use a ListboxChoiceWindow() and put the longText contents as the list items, broken on new lines. 4) Remove the self._progressBuffer stuff that was still left over. What's not here: 1) Support for kickstart or non-UI installs. Need to discuss this with clumens. 2) Parallel formatting. As stated in the original patch set email, I'm reserving that for a followup patch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 13

[PATCH] let stage2= honor NFS options by consolidating option parsing in loader
by Stijn Hoop 29 Oct '09

29 Oct '09

Hello, As requested by Radek Vykydal, please find attached my two updated patches for bug 529197 (stage2= does not honor NFS options). At the request of Chris Lumens I rewrote my earlier patch to consolidate the parsing code for NFS options. The first patch is against f12-branch d04d7f33, and is the one I tested, both with and without NFS options for both ks= and stage2= (well to be complete: I tested this against f12-branch from a few days ago, I only compile tested this rebased version). The second patch is against master 99dc7621, which I only compile tested since I do not know how to compose a bootable initrd.img with anaconda 13.xx. Happy to receive your commments, please CC me as I'm not subscribed, --Stijn

2 1

[PATCH parted 1/5] libparted: add ped_device_get_xxx_aligment() functions
by Hans de Goede 29 Oct '09

29 Oct '09

Add ped_device_get_minimal_aligment() and ped_device_get_optimal_aligment() functions to libparted. --- include/parted/device.h | 8 ++++++++ include/parted/natmath.h | 1 + libparted/device.c | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/parted/device.h b/include/parted/device.h index 151305f..31aec86 100644 --- a/include/parted/device.h +++ b/include/parted/device.h @@ -92,6 +92,8 @@ struct _PedDevice { void* arch_specific; }; +#include <parted/natmath.h> + /** * List of functions implementing architecture-specific operations. */ @@ -112,6 +114,9 @@ struct _PedDeviceArchOps { PedSector (*check) (PedDevice* dev, void* buffer, PedSector start, PedSector count); void (*probe_all) (); + /* These functions are optional */ + PedAlignment* (*get_minimal_aligment)(PedDevice* dev); + PedAlignment* (*get_optimal_aligment)(PedDevice* dev); }; #include <parted/constraint.h> @@ -141,6 +146,9 @@ extern PedSector ped_device_check (PedDevice* dev, void* buffer, PedSector start, PedSector count); extern PedConstraint* ped_device_get_constraint (PedDevice* dev); +extern PedAlignment* ped_device_get_minimal_aligment(PedDevice* dev); +extern PedAlignment* ped_device_get_optimal_aligment(PedDevice* dev); + /* private stuff ;-) */ extern void _ped_device_probe (const char* path); diff --git a/include/parted/natmath.h b/include/parted/natmath.h index cd7679d..eaa84d1 100644 --- a/include/parted/natmath.h +++ b/include/parted/natmath.h @@ -31,6 +31,7 @@ typedef struct _PedAlignment PedAlignment; #include <parted/disk.h> #include <parted/device.h> +#include <parted/geom.h> #define PED_MIN(a, b) ( ((a)<(b)) ? (a) : (b) ) #define PED_MAX(a, b) ( ((a)>(b)) ? (a) : (b) ) diff --git a/libparted/device.c b/libparted/device.c index 294fec4..6a41512 100644 --- a/libparted/device.c +++ b/libparted/device.c @@ -444,5 +444,23 @@ ped_device_get_constraint (PedDevice* dev) return c; } +PedAlignment* +ped_device_get_minimal_aligment(PedDevice* dev) +{ + if (ped_architecture->dev_ops->get_minimal_aligment) + return ped_architecture->dev_ops->get_minimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + +PedAlignment* +ped_device_get_optimal_aligment(PedDevice* dev) +{ + if (ped_architecture->dev_ops->get_optimal_aligment) + return ped_architecture->dev_ops->get_optimal_aligment(dev); + + return NULL; /* ped_alignment_none */ +} + /** @} */ -- 1.6.5.1

2 10

[PATCH] DASD disklabels do not allow sector exact partitioning (#527104)
by Hans de Goede 28 Oct '09

28 Oct '09

--- storage/partitioning.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index 1e2ee40..a5edd22 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -858,7 +858,11 @@ def allocatePartitions(disks, partitions): partition = parted.Partition(disk=disklabel.partedDisk, type=part_type, geometry=new_geom) - constraint = parted.Constraint(maxGeom=max_geom, minGeom=min_geom) + # DASD disklabels do not allow sector exact partitioning (#527104) + if _disk.type != 'dasd': + constraint = parted.Constraint(maxGeom=max_geom, minGeom=min_geom) + else: + constraint = disklabel.partedDevice.getConstraint() disklabel.partedDisk.addPartition(partition=partition, constraint=constraint) log.debug("created partition %s of %dMB and added it to %s" % -- 1.6.5.1

2 3

F11: re-installing on an LVM from Kickstart dies with 'name already in use'
by Martin Langhoff 28 Oct '09

28 Oct '09

I am seeing anaconda die with a kickstart that defines LVMs and partitions like this: clearpart --drives=sda bootloader --location=mbr part /boot --fstype ext3 --size=100 --ondisk=sda part / --fstype ext3 --size=2048 --maxsize=8192 --grow --ondisk=sda part pv.6 --size=1025 --grow --ondisk=sda volgroup VolGroup00 --pesize=32768 pv.6 logvol /library --fstype ext3 --name=LogVol00 --vgname=VolGroup00 --size=1 --grow logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=1024 --maxsize=2048 --grow The machine was installed with F9 (using this same ks), and now I want to test re-installing it. On F9 anaconda repartitions the hard drive, and installs the system anew. With F11, anaconda dies with (transcribed, partial backtrace as I cannot grab the logs): file /usr/lib/anaconda/kickstart.py - line 934 in parse peSize=vgd/pesize/1024.0) file /usr/lib/anaconda/storage/__init__.py line 616 in newVG raise ValueError("name already in use") Any ideas? cheers, m -- martin.langhoff(a)gmail.com martin(a)laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff

2 2

Spaces in the 'family'?
by Martin Langhoff 28 Oct '09

28 Oct '09

Playing with F11 anaconda, there seems to be a regression in the handling of the 'family' string. In my iso, I have: $ head -n2 .treeinfo [general] family = OLPC School Server $ cat .discinfo 1256302801.615137 "OLPC School Server 0.7" i386 1 When anaconda starts, it talks about "OLPC" ('Welcome to OLPC fo i386') instead of "OLPC School Server". More worryingly, when invoking the text-mode installer there are broken characters "<94><F1><B7>" across the top of the screen. Any hints as to how to diagnose this further? cheers, m -- martin.langhoff(a)gmail.com martin(a)laptop.org -- School Server Architect - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff

1 0

[PATCH] Add sshd support for non-s390 platforms.
by Peter Jones 28 Oct '09

28 Oct '09

This leaves the sshd support on the s390 intact and functional (testing needed), and at the same time add the ability to ssh in and get a terminal on non-s390 platforms. --- anaconda | 26 ++++++++++++++++++ flags.py | 12 +++++--- loader/linuxrc.s390 | 2 +- scripts/mk-images | 72 ++++++++++++++++++++++++++++--------------------- scripts/upd-instroot | 24 +++++++++------- 5 files changed, 89 insertions(+), 47 deletions(-) diff --git a/anaconda b/anaconda index d1d2ba2..b774736 100755 --- a/anaconda +++ b/anaconda @@ -396,6 +396,30 @@ def setupGraphicalLinks(): except: pass +def createSshKey(algorithm, keyfile): + path = '/etc/ssh/%s' % (keyfile,) + argv = ['-q','-t',algorithm,'-f',path,'-C','','-N',''] + iutil.execWithRedirect('ssh-keygen', argv, searchPath=1) + +def startSsh(): + if not flags.sshd: + return + if iutil.isS390(): + return + + childpid = os.fork() + if not childpid: + ssh_keys = { + 'rsa1':'ssh_host_key', + 'rsa':'ssh_host_rsa_key', + 'dsa':'ssh_host_dsa_key', + } + for (algorithm, keyfile) in ssh_keys.items(): + createSshKey(algorithm, keyfile) + args = ["/sbin/sshd", "-f", "/etc/ssh/sshd_config.anaconda"] + os.execv("/sbin/sshd", args) + sys.exit(1) + class Anaconda: def __init__(self): self.intf = None @@ -573,6 +597,8 @@ if __name__ == "__main__": warnings.showwarning = AnacondaShowWarning + startSsh() + setupTranslations() # reset python's default SIGINT handler diff --git a/flags.py b/flags.py index ce77621..93472e3 100644 --- a/flags.py +++ b/flags.py @@ -86,17 +86,19 @@ class Flags: self.__dict__['flags']['cmdline'] = self.createCmdlineDict() self.__dict__['flags']['useIPv4'] = True self.__dict__['flags']['useIPv6'] = True + self.__dict__['flags']['sshd'] = 1 # for non-physical consoles like some ppc and sgi altix, # we need to preserve the console device and not try to # do things like bogl on them. this preserves what that # device is self.__dict__['flags']['virtpconsole'] = None - if self.__dict__['flags']['cmdline'].has_key("selinux"): - if self.__dict__['flags']['cmdline']["selinux"]: - self.__dict__['flags']['selinux'] = 1 - else: - self.__dict__['flags']['selinux'] = 0 + for x in ['selinux','sshd']: + if self.__dict__['flags']['cmdline'].has_key(x): + if self.__dict__['flags']['cmdline'][x]: + self.__dict__['flags'][x] = 1 + else: + self.__dict__['flags'][x] = 0 if self.__dict__['flags']['cmdline'].has_key("debug"): self.__dict__['flags']['debug'] = self.__dict__['flags']['cmdline']['debug'] diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index 854fdfb..3939371 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -126,7 +126,7 @@ function startinetd() echo >> /etc/motd fi # testing - /sbin/sshd + /sbin/sshd -f /etc/sshd_config.anaconda if [ -z "$RUNKS" ]; then echo echo $"Connect now to $IPADDR and log in as user install to start the installation." diff --git a/scripts/mk-images b/scripts/mk-images index 44e4664..214da16 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -406,7 +406,9 @@ instbin() { } setupShellEnvironment() { - echo "tcp 6 TCP" > $MBD_DIR/etc/protocols + cp -f $IMGPATH/etc/protocols $MBD_DIR/etc/protocols + echo "sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin" \ + >> $MBD_DIR/etc/passwd # enable root shell logins echo "root::14438:0:99999:7:::" >> $MBD_DIR/etc/shadow @@ -439,26 +441,29 @@ EOF cp -f $IMGPATH/etc/security/{limits.conf,pam_env.conf} $MBD_DIR/etc/security/ - # key generation takes ages on s390, you really don't want this for every - # installation attempt. These are NOT the keys of the installed system! mkdir -m 0700 -p $MBD_DIR/etc/ssh - echo -n "Generating SSH1 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ - -C '' -N '' >&/dev/null - echo - echo -n "Generating SSH2 RSA host key: " - /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ - -C '' -N '' >&/dev/null - echo - echo -n "Generating SSH2 DSA host key: " - /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \ - -C '' -N '' >&/dev/null - echo - (cd $MBD_DIR/etc/ssh; \ - chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \ - chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; ) - - cat > $MBD_DIR/etc/ssh/sshd_config <<EOF + if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then + # key generation takes ages on s390, you really don't want this + # for every installation attempt. These are NOT the keys of the + # installed system! + echo -n "Generating SSH1 RSA host key: " + /usr/bin/ssh-keygen -q -t rsa1 -f $MBD_DIR/etc/ssh/ssh_host_key \ + -C '' -N '' >&/dev/null + echo + echo -n "Generating SSH2 RSA host key: " + /usr/bin/ssh-keygen -q -t rsa -f $MBD_DIR/etc/ssh/ssh_host_rsa_key \ + -C '' -N '' >&/dev/null + echo + echo -n "Generating SSH2 DSA host key: " + /usr/bin/ssh-keygen -q -t dsa -f $MBD_DIR/etc/ssh/ssh_host_dsa_key \ + -C '' -N '' >&/dev/null + echo + (cd $MBD_DIR/etc/ssh; \ + chmod 600 ssh_host_key ssh_host_rsa_key ssh_host_dsa_key; \ + chmod 644 ssh_host_key.pub ssh_host_rsa_key.pub ssh_host_dsa_key.pub; ) + fi + + cat > $MBD_DIR/etc/ssh/sshd_config.anaconda <<EOF Port 22 HostKey /etc/ssh/ssh_host_key HostKey /etc/ssh/ssh_host_rsa_key @@ -477,11 +482,13 @@ PasswordAuthentication yes PermitEmptyPasswords yes PermitUserEnvironment yes EOF - chmod 600 $MBD_DIR/etc/ssh/sshd_config + chmod 600 $MBD_DIR/etc/ssh/sshd_config.anaconda # copy in the binaries - instbin $IMGPATH /usr/bin/login $MBD_DIR /sbin/login + 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 + instbin $IMGPATH /usr/bin/ssh-keygen $MBD_DIR /sbin/ssh-keygen } @@ -573,13 +580,19 @@ makeinitrd() { mkdir -p $MBD_DIR/etc/rc.d/init.d mkdir -p $MBD_DIR/usr/sbin mkdir -p $MBD_DIR/var/run/wpa_supplicant + mkdir -m 111 -p $MBD_DIR/var/empty/sshd + mkdir -p $MBD_DIR/etc/{pam.d,security} + mkdir -p $MBD_DIR/$LIBDIR/security + + for x in $IMGPATH/$LIBDIR/security/* ; do + y=$(basename $x) + instbin $IMGPATH $LIBDIR/security/$y $MBD_DIR $LIBDIR/security/$y + done + + cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0 + cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/ if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then - mkdir -m 111 -p $MBD_DIR/var/empty/sshd - mkdir -p $MBD_DIR/etc/{pam.d,security} - mkdir -p $MBD_DIR/$LIBDIR/security - cp $IMGPATH/$LIBDIR/libpam_misc.so.0.* $MBD_DIR/$LIBDIR/libpam_misc.so.0 - cp $IMGPATH/$LIBDIR/libwrap*.so* $MBD_DIR/$LIBDIR/ ln -s /tmp $MBD_DIR/var/state/xkb instbin $IMGPATH /usr/bin/xauth $MBD_DIR /sbin/xauth local cmsfsbin cmd @@ -821,10 +834,7 @@ makeinitrd() { mkdir -p $MBD_DIR/var/lib ln -s ../../tmp $MBD_DIR/var/lib/xkb - # s390/s390x need sshd setup - if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then - setupShellEnvironment - fi + setupShellEnvironment cat > $MBD_DIR/.profile <<EOF PS1="[anaconda \u@\h \W]\\\\$ " diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 64017d1..a9b4058 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -181,7 +181,9 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts lohit-telugu-fonts lvm2 madan-fonts mdadm mesa-dri-drivers mkinitrd module-init-tools nash ncurses neon net-tools - newt newt-python nfs-utils nspr nss nss-softokn ntfs-3g openldap pam pango parted pciutils pcre + newt newt-python nfs-utils nspr nss nss-softokn ntfs-3g + openldap openssh openssh-server + pam pango parted pciutils pcre pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-nss python-pyblock python-sqlite python-urlgrabber python-volume_key pyxf86config readline redhat-artwork @@ -222,7 +224,7 @@ fi if [ $ARCH = s390 -o $ARCH = s390x ]; then PACKAGES="$PACKAGES bind-utils binutils coreutils findutils gzip initscripts iputils less libgcc login lsscsi modutils mount - net-tools openssh openssh-clients openssh-server pam portmap + net-tools openssh-clients pam portmap s390utils sed strace tar tcp_wrappers xorg-x11-libs xorg-x11-xauth" fi @@ -283,6 +285,8 @@ $LIBDIR/bdevid $LIBDIR/dbus-1 $LIBDIR/libnss_dns* $LIBDIR/libnss_files* +$LIBDIR/libwrap*.so* +$LIBDIR/security/pam_* bin/arch bin/basename bin/bash @@ -310,6 +314,7 @@ bin/hostname bin/ipcalc bin/kill bin/ln +bin/login bin/ls bin/mkdir bin/mknod @@ -353,6 +358,8 @@ etc/iscsid.conf etc/man.config etc/mke2fs.conf etc/nsswitch.conf +etc/pam.d/other +etc/pam.d/sshd etc/pango etc/passwd etc/pcmcia @@ -363,6 +370,8 @@ etc/prelink.conf etc/protocols etc/rc.d/init.d/functions etc/rpm/macros.prelink +etc/security/limits.conf +etc/security/pam_env.conf etc/selinux/targeted etc/services etc/shells @@ -430,6 +439,7 @@ sbin/mkreiserfs sbin/mkswap sbin/mount.nfs* sbin/mount.ntfs* +sbin/nologin sbin/ofpath sbin/parted sbin/pcmcia-socket-startup @@ -511,6 +521,7 @@ usr/bin/reduce-font usr/bin/setxkbmap usr/bin/sha1sum usr/bin/split +usr/bin/ssh-keygen usr/bin/syslinux usr/bin/tac usr/bin/tail @@ -567,6 +578,7 @@ usr/sbin/prelink usr/sbin/semodule usr/sbin/showpart usr/sbin/smartctl +usr/sbin/sshd usr/sbin/wpa_passphrase usr/sbin/wpa_supplicant usr/sbin/wrapper @@ -660,7 +672,6 @@ bin/dmesg bin/echo bin/find bin/gzip -bin/login bin/ls bin/mknod bin/ping @@ -670,12 +681,6 @@ bin/sort bin/tar bin/uname bin/vi -etc/pam.d/other -etc/pam.d/sshd -etc/security/limits.conf -etc/security/pam_env.conf -$LIBDIR/libwrap*.so* -$LIBDIR/security/pam_* lib/modules/ibm lib/security sbin/arp @@ -711,7 +716,6 @@ usr/bin/tr usr/bin/wc usr/bin/xauth usr/sbin/glibc_post_upgrade -usr/sbin/sshd usr/share/terminfo/a/ansi usr/share/terminfo/d/dumb usr/share/terminfo/k/kterm -- 1.6.5.rc2

3 4

[rhel6-branch] & [master] format unformatted DASDs (#528386)
by David Cantrell 28 Oct '09

28 Oct '09

These patches are intended for rhel6-branch and master. Bug #528386 is meant to improve the dasdfmt support we had from RHEL-5. I have divided the work in to two parts: 1) Functional. Detect unformatted DASDs, offer the user to option to format them or bail, perform the format and display progress. 2) Parallel formatting. IBM wants parallel formatting support for sites that have thousands of DASDs. I wanted to separate that work from these patches. I changed execWithPulseProgress() in iutil.py to execWithCallback(). The execWithPulseProgress() function is now implemented using execWithCallback. You can see how I use execWithCallback in the new dasd.py for displaying progress as captured from the dasdfmt command. I did introduce storage/dasd.py, which brings in a DASD class. The whole dasdfmt operation needs to occur before we initialize the storage code in anaconda. So like we have the iscsi and ZFCP classes and call startup() on those before initializing the storage code, that's what the DASD class is meant to do. It also leaves a convenient place for future DASD patches that need to deal with system-wide configuration files such as a possible /etc/dasd.conf or something like that. Lastly, compared to RHEL-5, the dasdfmt question is asked once. We used to present a Yes/Skip dialog for each unformatted DASD, which is simply unusable. I now build a list of all unformatted DASDs and tell the user how many were found and ask if you want them formatted. I did kick around the idea of presenting a checklist where users could uncheck DASDs they did not want anaconda to format and use, but really, we give users plenty of ways to skip or mask out devices with all of the linuxrc.s390 stuff, I felt doing it here was pointless. By the time anaconda runs, we should be able to use all of the DASDs we see. The next patch set will be for the parallel formatting with dasdfmt. Progress bar code in this set has been tested on both the iw and textw code. Works fine on both. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 15

Invitation to connect on LinkedIn
by Nitesh Jain 28 Oct '09

28 Oct '09

LinkedIn ------------ I'd like to add you to my professional network on LinkedIn. - Nitesh Confirm that you know Nitesh Jain https://www.linkedin.com/e/isd/825083332/q6T7LTWn/ Every day, millions of professionals like Nitesh Jain use LinkedIn to connect with colleagues, find experts, and explore opportunities. ------ (c) 2009, LinkedIn Corporation

1 0

[PATCH 1/2] Rename platform.diskType to platform.diskLabelType
by Hans de Goede 27 Oct '09

27 Oct '09

Rename platform.diskType to platform.diskLabelType, as diskType is confusing (we usally use it to refer to is the disk dasd, iscsi, zfcp, etc.). --- platform.py | 30 +++++++++++++++--------------- storage/formats/disklabel.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platform.py b/platform.py index d279c18..66e222c 100644 --- a/platform.py +++ b/platform.py @@ -39,7 +39,7 @@ class Platform(object): architecture quirks in one place to avoid lots of platform checks throughout anaconda.""" _bootFSTypes = ["ext3"] - _diskType = parted.diskType["msdos"] + _diskLabelType = parted.diskType["msdos"] _isEfi = iutil.isEfi() _minimumSector = 0 _packages = [] @@ -140,14 +140,14 @@ class Platform(object): return errors @property - def diskType(self): + def diskLabelType(self): """Return the disk label type as a parted.DiskType.""" - return self._diskType + return self._diskLabelType - @diskType.setter - def diskType(self, value): + @diskLabelType.setter + def diskLabelType(self, value): """Sets the disk label type.""" - self._diskType = value + self._diskLabelType = value @property def isEfi(self): @@ -198,7 +198,7 @@ class Platform(object): class EFI(Platform): _bootFSTypes = ["ext4", "ext3", "ext2"] - _diskType = parted.diskType["gpt"] + _diskLabelType = parted.diskType["gpt"] _minBootPartSize = 50 _maxBootPartSize = 256 @@ -249,7 +249,7 @@ class EFI(Platform): return 0 class Alpha(Platform): - _diskType = parted.diskType["bsd"] + _diskLabelType = parted.diskType["bsd"] def checkBootRequest(self, req): errors = Platform.checkBootRequest(self, req) @@ -260,7 +260,7 @@ class Alpha(Platform): disk = req.disk.format.partedDisk # Check that we're a BSD disk label - if not disk.type == self.diskType.name: + if not disk.type == self.diskLabelType.name: errors.append(_("%s must have a bsd disk label.") % req.disk.name) # The first free space should start at the beginning of the drive and @@ -361,7 +361,7 @@ class IPSeriesPPC(PPC): return 0 class NewWorldPPC(PPC): - _diskType = parted.diskType["mac"] + _diskLabelType = parted.diskType["mac"] _minBootPartSize = (800.00 / 1024.00) _maxBootPartSize = 1 @@ -403,7 +403,7 @@ class NewWorldPPC(PPC): disk = req.disk.format.partedDisk # Check that we're a Mac disk label - if not disk.type == self.diskType.name: + if not disk.type == self.diskLabelType.name: errors.append(_("%s must have a mac disk label.") % req.disk.name) # All of the above just checks the appleboot partitions. We still @@ -433,7 +433,7 @@ class NewWorldPPC(PPC): return 0 class PS3(PPC): - _diskType = parted.diskType["msdos"] + _diskLabelType = parted.diskType["msdos"] def __init__(self, anaconda): PPC.__init__(self, anaconda) @@ -445,7 +445,7 @@ class S390(Platform): Platform.__init__(self, anaconda) class Sparc(Platform): - _diskType = parted.diskType["sun"] + _diskLabelType = parted.diskType["sun"] @property def minimumSector(self, disk): @@ -463,9 +463,9 @@ class X86(EFI): EFI.__init__(self, anaconda) if self.isEfi: - self.diskType = parted.diskType["gpt"] + self.diskLabelType = parted.diskType["gpt"] else: - self.diskType = parted.diskType["msdos"] + self.diskLabelType = parted.diskType["msdos"] def bootDevice(self): if self.isEfi: diff --git a/storage/formats/disklabel.py b/storage/formats/disklabel.py index 9d07d31..a6e3352 100644 --- a/storage/formats/disklabel.py +++ b/storage/formats/disklabel.py @@ -92,7 +92,7 @@ class DiskLabel(DeviceFormat): def freshPartedDisk(self): """ Return a new, empty parted.Disk instance for this device. """ log_method_call(self, device=self.device) - labelType = platform.getPlatform(None).diskType + labelType = platform.getPlatform(None).diskLabelType return parted.freshDisk(device=self.partedDevice, ty=labelType) @property -- 1.6.5.1

2 2

Installations and mirror lists
by john maclean 27 Oct '09

27 Oct '09

Hey Chaps, I've often wondered why anaconda does not have a list of mirrors to install from, particularly during network-based installations. I've seen this work flawlessly with *ahem* another distro. Any particular reason why a small list of stable mirrors can't be included? Please do tell me if this is the wrong list to ask this question. If you are looking for a tester, lemme know ;-) -- John Maclean 07739 171 531 MSc (DIC) Timezone: GMT

2 3

[PATCH - rhel6-branch] Fix translations of timezones in the UI (#530014).
by Chris Lumens 27 Oct '09

27 Oct '09

This is only needed on rhel6-branch for now. F12 doesn't have the same problem, likely because there's different versions of s-c-date in the two trees. --- iw/timezone_gui.py | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 2e18f5a..165c531 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -113,7 +113,7 @@ class TimezoneWindow(InstallWindow): class AnacondaTZMap(TimezoneMap): def __init__(self, zonetab, default, map="", viewportWidth=480): TimezoneMap.__init__(self, zonetab, default, map=map, viewportWidth=viewportWidth) - self.columns = Enum("TRANSLATED", "TZ", "ENTRY") + self.columns = Enum("TZ", "ENTRY", "TZSORT") def status_bar_init(self): self.status = None @@ -135,12 +135,12 @@ class AnacondaTZMap(TimezoneMap): # York as the default. self.fallbackEntry = entry - iter = self.tzStore.insert_after(iter, [gettext.ldgettext("system-config-date", entry.tz), entry.tz, entry]) + iter = self.tzStore.insert_after(iter, [gettext.ldgettext("system-config-date", entry.tz), entry, entry.tz]) def timezone_list_init (self, default): self.hbox = gtk.HBox() - self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_PYOBJECT) + self.tzStore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, + gobject.TYPE_STRING) root = self.canvas.root() @@ -149,11 +149,11 @@ class AnacondaTZMap(TimezoneMap): # Add the ListStore to the sorted model after the list has been # populated, since otherwise we end up resorting on every addition. self.tzSorted = gtk.TreeModelSort(self.tzStore) - self.tzSorted.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.tzSorted.set_sort_column_id(self.columns.TZSORT, gtk.SORT_ASCENDING) self.tzCombo = gtk.ComboBox(model=self.tzSorted) cell = gtk.CellRendererText() self.tzCombo.pack_start(cell, True) - self.tzCombo.add_attribute(cell, 'text', 0) + self.tzCombo.add_attribute(cell, 'text', self.columns.TZ) self.tzCombo.connect("changed", self.selectionChanged) self.hbox.pack_start(self.tzCombo, False, False) @@ -163,7 +163,7 @@ class AnacondaTZMap(TimezoneMap): iter = widget.get_active_iter() if iter is None: return - entry = widget.get_model().get_value(iter, self.columns.ENTRY) + entry = widget.get_model().get_value(iter, 1) if entry: self.setCurrent (entry, skipList=1) if entry.long != None and entry.lat != None: @@ -172,10 +172,12 @@ class AnacondaTZMap(TimezoneMap): def updateTimezoneList(self): # Find the currently selected item in the combo box and update both # the combo and the comment label. - iter = self.tzCombo.get_model().get_iter_first() + model = self.tzCombo.get_model() + + iter = model.get_iter_first() while iter: - if self.tzCombo.get_model().get_value(iter, 1) == self.currentEntry.tz: + if model.get_value(iter, 2) == self.currentEntry.tz: self.tzCombo.set_active_iter(iter) break - iter = self.tzCombo.get_model().iter_next(iter) + iter = model.iter_next(iter) -- 1.6.5.rc2

3 3

grub (boot on mdraid) upgrade patches for master
by Radek Vykydal 27 Oct '09

27 Oct '09

Folow-up patches for commit 358a9a34f496fdd2b032edf12274a146b606d1a4 (only in master). When doing bootloader (grub) update during upgrade (especially with boot on mdraid device): - Install it by the same code path as when doing install (install was fixed beforementioned commit). - Remove code duplication that was done when detecting where grub had been installed. - Handle grub stage1 destination that had been written incorrectly in releases F11 and earlier (real destination for /dev/mdX were mbrs). I am not 100% sure about it - see patch [4/4] comment.

4 8

[PATCH] Provide a single checkbox for a minimal install (#523839).
by Chris Lumens 26 Oct '09

26 Oct '09

This patch allows the user to select "Minimal" from the task list and get just a bare minimum of packages. Note that the first task to have all its groups selected by default will be the only one selected in the task list. --- installclasses/fedora.py | 25 +++++++++++++++++++------ iw/task_gui.py | 24 ++++++++++++++++++------ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/installclasses/fedora.py b/installclasses/fedora.py index 009fa7a..bd3aa97 100644 --- a/installclasses/fedora.py +++ b/installclasses/fedora.py @@ -38,17 +38,30 @@ class InstallClass(BaseInstallClass): id = "fedora" name = N_("_Fedora") _description = N_("The default installation of %s includes a set of " - "software applicable for general internet usage. " - "What additional tasks would you like your system " - "to include support for?") + "software applicable for general internet usage. " + "You can optionally select a different software set.") _descriptionFields = (productName,) sortPriority = 10000 if productName.startswith("Red Hat Enterprise"): hidden = 1 - tasks = [(N_("Office and Productivity"), ["graphics", "office"]), - (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],), - (N_("Web Server"), ["web-server"])] + # (Translated Name, Default?, Group List) + tasks = [(N_("Graphical Desktop"), + ["admin-tools", "base", "base-x", "core", "editors", "fonts", + "games", "gnome-desktop", "graphical-internet", "graphics", + "hardware-support", "input-methods", "java", "office", + "printing", "sound-and-video", "text-internet"]), + (N_("Software Development"), + ["base", "base-x", "core", "development-libs", + "development-tools", "editors", "fonts", "gnome-desktop", + "gnome-software-development", "graphical-internet", "graphics", + "hardware-support", "input-methods", "java", "text-internet", + "x-software-development"]), + (N_("Web Server"), + ["admin-tools", "base", "base-x", "core", "editors", + "gnome-desktop", "graphical-internet", "hardware-support", + "java", "text-internet", "web-server"]), + (N_("Minimal"), ["core"])] bugFiler = BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi", "https://bugzilla.redhat.com/", diff --git a/iw/task_gui.py b/iw/task_gui.py index aeacd48..067e6cd 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -534,10 +534,13 @@ class TaskWindow(InstallWindow): s = self.xml.get_widget("repoList").get_model() s.append([dialog.repo.isEnabled(), dialog.repo.name, dialog.repo]) - def _taskToggled(self, button, row, store): - i = store.get_iter(int(row)) - val = store.get_value(i, 0) - store.set_value(i, 0, not val) + def _taskToggled(self, button, path, store): + # First, untoggle everything in the store. + for row in store: + row[0] = False + + # Then, enable the one that was clicked. + store[path][0] = True def _anyRepoEnabled(self): model = self.rs.get_model() @@ -580,18 +583,27 @@ class TaskWindow(InstallWindow): tl.set_model(store) cbr = gtk.CellRendererToggle() - col = gtk.TreeViewColumn('', cbr, active = 0) + cbr.set_radio(True) cbr.connect("toggled", self._taskToggled, store) + + col = gtk.TreeViewColumn('', cbr, active = 0) tl.append_column(col) col = gtk.TreeViewColumn('Text', gtk.CellRendererText(), text = 1) col.set_clickable(False) tl.append_column(col) + anyEnabled = False + for (txt, grps) in self.tasks: if not self.backend.groupListExists(grps): continue - store.append([self.backend.groupListDefault(grps), _(txt), grps]) + + enabled = self.backend.groupListDefault(grps) + store.append([not anyEnabled and enabled, _(txt), grps]) + + if enabled: + anyEnabled = True return tl -- 1.6.5.rc2

2 1

[rhel6-branch] fix for DASD and zFCP discovery
by David Cantrell 23 Oct '09

23 Oct '09

For rhel6-branch and master. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[PATCH] [master] Default to /images/install.img if no dir is given in stage2=hd: (#528809)
by Radek Vykydal 23 Oct '09

23 Oct '09

Another option to solve the bug would be to write append "/images/install.img" to "hd:LABEL="Fedora" in buildinstall. --- loader/hdinstall.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/loader/hdinstall.c b/loader/hdinstall.c index a4396df..6d8a50a 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -170,8 +170,11 @@ char * mountHardDrive(struct installMethod * method, /* if exist, duplicate */ if (kspartition) kspartition = strdup(kspartition); - if (ksdirectory) + if (ksdirectory) { ksdirectory = strdup(ksdirectory); + } else { + ksdirectory = strdup("/images/install.img"); + } if (!kspartition || !ksdirectory) { logMessage(ERROR, "missing partition or directory specification"); -- 1.6.0.6

1 0

[PATCH] Add an "sshpw" command for changing the passwords in anaconda's env.
by Peter Jones 22 Oct '09

22 Oct '09

This allows the user to change the passwords for anaconda's "ssh" environment. --- pykickstart/commands/__init__.py | 2 +- pykickstart/commands/sshpw.py | 104 ++++++++++++++++++++++++++++++++++++++ pykickstart/handlers/control.py | 2 + tests/commands/sshpw.py | 57 +++++++++++++++++++++ 4 files changed, 164 insertions(+), 1 deletions(-) create mode 100644 pykickstart/commands/sshpw.py create mode 100644 tests/commands/sshpw.py diff --git a/pykickstart/commands/__init__.py b/pykickstart/commands/__init__.py index 0952bf8..da48ff5 100644 --- a/pykickstart/commands/__init__.py +++ b/pykickstart/commands/__init__.py @@ -22,5 +22,5 @@ import deviceprobe, displaymode, dmraid, driverdisk, fcoe, firewall, firstboot import group, ignoredisk, interactive, iscsi, iscsiname, key, keyboard, lang import langsupport, lilocheck, logging, logvol, mediacheck, method, monitor import mouse, multipath, network, partition, raid, reboot, repo, rescue, rootpw -import selinux, services, skipx, timezone, updates, upgrade, user, vnc +import selinux, services, skipx, sshpw, timezone, updates, upgrade, user, vnc import volgroup, xconfig, zerombr, zfcp diff --git a/pykickstart/commands/sshpw.py b/pykickstart/commands/sshpw.py new file mode 100644 index 0000000..9d48e22 --- /dev/null +++ b/pykickstart/commands/sshpw.py @@ -0,0 +1,104 @@ +# +# Peter Jones <pjones(a)redhat.com> +# +# Copyright 2009 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +from pykickstart.base import * +from pykickstart.errors import * +from pykickstart.options import * + +import gettext +_ = lambda x: gettext.ldgettext("pykickstart", x) + +class F13_SshPwData(BaseData): + removedKeywords = BaseData.removedKeywords + removedAttrs = BaseData.removedAttrs + + def __init__(self, *args, **kwargs): + BaseData.__init__(self, *args, **kwargs) + self.username = kwargs.get("username", None) + self.isCrypted = kwargs.get("isCrypted", False) + self.password = kwargs.get("password", "") + self.lock = kwargs.get("lock", False) + + def __eq__(self, y): + return self.username == y.username + + def __str__(self): + retval = BaseData.__str__(self) + + retval += "sshpw" + retval += self._getArgsAsStr() + '\n' + + return retval + + def _getArgsAsStr(self): + retval = "" + + retval += " --username=%s" % self.username + if self.lock: + retval += " --lock" + if self.isCrypted: + retval += " --iscrypted" + else: + retval += " --plaintext" + + retval += " %s" % self.password + return retval + +class F13_SshPw(KickstartCommand): + removedKeywords = KickstartCommand.removedKeywords + removedAttrs = KickstartCommand.removedAttrs + + def __init__(self, writePriority=0, *args, **kwargs): + KickstartCommand.__init__(self, writePriority, *args, **kwargs) + self.op = self._getParser() + + self.sshUserList = kwargs.get("sshUserList", []) + + def __str__(self): + retval = "" + for user in self.sshUserList: + retval += user.__str__() + + return retval + + def _getParser(self): + op = KSOptionParser() + op.add_option("--username", dest="username", required=True) + op.add_option("--iscrypted", dest="isCrypted", action="store_true", + default=False) + op.add_option("--plaintext", dest="isCrypted", action="store_false") + op.add_option("--lock", dest="lock", action="store_true", default=False) + return op + + def parse(self, args): + ud = self.handler.SshPwData() + (opts, extra) = self.op.parse_args(args=args, lineno=self.lineno) + self._setToObj(self.op, opts, ud) + + if len(extra) != 1: + raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("A single argument is expected for the %s command") % "sshpw") + ud.password = extra[0] + + if ud in self.dataList(): + warnings.warn(_("An ssh user with the name %s has already been defined.") % ud.name) + + return ud + + def dataList(self): + return self.sshUserList diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index e6f62c0..9d15cfd 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -636,6 +636,7 @@ commandMap = { "services": services.FC6_Services, "shutdown": reboot.FC6_Reboot, "skipx": skipx.FC3_SkipX, + "sshpw": sshpw.F13_SshPw, "text": displaymode.FC3_DisplayMode, "timezone": timezone.FC6_Timezone, "updates": updates.F7_Updates, @@ -961,6 +962,7 @@ dataMap = { "PartData": partition.F12_PartData, "RaidData": raid.F12_RaidData, "RepoData": repo.F13_RepoData, + "SshPwData": sshpw.F13_SshPwData, "UserData": user.F12_UserData, "VolGroupData": volgroup.FC3_VolGroupData, "ZFCPData": zfcp.F12_ZFCPData, diff --git a/tests/commands/sshpw.py b/tests/commands/sshpw.py new file mode 100644 index 0000000..2187c74 --- /dev/null +++ b/tests/commands/sshpw.py @@ -0,0 +1,57 @@ +# +# Peter Jones <pjones(a)redhat.com> +# +# Copyright 2009 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing to use, modify, +# copy, or redistribute it subject to the terms and conditions of the GNU +# General Public License v.2. This program is distributed in the hope that it +# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the +# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 51 +# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat +# trademarks that are incorporated in the source code or documentation are not +# subject to the GNU General Public License and may only be used or replicated +# with the express permission of Red Hat, Inc. +# +import unittest, shlex +import warnings +from tests.baseclass import * + +from pykickstart.errors import * +from pykickstart.commands.sshpw import * + +class F13_TestCase(CommandTest): + def runTest(self): + # pass + self.assert_parse("sshpw --username=someguy --iscrypted secrethandshake", "sshpw --username=someguy --iscrypted secrethandshake\n") + + # fail + self.assert_parse_error("sshpw", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy --iscrypted=OMGSEKRITZ", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --iscrypted", KickstartValueError) + + # pass + self.assert_parse("sshpw --username=someguy --lock secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext secrethandshake", "sshpw --username=someguy --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext --iscrypted secrethandshake", "sshpw --username=someguy --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --plaintext secrethandshake\n", "sshpw --username=someguy --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --plaintext secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --lock secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --iscrypted --plaintext secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + self.assert_parse("sshpw --username=someguy --lock --plaintext --iscrypted secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --plaintext --iscrypted --lock secrethandshake", "sshpw --username=someguy --lock --iscrypted secrethandshake\n") + self.assert_parse("sshpw --username=someguy --iscrypted --plaintext --lock secrethandshake", "sshpw --username=someguy --lock --plaintext secrethandshake\n") + + # fail + self.assert_parse_error("sshpw --username=someguy --plaintext=ISEEENGLAND secrethandshake", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --lock=NOKEYSFORYOU secrethandshake", KickstartParseError) + self.assert_parse_error("sshpw --username=someguy --plaintext", KickstartValueError) + self.assert_parse_error("sshpw --username=someguy --lock", KickstartValueError) + +if __name__ == "__main__": + unittest.main() -- 1.6.5.rc2

2 2

[PATCH] Add the bcm5974 kernel module needed for some touchpads (#474225).
by Chris Lumens 22 Oct '09

22 Oct '09

--- scripts/mk-images | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 3d32d7d..44e4664 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -96,7 +96,7 @@ TOPDIR=$(cd $TOPDIR; pwd) # modules that are needed. this is the generic "needed for every arch" stuff COMMONMODS="fat vfat nfs sunrpc lockd floppy cramfs loop edd pcspkr squashfs ipv6 virtio_pci netconsole" -USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch" +USBMODS="ohci-hcd uhci-hcd ehci-hcd usbhid mousedev usb-storage sd_mod sr_mod ub appletouch bcm5974" FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci" SDMODS="mmc-block sdhci sdhci-pci" IDEMODS="ide-cd ide-cd_mod" -- 1.6.5.rc2

2 1

Anaconda and Physical NIC
by Viswanath Krishnamurthy 22 Oct '09

22 Oct '09

Folks, During PXE install process, does Anaconda always look for physical Ethernet devices (PCI devices)? Is there a way Anaconda can recognize a virtual network interface (which uses other physical media like IB (Infiniband) as transport). The virtual NIC driver does not have an actual PCI device associated with it. Thx, Viswa

1 0

[f12-branch] & [master] - force swap formatting
by David Cantrell 21 Oct '09

21 Oct '09

For kickstart installs with autopart set, force swap partition formatting if any of the swap exceptions are raised. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 3

[rhel6-branch] merge in things from dist-cvs
by David Cantrell 21 Oct '09

21 Oct '09

We have a rhel6-branch, so vacuum up things from RHEL-6 dist-cvs and put them in git. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 10

[PATCH 1/2] Allow /boot to be on a variety of filesystems during kickstart (#529846).
by Chris Lumens 21 Oct '09

21 Oct '09

This fixes an inconsistency where /boot could be on various filesystems during interactive installs, but not during kickstart. What filesystems are valid is controlled by the Platform module. --- kickstart.py | 8 ++++---- platform.py | 28 +++++++++++++++------------- storage/formats/__init__.py | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/kickstart.py b/kickstart.py index 1b44ed4..3471489 100644 --- a/kickstart.py +++ b/kickstart.py @@ -662,11 +662,11 @@ class Partition(commands.partition.F12_Partition): type = "EFI System Partition" pd.fsopts = "defaults,uid=0,gid=0,umask=0077,shortname=winnt" kwargs["weight"] = self.handler.anaconda.platform.weight(fstype="efi") - elif pd.mountpoint == "/boot": - type = self.handler.anaconda.platform.bootFSType else: if pd.fstype != "": type = pd.fstype + elif pd.mountpoint == "/boot": + type = self.handler.anaconda.platform.defaultBootFSType else: type = storage.defaultFSType @@ -800,11 +800,11 @@ class Raid(commands.raid.F12_Raid): raise KickstartValueError, formatErrorMsg(self.lineno, msg="PV partition defined multiple times") rd.mountpoint = "" - elif rd.mountpoint == "/boot" and self.handler.anaconda.platform.supportsMdRaidBoot: - type = self.handler.anaconda.platform.bootFSType else: if rd.fstype != "": type = rd.fstype + elif rd.mountpoint == "/boot" and self.handler.anaconda.platform.supportsMdRaidBoot: + type = self.handler.anaconda.platform.defaultBootFSType else: type = storage.defaultFSType diff --git a/platform.py b/platform.py index 4140c4f..fdc895a 100644 --- a/platform.py +++ b/platform.py @@ -38,7 +38,7 @@ class Platform(object): during installation. The intent is to eventually encapsulate all the architecture quirks in one place to avoid lots of platform checks throughout anaconda.""" - _bootFSType = "ext3" + _bootFSTypes = ["ext3"] _diskType = parted.diskType["msdos"] _isEfi = iutil.isEfi() _minimumSector = 0 @@ -71,9 +71,14 @@ class Platform(object): return mntDict.get("/boot", mntDict.get("/")) @property - def bootFSType(self): + def defaultBootFSType(self): """Return the default filesystem type for the boot partition.""" - return self._bootFSType + return self._bootFSTypes[0] + + @property + def bootFSTypes(self): + """Return a list of all valid filesystem types for the boot partition.""" + return self._bootFSTypes def bootloaderChoices(self, bl): """Return the default list of places to install the bootloader. @@ -118,12 +123,9 @@ class Platform(object): if req.type == "mdarray" and not self.supportsMdRaidBoot: errors.append(_("Bootable partitions cannot be on a RAID device.")) - # Lots of filesystems types don't support /boot. - if not req.format.bootable: - errors.append(_("Bootable partitions cannot be on an %s filesystem.") % req.format.name) - - # vfat /boot is insane. - if req == self.anaconda.id.storage.rootDevice and req.format.type == "vfat": + # Make sure /boot is on a supported FS type. This prevents crazy + # things like boot on vfat. + if not req.format.bootable or not req.format.type in self.bootFSTypes: errors.append(_("Bootable partitions cannot be on an %s filesystem.") % req.format.type) if req.type == "luks/dm-crypt": @@ -162,7 +164,7 @@ class Platform(object): def setDefaultPartitioning(self): """Return the default platform-specific partitioning information.""" - return [PartSpec(mountpoint="/boot", fstype=self.bootFSType, size=200, + return [PartSpec(mountpoint="/boot", fstype=self.defaultBootFSType, size=200, weight=self.weight(mountpoint="/boot"))] @property @@ -195,7 +197,7 @@ class Platform(object): return 0 class EFI(Platform): - _bootFSType = "ext4" + _bootFSTypes = ["ext4", "ext3", "ext2"] _diskType = parted.diskType["gpt"] _minBootPartSize = 50 _maxBootPartSize = 256 @@ -285,7 +287,7 @@ class IA64(EFI): EFI.__init__(self, anaconda) class PPC(Platform): - _bootFSType = "ext4" + _bootFSTypes = ["ext4", "ext3", "ext2"] _packages = ["yaboot"] _ppcMachine = iutil.getPPCMachine() _supportsMdRaidBoot = True @@ -456,7 +458,7 @@ class Sparc(Platform): return start+1 class X86(EFI): - _bootFSType = "ext4" + _bootFSTypes = ["ext4", "ext3", "ext2"] _packages = ["grub"] _supportsMdRaidBoot = True diff --git a/storage/formats/__init__.py b/storage/formats/__init__.py index ea60ccb..ab33211 100644 --- a/storage/formats/__init__.py +++ b/storage/formats/__init__.py @@ -47,7 +47,7 @@ def get_default_filesystem_type(boot=None): import platform if boot: - fstypes = [platform.getPlatform(None).bootFSType] + fstypes = [platform.getPlatform(None).defaultBootFSType] else: fstypes = default_fstypes -- 1.6.5.rc2

2 2

[PATCH] Platform.bootloaderPackage -> Platform.packages
by Chris Lumens 21 Oct '09

21 Oct '09

This seems to be a more future-proof way of doing things. --- platform.py | 18 +++++++++--------- yuminstall.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform.py b/platform.py index 8697090..4140c4f 100644 --- a/platform.py +++ b/platform.py @@ -39,10 +39,10 @@ class Platform(object): architecture quirks in one place to avoid lots of platform checks throughout anaconda.""" _bootFSType = "ext3" - _bootloaderPackage = None _diskType = parted.diskType["msdos"] _isEfi = iutil.isEfi() _minimumSector = 0 + _packages = [] _supportsMdRaidBoot = False _minBootPartSize = 50 _maxBootPartSize = 0 @@ -98,10 +98,6 @@ class Platform(object): return ret - @property - def bootloaderPackage(self): - return self._bootloaderPackage - def checkBootRequest(self, req): """Perform an architecture-specific check on the boot device. Not all platforms may need to do any checks. Returns a list of errors if @@ -160,6 +156,10 @@ class Platform(object): """Return the minimum starting sector for the provided disk.""" return self._minimumSector + @property + def packages (self): + return self._packages + def setDefaultPartitioning(self): """Return the default platform-specific partitioning information.""" return [PartSpec(mountpoint="/boot", fstype=self.bootFSType, size=200, @@ -279,14 +279,14 @@ class Alpha(Platform): return errors class IA64(EFI): - _bootloaderPackage = "elilo" + _packages = ["elilo"] def __init__(self, anaconda): EFI.__init__(self, anaconda) class PPC(Platform): - _bootloaderPackage = "yaboot" _bootFSType = "ext4" + _packages = ["yaboot"] _ppcMachine = iutil.getPPCMachine() _supportsMdRaidBoot = True @@ -440,7 +440,7 @@ class PS3(PPC): PPC.__init__(self, anaconda) class S390(Platform): - _bootloaderPackage = "s390utils" + _packages = ["s390utils"] def __init__(self, anaconda): Platform.__init__(self, anaconda) @@ -456,8 +456,8 @@ class Sparc(Platform): return start+1 class X86(EFI): - _bootloaderPackage = "grub" _bootFSType = "ext4" + _packages = ["grub"] _supportsMdRaidBoot = True def __init__(self, anaconda): diff --git a/yuminstall.py b/yuminstall.py index df471e9..0eb428a 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1354,7 +1354,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon if not anaconda.id.getUpgrade(): # New installs only - upgrades will already have all this stuff. self.selectBestKernel(anaconda) - self.selectPackage(anaconda.platform.bootloaderPackage) + map(self.selectPackage, anaconda.platform.packages) self.selectFSPackages(anaconda.id.storage) self.selectAnacondaNeeds() else: -- 1.6.5.rc2

2 1

[master] patches for udev/device-mapper integration
by David Lehman 21 Oct '09

21 Oct '09

Once the new device-mapper udev bits land, an add event on an existing device-mapper device will cause the device node to get removed. Until this is resolved in udev/device-mapper the simple thing to do is not generate events for device-mapper devices when doing a udev trigger. (udevadm trigger generates add events by default)

2 4

[PATCH][f12/master] More udev fixups for device-mapper and cryptsetup temp devices. (#526699)
by David Lehman 21 Oct '09

21 Oct '09

--- 70-anaconda.rules | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/70-anaconda.rules b/70-anaconda.rules index bad99dd..720d65f 100644 --- a/70-anaconda.rules +++ b/70-anaconda.rules @@ -1,17 +1,22 @@ ACTION!="add|change", GOTO="anaconda_end" SUBSYSTEM!="block", GOTO="anaconda_end" +# for device-mapper device we are supposed to only operate on "change" events +KERNEL=="dm-*", ACTION=="add", GOTO="anaconda_end" + ENV{ANACBIN}="/sbin" TEST!="$env{ANACBIN}/dmsetup", ENV{ANACBIN}="/usr/sbin" -IMPORT{program}="$env{ANACBIN}/blkid -o udev -p $tempnode" - +# device-mapper devices are special. we can't run blkid on them until we +# know they aren't cryptsetup temporary devices. +KERNEL!="dm-*", IMPORT{program}="$env{ANACBIN}/blkid -o udev -p $tempnode" KERNEL!="dm-*", GOTO="anaconda_mdraid" IMPORT{program}="$env{ANACBIN}/dmsetup info -c --nameprefixes --unquoted --rows --noheadings -o name,uuid,suspended,readonly,major,minor,open,tables_loaded,names_using_dev -j%M -m%m" ENV{DM_NAME}!="?*", GOTO="anaconda_end" ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="anaconda_end" ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="anaconda_end" +IMPORT{program}="$env{ANACBIN}/blkid -o udev -p $tempnode" SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" -- 1.6.2.5

2 1

let stage2= honor NFS options
by Stijn Hoop 21 Oct '09

21 Oct '09

Hi, in an attempt to work around bug #528537 (NFS mounts do not fall back to NFSv3/2 at the moment) I found out that the ks= command line option has a method to provide NFS options to the mount command: ks=nfs:nfsvers=3:host:/path/to/kickstart.ks This worked but unfortunately this does not work for stage2: stage2=nfs:nfsvers=3:host:/path/to/dvd makes anaconda mount host "nfsvers=3" and path "host". See also bug #529197 and the attached patch. However I have not yet grasped all concepts of pungi, composes and anaconda booting to be able to test it all coherently. I'll continue to play with it but msivak asked me to make a bug and send a mail on it already. Hopefully it is useful. Regards, --Stijn

2 1

[PATCH 2/2] update kerneltags and kernelxen for RHEL 6
by Dennis Gregorovic 21 Oct '09

21 Oct '09

Please apply the attached patch to the rhel6-branch in git. It sets the arch, kerneltags, and kernelxen variables accordingly in scripts/mk-images. Thanks -- Dennis

3 3

[PATCH] [f12/master] Don't force logical with a free primary slot and an extended. (#527952)
by David Lehman 20 Oct '09

20 Oct '09

Also rewrite getNextPartitionType for clarity so that bugs like this will be easier to identify and fix in the future. --- storage/partitioning.py | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/storage/partitioning.py b/storage/partitioning.py index 8c171aa..02761a2 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -448,25 +448,31 @@ def getNextPartitionType(disk, no_primary=None): max_logicals = disk.getMaxLogicalPartitions() primary_count = disk.primaryPartitionCount - if primary_count >= disk.maxPrimaryPartitionCount - 1: - if extended and logical_count < max_logicals: - part_type = parted.PARTITION_LOGICAL - elif primary_count < disk.maxPrimaryPartitionCount: + if primary_count < disk.maxPrimaryPartitionCount: + if primary_count == disk.maxPrimaryPartitionCount - 1: + # can we make an extended partition? now's our chance. if not extended and supports_extended: - # last chance to create an extended partition part_type = parted.PARTITION_EXTENDED - elif not no_primary: - # it's either a primary or nothing + elif not extended: + # extended partitions not supported. primary or nothing. + if not no_primary: + part_type = parted.PARTITION_NORMAL + else: + # there is an extended and a free primary + if not no_primary: + part_type = parted.PARTITION_NORMAL + elif logical_count < max_logical: + # we have an extended with logical slots, so use one. + part_type = parted.PARTITION_LOGICAL + else: + # there are two or more primary slots left. use one unless we're + # not supposed to make primaries. + if not no_primary: part_type = parted.PARTITION_NORMAL - elif no_primary and extended and logical_count < max_logicals: - # create a logical even though we could presumably create a - # primary instead + elif extended and logical_count < max_logicals: + part_type = parted.PARTITION_LOGICAL + elif extended and logical_count < max_logicals: part_type = parted.PARTITION_LOGICAL - elif not no_primary: - # XXX there is a possiblity that the only remaining free space on - # the disk lies within the extended partition, but we will - # try to create a primary first - part_type = parted.PARTITION_NORMAL return part_type -- 1.6.0.6

2 1

[PATCH] (rhel6-branch) check for ppc64 in .discinfo
by Dennis Gregorovic 20 Oct '09

20 Oct '09

The attached patch is for the rhel6 branch. It makes sure that we check for ppc64 in the media's .discinfo file. -- Dennis

2 1

[PATCH] Use rpm to determine how to set bootloader args and default runlevel (#527520).
by Chris Lumens 20 Oct '09

20 Oct '09

We were previously using tests that have diverged from what's going on in yuminstall.py, so this brings the two backend tests into using the same concept. Note that these checks can't be moved into the superclass, because different backends need to use different mechanisms to find out the same information. --- livecd.py | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/livecd.py b/livecd.py index 685e172..d1a4c64 100644 --- a/livecd.py +++ b/livecd.py @@ -348,6 +348,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend): rc = proc.poll() def doPostInstall(self, anaconda): + import rpm + self._doFilesystemMangling(anaconda) # setup /etc/rpm/ for the post-install environment @@ -355,12 +357,17 @@ class LiveCDCopyBackend(backend.AnacondaBackend): storage.writeEscrowPackets(anaconda) - # maybe heavy handed, but it'll do - if os.path.exists(anaconda.rootPath + "/usr/bin/rhgb") or os.path.exists(anaconda.rootPath + "/usr/bin/plymouth"): + iutil.resetRpmDb(anaconda.rootPath) + ts = rpm.TransactionSet(anaconda.rootPath) + + if ts.dbMatch('provides', 'plymouth').count() or ts.dbMatch('provides', 'rhgb').count(): anaconda.id.bootloader.args.append("rhgb quiet") - if os.path.exists(anaconda.rootPath + "/usr/sbin/gdm") or os.path.exists(anaconda.rootPath + "/usr/bin/kdm"): + + if ts.dbMatch('provides', 'service(graphical-login)').count(): anaconda.id.desktop.setDefaultRunLevel(5) + ts.closeDB() + # now write out the "real" fstab and mtab anaconda.id.storage.write(anaconda.rootPath) f = open(anaconda.rootPath + "/etc/mtab", "w+") -- 1.6.5.rc2

3 6

[PATCH 1/2] account for arch==i686
by Dennis Gregorovic 20 Oct '09

20 Oct '09

The attached patch updates the logic in upd-instroot to handle the case where ARCH is set to i686. -- Dennis

2 1

[PATCH 1/2] Error out on %pre script errors when installing packages (#511801).
by Chris Lumens 20 Oct '09

20 Oct '09

--- yuminstall.py | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index cb30642..34dafa5 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -229,17 +229,22 @@ class AnacondaCallback: self.initWindow.pulse() elif what in (rpm.RPMCALLBACK_CPIO_ERROR, - rpm.RPMCALLBACK_UNPACK_ERROR): + rpm.RPMCALLBACK_UNPACK_ERROR, + rpm.RPMCALLBACK_SCRIPT_ERROR): (hdr, rpmloc) = h - self.messageWindow(_("Error Installing Package"), - _("A fatal error occurred when installing the %s " - "package. This could indicate errors when reading " - "the installation media. Installation cannot " - "continue.") % hdr['name'], - type="custom", custom_icon="error", - custom_buttons=[_("_Exit installer")]) - sys.exit(1) + # Script errors store whether or not they're fatal in "total". So, + # we should only error out for fatal script errors or the cpio and + # unpack problems. + if what != rpm.RPMCALLBACK_SCRIPT_ERROR or total: + self.messageWindow(_("Error Installing Package"), + _("A fatal error occurred when installing the %s " + "package. This could indicate errors when reading " + "the installation media. Installation cannot " + "continue.") % hdr['name'], + type="custom", custom_icon="error", + custom_buttons=[_("_Exit installer")]) + sys.exit(1) if self.initWindow is None: self.progress.processEvents() -- 1.6.5.rc2

2 2

[PATCH][f12/master] Mark live device as protected instead of ignoring it. (#517260)
by David Lehman 20 Oct '09

20 Oct '09

--- storage/devicetree.py | 11 +++++++++++ storage/udev.py | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/storage/devicetree.py b/storage/devicetree.py index 570464f..bce1534 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -21,6 +21,7 @@ # import os +import stat import block import re @@ -1930,6 +1931,16 @@ class DeviceTree(object): if name: self.protectedDevNames.append(name) + # FIXME: the backing dev for the live image can't be used as an + # install target. note that this is a little bit of a hack + # since we're assuming that /dev/live will exist + if os.path.exists("/dev/live") and \ + stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): + livetarget = devicePathToName(os.path.realpath("/dev/live")) + log.info("%s looks to be the live device; marking as protected" + % (livetarget,)) + self.protectedDevNames.append(livetarget) + # each iteration scans any devices that have appeared since the # previous iteration old_devices = {} diff --git a/storage/udev.py b/storage/udev.py index d051157..7cc20a8 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -21,7 +21,6 @@ # import os -import stat import iutil from errors import * @@ -77,17 +76,6 @@ def __is_blacklisted_blockdev(dev_name): """Is this a blockdev we never want for an install?""" if dev_name.startswith("loop") or dev_name.startswith("ram") or dev_name.startswith("fd"): return True - # FIXME: the backing dev for the live image can't be used as an - # install target. note that this is a little bit of a hack - # since we're assuming that /dev/live will exist - if os.path.exists("/dev/live") and \ - stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): - livetarget = os.path.realpath("/dev/live") - if livetarget.startswith("/dev"): - livetarget = livetarget[5:] - if livetarget.startswith(dev_name): - log.info("%s looks to be the live device; ignoring" % (dev_name,)) - return True if os.path.exists("/sys/class/block/%s/device/model" %(dev_name,)): model = open("/sys/class/block/%s/device/model" %(dev_name,)).read() -- 1.6.0.6

1 0

[master] misc fixes
by David Cantrell 20 Oct '09

20 Oct '09

1) Don't translate exception messages in zfcp.py. 2) Change N_() usage in yuminstall.py to P_(). 3) Improve fsck failure messages given to the user. Rather than 'filesystem check failed: 4', give more information. Specific to fsck command used. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

5 11

[PATCH 0/2] Fix automatic reboot/halt at end of install for s390x (#528380)
by Steffen Maier 16 Oct '09

16 Oct '09

This has been tested to successfully reipl into the installed system with install to DASD both interactive and with kickstart&cmdline&RUNKS=1. Steffen Maier (2): Adapt standalone shutdown to nokill changes so s390x can use it. (#528380) Reintegrate reipl to trigger reboot/halt on s390x correctly. (#528380) anaconda | 8 -------- iutil.py | 17 +++++++++++++++++ loader/loader.c | 11 +++++++++-- loader/shutdown.c | 11 ++++++++--- packages.py | 6 +----- 5 files changed, 35 insertions(+), 18 deletions(-)

2 7

[PATCH - f12-branch, head] provide a minimal install
by Chris Lumens 16 Oct '09

16 Oct '09

Here's a controversial patch that I want several people's opinion on before I commit it. For a while now, people have been wanting a faster way to do a minimal install that didn't involve deselecting all packages by hand in the customization UI. What I've done in this patch simply provides the current desktop as a new task. Want a minimal install? Deselect the few default checked tasks. The most obvious downside here is that we'll be chasing the list of groups enabled by default in comps, though we kind of already have to do that. - Chris

5 16

[PATCH] Make LOADER_FLAGS_NOSHELL default also for s390x not just s390 (#527063)
by Steffen Maier 15 Oct '09

15 Oct '09

This has always been broken for s390x since it was introduced in 67a5a0afb3100e7986ce127b3c2684e01c97304e. The fix ensures that both s390 and s390x do not start a second shell on the console that collides with init=linuxrc.s390 blocking on console input and potentially providing a rescue shell after hitting return. Apparently LOADER_FLAGS_NOUSB has gone meanwhile but nobody noticed since this code path referencing it was never compiled on s390x. --- loader/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 69523cd..eefa520 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1891,8 +1891,8 @@ int main(int argc, char ** argv) { flags |= LOADER_FLAGS_KICKSTART_SEND_MAC; /* JKFIXME: I do NOT like this... it also looks kind of bogus */ -#if defined(__s390__) && !defined(__s390x__) - flags |= LOADER_FLAGS_NOSHELL | LOADER_FLAGS_NOUSB; +#if defined(__s390__) || defined(__s390x__) + flags |= LOADER_FLAGS_NOSHELL; #endif openLog(FL_TESTING(flags)); -- 1.6.5

2 1

[PATCH] Add dracutSetupString() method to ZFCPDiskDevice (#526354).
by David Cantrell 15 Oct '09

15 Oct '09

Collect CCW bus ID, WWPN, and FCP LUN values for zFCP devices when building the device tree. Store these in the ZFCPDiskDevice object and use them to generate the rd_ZFCP= string for dracut. Expand storage/udev.py with functions to determine if a device is zFCP, get a zFCP device's bus ID, and get arbitrary attribute values. --- storage/devices.py | 23 +++++++++++------------ storage/devicetree.py | 8 ++++++++ storage/udev.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index b76402c..19b4c3c 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -3135,23 +3135,22 @@ class ZFCPDiskDevice(DiskDevice): """ A mainframe ZFCP disk. """ _type = "zfcp" - def __init__(self, name, size=None, major=None, minor=None, - devnum=None, wwpn=None, fcplun=None, - parents=None, sysfsPath=''): - self.devnum = devnum - self.wwpn = wwpn - self.fcplun = fcplun - name = "zfcp://%s/%s/%s" % (self.devnum, self.wwpn, self.fcplun) - DiskDevice.__init__(self, name, size=size, - major=major, minor=minor, - parents=parents, sysfsPath=sysfsPath) + def __init__(self, name, **kwargs): + self.busid = kwargs.get("busid") + self.wwpn = kwargs.get("wwpn") + self.fcp_lun = kwargs.get("fcp_lun") + name = "zfcp://%s/%s/%s" % (self.busid, self.wwpn, self.fcplun,) + DiskDevice.__init__(self, name, **kwargs) def __str__(self): s = DiskDevice.__str__(self) - s += (" devnum = %(devnum)s wwpn = %(wwpn)s fcplun = %(fcplun)s" % - {"devnum": self.devnum, "wwpn": self.wwpn, "fcplun": self.fcplun}) + s += (" busid = %(busid)s wwpn = %(wwpn)s fcp_lun = %(fcp_lun)s" % + {"busid": self.busid, "wwpn": self.wwpn, "fcp_lun": self.fcp_lun}) return s + def dracutSetupString(self): + return "rd_ZFCP=%s,%s,%s" % (self.busid, self.wwpn, self.fcp_lun,) + class DASDDevice(DiskDevice): """ A mainframe DASD. """ diff --git a/storage/devicetree.py b/storage/devicetree.py index 1aae2a9..1b5358a 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -1199,6 +1199,14 @@ class DeviceTree(object): kwargs["opts"][attr] = udev_device_get_dasd_flag(info, attr) log.debug("%s is a dasd device" % name) + elif udev_device_is_zfcp(info): + diskType = ZFCPDiskDevice + kwargs["busid"] = udev_device_get_zfcp_bus_id(info) + + for attr in ['wwpn', 'fcp_lun']: + kwargs[attr] = udev_device_get_zfcp_attribute(info, attr=attr) + + log.debug("%s is a zfcp device" % name) else: diskType = DiskDevice log.debug("%s is a disk" % name) diff --git a/storage/udev.py b/storage/udev.py index 1af2289..3318602 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -180,6 +180,41 @@ def udev_device_get_dasd_flag(info, flag=None): return open(path, 'r').read().strip() +def udev_device_is_zfcp(info): + """ Return True if the device is a zfcp device. """ + bypath = False + devdir = os.path.realpath("/sys" + info.get("sysfs_path") + "/device") + wwpn = os.path.realpath(devdir + "/wwpn") + fcplun = os.path.realpath(devdir + "/fcp_lun") + + for symlink in info.get("symlinks"): + if symlink.startswith("disk/by-path") and symlink.find("zfcp") != -1: + bypath = True + break + + if bypath and os.path.isdir(devdir) and \ + os.path.isfile(wwpn) and os.path.isfile(fcplun): + return True + + return False + +def udev_device_get_zfcp_bus_id(info): + """ Return the CCW bus ID of the zfcp device. """ + return info.get("sysfs_path").split("/")[4] + +def udev_device_get_zfcp_attribute(info, attr=None): + """ Return the value of the specified attribute of the zfcp device. """ + if not attr: + return None + + attribute = "/sys%s/devices/%s" % (info.get("sysfs_path"), attr,) + attribute = os.path.realpath(attribute) + + if not os.path.isfile(attribute): + return None + + return open(attribute, "r").read().strip() + def udev_device_is_cdrom(info): """ Return True if the device is an optical drive. """ # FIXME: how can we differentiate USB drives from CD-ROM drives? -- 1.6.2.5

3 3

[master] & [f12-branch] s390x plus some
by David Cantrell 15 Oct '09

15 Oct '09

Mostly s390x stuff, but some other small things. Everything here applies to master and f12-branch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 24

[master] & [f12-branch] s390x misc
by David Cantrell 15 Oct '09

15 Oct '09

Stuff. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 7

[PATCH] Write LAYER2 and PORTNO correctly as parts of OPTIONS to ifcfg for s390x
by Steffen Maier 15 Oct '09

15 Oct '09

On s390x, linuxrc.s390 brings up the network completely and writes an NM compliant /etc/sysconfig/network-scripts/ifcfg-<DEVICE>. Apparently, loader never hits STEP_IP or writeEnabledNetworkInfo(). The latter would convert LAYER2= and PORTNO= into OPTIONS="". Since it does not seem to be called, linuxrc.s390 now writes OPTIONS="". Fixed readIfcfgContents() to not swallow OPTIONS which contains '='. With this in place, network.py writes a correct ifcfg to /mnt/sysimage. This patch completes ifcfg production on s390x of the following commits: 25f58fe7c701c453d39d2a9c5c0850eefce07f76 9249e40f42ffbbdcf42cd1caad72e3d622c7a75b 5f0fcf6688d08f83826c2892bb9fc97d6b4d7dd0 81163960a6137d39a5f2082e9f8d9f0a7b2ada57 This patch is intended for both devel and F-12. --- loader/linuxrc.s390 | 15 ++++++++++----- network.py | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) mode change 100644 => 100755 loader/linuxrc.s390 diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 old mode 100644 new mode 100755 index baec1e3..3b2a8d4 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -3110,12 +3110,17 @@ fi [ "$PEERID" != "" ] && echo "PEERID=$PEERID" >> $IFCFGFILE [ "$PORTNAME" != "" ] && echo "PORTNAME=$PORTNAME" >> $IFCFGFILE [ "$CTCPROT" != "" ] && echo "CTCPROT=$CTCPROT" >> $IFCFGFILE -[ "$LAYER2" != "" ] && echo "LAYER2=$LAYER2" >> $IFCFGFILE [ "$MACADDR" != "" ] && echo "MACADDR=$MACADDR" >> $IFCFGFILE -[ "$PORTNO" != "" ] && echo "PORTNO=$PORTNO" >> $IFCFGFILE -# also needs support in stage2 (loader.c,(net.c)) to make PORTNO persistent, -# i.e. OPTION="portno=1" in /etc/sysconfig/network-scripts/ifcfg-<netdevname> -# (see loader of RHEL 5.3) +optstr="" +for option in LAYER2 PORTNO; do + [ -z "${!option}" ] && continue + [ -n "$optstr" ] && optstr=${optstr}" " + optstr=${optstr}$(echo ${option} | tr [[:upper:]] [[:lower:]])"="${!option} +done +# write single quotes since network.py removes double quotes but we need quotes +echo "OPTIONS='$optstr'" >> $IFCFGFILE +unset option +unset optstr if [ -z "$testing" ]; then diff --git a/network.py b/network.py index e9f6ad8..3a0e721 100644 --- a/network.py +++ b/network.py @@ -366,7 +366,7 @@ class Network: if line.startswith('#') or line == '': continue - var = string.splitfields(line, '=') + var = string.splitfields(line, '=', 1) if len(var) == 2: var[1] = var[1].replace('"', '') contents[var[0]] = string.strip(var[1]) -- 1.6.4.4

2 3

[PATCH] Don't wait for mdraid to become clean on s390 (#528380)
by Hans de Goede 15 Oct '09

15 Oct '09

For some reason "mdadm --wait-clean --scan" hangs on s390, rather then figuring out why, just don't call it on s390, as we don't have BIOS RAID on s390 so we don't need it there. --- loader/shutdown.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/loader/shutdown.c b/loader/shutdown.c index 6a32e79..58625fe 100644 --- a/loader/shutdown.c +++ b/loader/shutdown.c @@ -58,7 +58,9 @@ static void performTerminations(int doKill) { } static void performUnmounts(int doKill) { +#if !defined(__s390__) && !defined(__s390x__) int ignore; +#endif if (testing || !doKill) return; @@ -69,8 +71,11 @@ static void performUnmounts(int doKill) { printf("unmounting filesystems...\n"); unmountFilesystems(); +/* For some reason this hangs on s390, well we don't need it there anyways */ +#if !defined(__s390__) && !defined(__s390x__) printf("waiting for mdraid sets to become clean...\n"); ignore = system("/sbin/mdadm --wait-clean --scan"); +#endif } static void performReboot(reboot_action rebootAction) { -- 1.6.5.rc2

3 3

[PATCH 1/2] For cmdline mode, add the long text to what messageWindow will print (#528006).
by Chris Lumens 15 Oct '09

15 Oct '09

--- cmdline.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cmdline.py b/cmdline.py index 5fe9d20..310dc76 100644 --- a/cmdline.py +++ b/cmdline.py @@ -107,6 +107,9 @@ class InstallInterface: def detailedMessageWindow(self, title, text, longText=None, type="ok", default=None, custom_buttons=None, custom_icon=None): + if longText: + text += "\n\n%s" % longText + self.messageWindow(title, text, type=type, default=default, custom_buttons=custom_buttons, custom_icon=custom_icon) -- 1.6.5.rc2

2 4

[PATCH] Don't set unnecessary multipath defaults.
by Peter Jones 15 Oct '09

15 Oct '09

Use "device" entries in the config file rather than specifying configuration parameters in the "multipath" section of the config file. This gets us more reasonable configuration. --- storage/devicelibs/mpath.py | 494 ++++++++++++++++++++++++++++++++++++++++++- storage/devices.py | 12 +- 2 files changed, 498 insertions(+), 8 deletions(-) diff --git a/storage/devicelibs/mpath.py b/storage/devicelibs/mpath.py index 3de91af..4a1c417 100644 --- a/storage/devicelibs/mpath.py +++ b/storage/devicelibs/mpath.py @@ -14,10 +14,500 @@ class MultipathConfigWriter: ret += """\ # multipath.conf written by anaconda +defaults { + verbosity 2 +} blacklist { - devnode "*" + devnode "*" + devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" + devnode "^hd[a-z]" + devnode "^dcssblk[0-9]*" + device { + vendor "DGC" + product "LUNZ" + } + device { + vendor "IBM" + product "S/390.*" + } + device { + vendor "IBM" + product "S/390.*" + } +} +devices { + device { + vendor "COMPELNT" + product "Compellent Vol" + path_grouping_policy multibus + path_checker tur + checker tur + failback immediate + no_path_retry queue + } + device { + vendor "APPLE*" + product "Xserve RAID " + path_grouping_policy multibus + } + device { + vendor "3PARdata" + product "VV" + path_grouping_policy multibus + } + device { + vendor "DEC" + product "HSG80" + path_grouping_policy group_by_prio + path_checker hp_sw + checker hp_sw + features "1 queue_if_no_path" + hardware_handler "1 hp-sw" + prio hp_sw + } + device { + vendor "HP" + product "A6189A" + path_grouping_policy multibus + no_path_retry 12 + } + device { + vendor "(COMPAQ|HP)" + product "(MSA|HSV)1.0.*" + path_grouping_policy group_by_prio + path_checker hp_sw + checker hp_sw + features "1 queue_if_no_path" + hardware_handler "1 hp-sw" + prio hp_sw + no_path_retry 12 + rr_min_io 100 + } + device { + vendor "HP" + product "MSA VOLUME" + path_grouping_policy group_by_prio + path_checker tur + checker tur + prio alua + failback immediate + no_path_retry 12 + rr_min_io 100 + } + device { + vendor "(COMPAQ|HP)" + product "HSV1[01]1|HSV2[01]0|HSV300|HSV4[05]0" + path_grouping_policy group_by_prio + path_checker tur + checker tur + prio alua + failback immediate + no_path_retry 12 + rr_min_io 100 + } + device { + vendor "HP" + product "MSA2[02]12fc|MSA2012i" + path_grouping_policy multibus + path_checker tur + checker tur + failback immediate + no_path_retry 18 + rr_min_io 100 + } + device { + vendor "HP" + product "MSA2012sa|MSA23(12|24)(fc|i|sa)|MSA2000s VOLUME" + path_grouping_policy group_by_prio + path_checker tur + checker tur + prio alua + failback immediate + no_path_retry 18 + rr_min_io 100 + } + device { + vendor "HP" + product "HSVX700" + path_grouping_policy group_by_prio + path_checker tur + checker tur + hardware_handler "1 alua" + prio alua + failback immediate + no_path_retry 12 + rr_min_io 100 + } + device { + vendor "HP" + product "LOGICAL VOLUME.*" + path_grouping_policy multibus + path_checker cciss_tur + checker cciss_tur + no_path_retry 12 + } + device { + vendor "DDN" + product "SAN DataDirector" + path_grouping_policy multibus + } + device { + vendor "EMC" + product "SYMMETRIX" + path_grouping_policy multibus + getuid_callout "/lib/udev/scsi_id --page=pre-spc3-83 --whitelisted --device=/dev/%n" + } + device { + vendor "DGC" + product ".*" + product_blacklist "LUNZ" + path_grouping_policy group_by_prio + path_checker emc_clariion + checker emc_clariion + features "1 queue_if_no_path" + hardware_handler "1 emc" + prio emc + failback immediate + no_path_retry 60 + } + device { + vendor "FSC" + product "CentricStor" + path_grouping_policy group_by_serial + } + device { + vendor "(HITACHI|HP)" + product "OPEN-.*" + path_grouping_policy multibus + path_checker tur + checker tur + } + device { + vendor "HITACHI" + product "DF.*" + path_grouping_policy group_by_prio + path_checker tur + checker tur + features "1 queue_if_no_path" + prio hds + failback immediate + } + device { + vendor "IBM" + product "ProFibre 4000R" + path_grouping_policy multibus + } + device { + vendor "IBM" + product "1722-600" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "1 queue_if_no_path" + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry 300 + } + device { + vendor "IBM" + product "1724" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "1 queue_if_no_path" + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry 300 + } + device { + vendor "IBM" + product "1726" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "1 queue_if_no_path" + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry 300 + } + device { + vendor "IBM" + product "1742" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "IBM" + product "1814" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "IBM" + product "1815" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "IBM" + product "1818" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "IBM" + product "3526" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "IBM" + product "3542" + path_grouping_policy group_by_serial + path_checker tur + checker tur + } + device { + vendor "IBM" + product "2105800" + path_grouping_policy group_by_serial + path_checker tur + checker tur + features "1 queue_if_no_path" + } + device { + vendor "IBM" + product "2105F20" + path_grouping_policy group_by_serial + path_checker tur + checker tur + features "1 queue_if_no_path" + } + device { + vendor "IBM" + product "1750500" + path_grouping_policy group_by_prio + path_checker tur + checker tur + features "1 queue_if_no_path" + prio alua + failback immediate + } + device { + vendor "IBM" + product "2107900" + path_grouping_policy multibus + path_checker tur + checker tur + features "1 queue_if_no_path" + } + device { + vendor "IBM" + product "2145" + path_grouping_policy group_by_prio + path_checker tur + checker tur + features "1 queue_if_no_path" + prio alua + failback immediate + } + device { + vendor "IBM" + product "S/390 DASD ECKD" + product_blacklist "S/390.*" + path_grouping_policy multibus + getuid_callout "/sbin/dasd_id /dev/%n" + features "1 queue_if_no_path" + } + device { + vendor "IBM" + product "S/390 DASD FBA" + product_blacklist "S/390.*" + path_grouping_policy multibus + getuid_callout "/sbin/dasdinfo -u -b %n" + features "1 queue_if_no_path" + } + device { + vendor "IBM" + product "IPR.*" + path_grouping_policy group_by_prio + path_checker tur + checker tur + features "1 queue_if_no_path" + hardware_handler "1 alua" + prio alua + failback immediate + } + device { + vendor "AIX" + product "VDASD" + path_grouping_policy multibus + failback immediate + no_path_retry 60 + } + device { + vendor "DELL" + product "MD3000" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "1 queue_if_no_path" + hardware_handler "1 rdac" + prio rdac + failback immediate + } + device { + vendor "DELL" + product "MD3000i" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "1 queue_if_no_path" + hardware_handler "1 rdac" + prio rdac + failback immediate + } + device { + vendor "NETAPP" + product "LUN.*" + path_grouping_policy group_by_prio + features "1 queue_if_no_path" + prio netapp + failback immediate + rr_min_io 128 + } + device { + vendor "IBM" + product "Nseries.*" + path_grouping_policy group_by_prio + features "1 queue_if_no_path" + prio netapp + failback immediate + rr_min_io 128 + } + device { + vendor "Pillar" + product "Axiom.*" + path_grouping_policy group_by_prio + path_checker tur + checker tur + prio alua + } + device { + vendor "SGI" + product "TP9[13]00" + path_grouping_policy multibus + } + device { + vendor "SGI" + product "TP9[45]00" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "SGI" + product "IS.*" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "STK" + product "OPENstorage D280" + path_grouping_policy group_by_prio + path_checker tur + checker tur + hardware_handler "1 rdac" + prio rdac + failback immediate + } + device { + vendor "SUN" + product "(StorEdge 3510|T4)" + path_grouping_policy multibus + } + device { + vendor "PIVOT3" + product "RAIGE VOLUME" + path_grouping_policy multibus + getuid_callout "/lib/udev/scsi_id --page=0x80 --whitelisted --device=/dev/%n" + path_checker tur + checker tur + features "1 queue_if_no_path" + rr_min_io 100 + } + device { + vendor "SUN" + product "CSM200_R" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "SUN" + product "LCSM100_[IF]" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry queue + } + device { + vendor "(LSI|ENGENIO)" + product "INF-01-00" + path_grouping_policy group_by_prio + path_checker rdac + checker rdac + features "2 pg_init_retries 50" + hardware_handler "1 rdac" + prio rdac + failback immediate + no_path_retry 15 + } } - blacklist_exceptions { """ for device in self.blacklist_exceptions: diff --git a/storage/devices.py b/storage/devices.py index 436d138..9fafeb6 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2756,12 +2756,12 @@ class MultipathDevice(DiskDevice): self.config = { 'wwid' : self.identity, 'alias' : self.name, - 'path_grouping_policy' : 'failover', - 'path_selector' : '\"round-robin 0\"', - 'failback' : 'manual', - 'rr_weight' : 'priorities', - 'no_path_retry' : 'queue', - 'rr_min_io' : '100', + #'path_grouping_policy' : 'failover', + #'path_selector' : '\"round-robin 0\"', + #'failback' : 'manual', + #'rr_weight' : 'priorities', + #'no_path_retry' : 'queue', + #'rr_min_io' : '100', #'flush_on_last_del' : 'yes', 'mode' : '0644', 'uid' : '0', -- 1.6.5.rc2

2 3

ssh
by Clyde E. Kunkel 15 Oct '09

15 Oct '09

Is it (would it be) feasible to include ssh capability in anaconda vmlinuz to that we could ssh into the machine if x fails and takes the keyboard with it?

1 0

[PATCH] Make sure hfsutils is installed on PPC so mkofboot will work (#529035).
by Chris Lumens 15 Oct '09

15 Oct '09

--- platform.py | 14 +++++++------- yuminstall.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform.py b/platform.py index 8697090..74abdb7 100644 --- a/platform.py +++ b/platform.py @@ -39,10 +39,10 @@ class Platform(object): architecture quirks in one place to avoid lots of platform checks throughout anaconda.""" _bootFSType = "ext3" - _bootloaderPackage = None _diskType = parted.diskType["msdos"] _isEfi = iutil.isEfi() _minimumSector = 0 + _packages = [] _supportsMdRaidBoot = False _minBootPartSize = 50 _maxBootPartSize = 0 @@ -99,8 +99,8 @@ class Platform(object): return ret @property - def bootloaderPackage(self): - return self._bootloaderPackage + def packages(self): + return self._packages def checkBootRequest(self, req): """Perform an architecture-specific check on the boot device. Not all @@ -279,13 +279,13 @@ class Alpha(Platform): return errors class IA64(EFI): - _bootloaderPackage = "elilo" + _packages = ["elilo"] def __init__(self, anaconda): EFI.__init__(self, anaconda) class PPC(Platform): - _bootloaderPackage = "yaboot" + _packages = ["hfsutils", "yaboot"] _bootFSType = "ext4" _ppcMachine = iutil.getPPCMachine() _supportsMdRaidBoot = True @@ -440,7 +440,7 @@ class PS3(PPC): PPC.__init__(self, anaconda) class S390(Platform): - _bootloaderPackage = "s390utils" + _packages = ["s390utils"] def __init__(self, anaconda): Platform.__init__(self, anaconda) @@ -456,7 +456,7 @@ class Sparc(Platform): return start+1 class X86(EFI): - _bootloaderPackage = "grub" + _packages = ["grub"] _bootFSType = "ext4" _supportsMdRaidBoot = True diff --git a/yuminstall.py b/yuminstall.py index cb30642..4043b31 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1354,7 +1354,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon if not anaconda.id.getUpgrade(): # New installs only - upgrades will already have all this stuff. self.selectBestKernel(anaconda) - self.selectPackage(anaconda.platform.bootloaderPackage) + map(self.selectPackage, anaconda.platform.packages) self.selectFSPackages(anaconda.id.storage) self.selectAnacondaNeeds() else: -- 1.6.5.rc2

3 3

rpm-python
by Jon Masters 15 Oct '09

15 Oct '09

Folks, I know some of you have recently worked on this, for driver disks (msivak in particular), so I figured I would ask. I trying to programmatically do the equivalent of an rpm2cpio and extracting a specific file using rpm-python. I have figured the basics out (getting the header, etc.) but I wish to avoid what yum and others are forced to do in working out the payload location. I haven't looked at Anaconda's implementation yet, but I'm hoping you've found a better way than implementing what rpm-python already should have done? Jon.

5 7

[PATCH] Use /dev/mapper/live-osimg-min instead of the old device node name (#526789).
by Chris Lumens 15 Oct '09

15 Oct '09

--- iw/congrats_gui.py | 2 +- liveinst/zz-liveinst.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 0df2d80..3027568 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -45,7 +45,7 @@ class CongratulationWindow (InstallWindow): # this mucks around a bit, but it's the weird case and it's # better than adding a lot of complication to the normal ics.cw.mainxml.get_widget("nextButton").hide() - if os.path.exists("/dev/live-osimg"): + if os.path.exists(os.environ.get("LIVE_BLOCK", "/dev/mapper/live-osimg-min")): ics.cw.mainxml.get_widget("closeButton").show() ics.cw.mainxml.get_widget("closeButton").grab_focus() else: diff --git a/liveinst/zz-liveinst.sh b/liveinst/zz-liveinst.sh index 41f636d..c141290 100755 --- a/liveinst/zz-liveinst.sh +++ b/liveinst/zz-liveinst.sh @@ -4,7 +4,7 @@ # don't run on geode (olpc) if [ `grep -c Geode /proc/cpuinfo` -eq 0 ]; then - if [ -b /dev/live-osimg ]; then + if [ -b /dev/mapper/live-osimg-min ]; then test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs cp /usr/share/applications/liveinst.desktop "${XDG_DESKTOP_DIR:-$HOME/Desktop}" elif [ -f /.livecd-configured ]; then # FIXME: old way... this should go away -- 1.6.5.rc2

2 1

[PATCH] Store the partitioning layout to the logs for easier debugging
by Martin Sivak 14 Oct '09

14 Oct '09

--- anaconda | 5 +++++ exception.py | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/anaconda b/anaconda index 6b01ed0..a3081e2 100755 --- a/anaconda +++ b/anaconda @@ -721,6 +721,11 @@ if __name__ == "__main__": # if earlyKS and not opts.rescue: opts.rescue = earlyKS.rescue.rescue + + # Store the partitioning layout to log in case anything goes wrong + PartLayout = iutil.execWithCapture("parted", ["parted", "-l"]) + log.debug("Partition layout at the beginning of instalation as seen by parted -l:\n" + PartLayout) + del PartLayout if opts.rescue: anaconda.rescue = True diff --git a/exception.py b/exception.py index 3493786..eacbf54 100644 --- a/exception.py +++ b/exception.py @@ -35,6 +35,12 @@ import logging log = logging.getLogger("anaconda") class AnacondaExceptionHandler(ExceptionHandler): + def preWriteHook(self, (ty, value, tb), anaconda): + # Store the last known partitioning layout + PartLayout = iutil.execWithCapture("parted", ["parted", "-l"]) + log.debug("Partition layout at the moment of exception as seen by parted -l:\n" + PartLayout) + del PartLayout + def postWriteHook(self, (ty, value, tb), anaconda): # See if /mnt/sysimage is present and put exception there as well if os.access("/mnt/sysimage/root", os.X_OK): @@ -119,7 +125,7 @@ def initExceptionHandling(anaconda): ], localSkipList=[ "passphrase", "password" ], fileList=[ "/tmp/syslog", "/tmp/anaconda.log", "/tmp/lvmout", - "/tmp/resize.out", "/tmp/program.log", + "/tmp/resize.out", "/tmp/program.log", "/proc/partitions", "/tmp/storage.log", "/tmp/yum.log", anaconda.rootPath + "/root/install.log", anaconda.rootPath + "/root/upgrade.log", -- 1.6.4.4

3 4

[PATCH] Remove double slash from nfs:// ks repo value for use in UI.
by Radek Vykydal 14 Oct '09

14 Oct '09

Boot repo parameter doesn't use slashes and we have to handle nfs urls from both sources the same way in UI. --- yuminstall.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 1c54318..4379bbc 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -672,7 +672,9 @@ class AnacondaYum(YumSorter): except Exception as e: log.error("error mounting NFS repo: %s" % e) - anacondaBaseURLs = [ksrepo.baseurl] + # Get rid of two slashes in nfs:// prefix, boot repo param + # doesn't use them. + anacondaBaseURLs = ["nfs:" + ksrepo.baseurl[6:]] ksrepo.baseurl = "file://%s" % dest repo = AnacondaYumRepo(ksrepo.name) -- 1.6.0.6

2 1

[PATCH] liveinst: deactivate mdraid arrays before running liveinst (#528235)
by Hans de Goede 14 Oct '09

14 Oct '09

Just like we want things to not be mounted and lvm to be not active when doing liveinstalls, we also want to start with any mdraid arrays deactivated. --- liveinst/liveinst | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/liveinst/liveinst b/liveinst/liveinst index a37d923..44bb11b 100755 --- a/liveinst/liveinst +++ b/liveinst/liveinst @@ -66,6 +66,17 @@ done /sbin/swapoff -a /sbin/lvm vgchange -an --ignorelockingfailure +for i in /dev/md*; do + [ -b $i ] || continue + + case "$i" in + /dev/md*p*) + ;; + *) + mdadm --stop $i >/dev/null 2>&1 + ;; + esac +done if [ -x /usr/bin/devkit-disks ]; then /usr/bin/devkit-disks --inhibit -- /usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run "$ANACONDA $*" -- 1.6.5.rc2

2 1

[PATCH] Set parted filesystemtype for swap partitions
by Hans de Goede 14 Oct '09

14 Oct '09

Our patch for adding support for the swap flag to parted msdos label handling has been rejected upstream, upstream says we should use ped_partition_set_system() instead. So do that, as I would like to drop this patch from our parted package eventually. This will also cause us to assign the right type to swap partitions in GPT tables, so this patch should go to F-12 too. --- storage/formats/swap.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/storage/formats/swap.py b/storage/formats/swap.py index 713ff58..b1f0d62 100644 --- a/storage/formats/swap.py +++ b/storage/formats/swap.py @@ -21,7 +21,7 @@ # from iutil import log_method_call, numeric_type -from parted import PARTITION_SWAP +from parted import PARTITION_SWAP, fileSystemType from ..errors import * from ..devicelibs import swap from . import DeviceFormat, register_device_format @@ -39,6 +39,7 @@ class SwapSpace(DeviceFormat): _name = None _udevTypes = ["swap"] partedFlag = PARTITION_SWAP + partedSystem = fileSystemType["linux-swap(v1)"] _formattable = True # can be formatted _supported = True # is supported _linuxNative = True # for clearpart -- 1.6.5.rc2

2 1

[master] & [f12-branch] DASD dracut changes
by David Cantrell 14 Oct '09

14 Oct '09

Adds dracutSetupString() for DASD devices and udev functions to read DASD information from sysfs. This is all that's needed after the last patch set was discussed. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 12

[PATCH] Fix liveinst to (1) not unmount /dev/pts, (2) unmount in order (509632).
by Chris Lumens 13 Oct '09

13 Oct '09

--- liveinst/liveinst | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/liveinst/liveinst b/liveinst/liveinst index eed4e41..a37d923 100755 --- a/liveinst/liveinst +++ b/liveinst/liveinst @@ -58,7 +58,12 @@ fi # devkit-disks is now mounting lots of stuff. for now, let's just try to unmount it all umount /media/* -for mnt in $(cat /proc/mounts |grep ^/dev |grep -v live | awk {'print $2;'}) ; do umount $mnt 2>/dev/null ; done +tac /proc/mounts | grep ^/dev | grep -v live | while read dev mntpoint rest; do + if [ -b $dev ]; then + umount $mntpoint 2>/dev/null + fi +done + /sbin/swapoff -a /sbin/lvm vgchange -an --ignorelockingfailure -- 1.6.5.rc2

3 2

[PATCH] Do not traceback if network device doesn't have HwAddress property (#506013).
by Radek Vykydal 13 Oct '09

13 Oct '09

--- isys/isys.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/isys/isys.py b/isys/isys.py index ebc27a7..338ca26 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -516,8 +516,13 @@ def getMacAddress(dev): if device_props_iface is None: return None - device_macaddr = device_props_iface.Get(NM_MANAGER_IFACE, "HwAddress") - return device_macaddr.upper() + device_macaddr = None + try: + device_macaddr = device_props_iface.Get(NM_MANAGER_IFACE, "HwAddress").upper() + except dbus.exceptions.DBusException as e: + if e.get_dbus_name() != 'org.freedesktop.DBus.Error.InvalidArgs': + raise + return device_macaddr # Get a description string for a network device (e.g., eth0) def getNetDevDesc(dev): -- 1.6.0.6

3 2

[PATCH master] Make bootLoaderInfo new-style class, so that its properties work correctly.
by Radek Vykydal 13 Oct '09

13 Oct '09

Be bootLoaderInfo old-style class, setting of its property drivelist doesn't work, instead the property is overwritten with attribute and therefore for example any following calls of updateDriveList have no effect. AFAIK it doesn't cause problems anywhere at the moment, but I think it should be fixed it in master. --- booty/alpha.py | 3 ++- booty/bootloaderInfo.py | 2 +- booty/ppc.py | 3 ++- booty/s390.py | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/booty/alpha.py b/booty/alpha.py index c4a3360..da9f839 100644 --- a/booty/alpha.py +++ b/booty/alpha.py @@ -145,7 +145,8 @@ class alphaBootloaderInfo(bootloaderInfo): def __init__(self, instData): bootloaderInfo.__init__(self, instData) self.useGrubVal = 0 - self.configfile = "/etc/aboot.conf" + self._configdir = "/etc" + self._configname = "aboot.conf" # self.kernelLocation is already set to what we need. self.password = None self.pure = None diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 4919cf3..ccde6be 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -268,7 +268,7 @@ class BootImages: retval.sort() return retval -class bootloaderInfo: +class bootloaderInfo(object): def getConfigFileName(self): if not self._configname: raise NotImplementedError diff --git a/booty/ppc.py b/booty/ppc.py index 9e43090..e19e5d6 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -178,4 +178,5 @@ class ppcBootloaderInfo(bootloaderInfo): bootloaderInfo.__init__(self, instData) self.useYabootVal = 1 self.kernelLocation = "/boot" - self.configfile = "/etc/yaboot.conf" + self._configdir = "/etc" + self._configname = "yaboot.conf" diff --git a/booty/s390.py b/booty/s390.py index 39a57d4..84feb6b 100644 --- a/booty/s390.py +++ b/booty/s390.py @@ -174,4 +174,5 @@ class s390BootloaderInfo(bootloaderInfo): bootloaderInfo.__init__(self, instData) self.useZiplVal = 1 # only used on s390 self.kernelLocation = "/boot/" - self.configfile = "/etc/zipl.conf" + self._configdir = "/etc" + self._configname = "zipl.conf" -- 1.6.0.6

2 1

[PATCH] Fix task selection when tasks contain the same group. (#528193)
by Bill Nottingham 13 Oct '09

13 Oct '09

If we just iterate over the task list selecting and deselecting groups, then we'll deselect groups we want if a later task also contains those groups. So deselect all unchecked tasks, then select all checked tasks. --- iw/task_gui.py | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/iw/task_gui.py b/iw/task_gui.py index ae87179..aeacd48 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -488,15 +488,12 @@ class TaskWindow(InstallWindow): self.dispatch.skipStep("group-selection", skip = 1) tasks = self.xml.get_widget("taskList").get_model() - for (cb, task, grps) in tasks: - # we just set things as default or not; group selection - # happens after this screen. - if cb: - map(lambda g: setattr(self.backend.ayum.comps.return_group(g), - "default", True), grps) - else: - map(lambda g: setattr(self.backend.ayum.comps.return_group(g), - "default", False), grps) + for (cb, task, grps) in filter(lambda x: not x[0], tasks): + map(lambda g: setattr(self.backend.ayum.comps.return_group(g), + "default", False), grps) + for (cb, task, grps) in filter(lambda x: x[0], tasks): + map(lambda g: setattr(self.backend.ayum.comps.return_group(g), + "default", True), grps) def _editRepo(self, *args): repo = None -- 1.6.5.rc2

2 1

[PATCH] Support upgrading when the language isn't in lang-table (#528317).
by Chris Lumens 13 Oct '09

13 Oct '09

This patch attempts to grab the language and keyboard from the running system during an upgrade. This fixes the case where the user's set their $LANG to some local dialect that's not listed in lang-table. If we still can't grab the right settings, we just fall back to the default. It's completely untested because preupgrade hates me today. I wouldn't want to commit to f12-branch, either. - Chris

2 3

[PATCH parted] Handle swap flag in msdos type labels
by Hans de Goede 13 Oct '09

13 Oct '09

From: David Cantrell <dcantrell(a)redhat.com> Original patch by David Cantrell <dcantrell(a)redhat.com>, I (Hans de Goede <hdegoede(a)redhat.com>) made the following changes: -msdos_partition_is_flag_available() should return 1 for swap flag -Only change the partition type to 82 when setting the swap flag on dos labels, not when resetting it --- libparted/labels/dos.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/libparted/labels/dos.c b/libparted/labels/dos.c index cc9e0e3..c3b4932 100644 --- a/libparted/labels/dos.c +++ b/libparted/labels/dos.c @@ -151,6 +151,7 @@ typedef struct { int lba; int palo; int prep; + int swap; OrigState* orig; /* used for CHS stuff */ } DosPartitionData; @@ -799,6 +800,7 @@ raw_part_parse (const PedDisk* disk, const DosRawPartition* raw_part, dos_data->lba = raw_part_is_lba (raw_part); dos_data->palo = raw_part->type == PARTITION_PALO; dos_data->prep = raw_part->type == PARTITION_PREP; + dos_data->swap = raw_part->type == PARTITION_LINUX_SWAP; dos_data->orig = ped_malloc (sizeof (OrigState)); if (!dos_data->orig) { ped_partition_destroy (part); @@ -1199,6 +1201,7 @@ msdos_partition_new (const PedDisk* disk, PedPartitionType part_type, dos_data->lba = 0; dos_data->palo = 0; dos_data->prep = 0; + dos_data->swap = 0; } else { part->disk_specific = NULL; } @@ -1234,6 +1237,7 @@ msdos_partition_duplicate (const PedPartition* part) new_dos_data->lba = old_dos_data->lba; new_dos_data->palo = old_dos_data->palo; new_dos_data->prep = old_dos_data->prep; + new_dos_data->swap = old_dos_data->swap; if (old_dos_data->orig) { new_dos_data->orig = ped_malloc (sizeof (OrigState)); @@ -1281,6 +1285,7 @@ msdos_partition_set_system (PedPartition* part, dos_data->lvm = 0; dos_data->palo = 0; dos_data->prep = 0; + dos_data->swap = 0; if (dos_data->lba) dos_data->system = PARTITION_EXT_LBA; else @@ -1304,6 +1309,10 @@ msdos_partition_set_system (PedPartition* part, dos_data->system = PARTITION_PREP; return 1; } + if (dos_data->swap) { + dos_data->system = PARTITION_LINUX_SWAP; + return 1; + } if (!fs_type) dos_data->system = PARTITION_LINUX; @@ -1376,6 +1385,7 @@ msdos_partition_set_flag (PedPartition* part, dos_data->lvm = 0; dos_data->palo = 0; dos_data->prep = 0; + dos_data->swap = 0; } dos_data->raid = state; return ped_partition_set_system (part, part->fs_type); @@ -1386,6 +1396,7 @@ msdos_partition_set_flag (PedPartition* part, dos_data->raid = 0; dos_data->palo = 0; dos_data->prep = 0; + dos_data->swap = 0; } dos_data->lvm = state; return ped_partition_set_system (part, part->fs_type); @@ -1399,6 +1410,7 @@ msdos_partition_set_flag (PedPartition* part, dos_data->hidden = 0; dos_data->raid = 0; dos_data->lvm = 0; + dos_data->swap = 0; } dos_data->palo = state; return ped_partition_set_system (part, part->fs_type); @@ -1408,10 +1420,23 @@ msdos_partition_set_flag (PedPartition* part, dos_data->hidden = 0; dos_data->raid = 0; dos_data->lvm = 0; + dos_data->swap = 0; + dos_data->palo = 0; } dos_data->prep = state; return ped_partition_set_system (part, part->fs_type); + case PED_PARTITION_SWAP: + if (state) { + dos_data->hidden = 0; + dos_data->raid = 0; + dos_data->lvm = 0; + dos_data->palo = 0; + dos_data->prep = 0; + } + dos_data->swap = state; + return ped_partition_set_system (part, part->fs_type); + default: return 0; } @@ -1448,6 +1473,9 @@ msdos_partition_get_flag (const PedPartition* part, PedPartitionFlag flag) case PED_PARTITION_PREP: return dos_data->prep; + case PED_PARTITION_SWAP: + return dos_data->swap; + default: return 0; } @@ -1465,6 +1493,7 @@ msdos_partition_is_flag_available (const PedPartition* part, case PED_PARTITION_LBA: case PED_PARTITION_PALO: case PED_PARTITION_PREP: + case PED_PARTITION_SWAP: return 1; default: -- 1.6.5.rc2

2 5

[PATCH] Don't run 70-anaconda.rules on an installed system (#527781).
by Chris Lumens 13 Oct '09

13 Oct '09

The livecd includes anaconda, for obvious reasons. However this means that 70-anaconda.rules will be installed on the finished system and running our rules has some unusual side effects. While we slowly push our udev rules changes into upstream packages, this should make them a no-op on the installed system. --- 70-anaconda.rules | 3 +++ loader/init.c | 2 ++ loader/linuxrc.s390 | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/70-anaconda.rules b/70-anaconda.rules index bad99dd..d6cb2af 100644 --- a/70-anaconda.rules +++ b/70-anaconda.rules @@ -1,3 +1,6 @@ +# If $ANACONDA isn't set in the environment, skip all these rules. +ENV{ANACONDA}!=".*", GOTO="anaconda_end" + ACTION!="add|change", GOTO="anaconda_end" SUBSYSTEM!="block", GOTO="anaconda_end" diff --git a/loader/init.c b/loader/init.c index d941f86..bab5721 100644 --- a/loader/init.c +++ b/loader/init.c @@ -529,6 +529,8 @@ int main(int argc, char **argv) { execl("/sbin/udevd", "/sbin/udevd","--daemon",NULL); exit(1); } + + execl("/sbin/udevadm", "udevadm", "control", "--env=ANACONDA=1", NULL); } printf("done\n"); diff --git a/loader/linuxrc.s390 b/loader/linuxrc.s390 index baec1e3..0ab424f 100644 --- a/loader/linuxrc.s390 +++ b/loader/linuxrc.s390 @@ -256,6 +256,8 @@ function init_main() { udevd --daemon # debug: udevadm control --log-priority=debug + udevadm control --env=ANACONDA=1 + mount -t devpts /dev/pts /dev/pts mount -t sysfs none /sys -- 1.6.4.2

2 1

[PATCH] Use ID_SERIAL to write multipath.conf, but ID_SERIAL_SHORT for UI.
by Peter Jones 13 Oct '09

13 Oct '09

multipath and multipathd expect the leading "3" in wwids, but that's bad in the user interface. So use one for one and the other for the other. --- storage/devices.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index 5f9d068..436d138 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2773,7 +2773,8 @@ class MultipathDevice(DiskDevice): May be overridden by a sub-class for e.g. RDAC handling. """ - self._serial = self._info['ID_SERIAL_SHORT'] + self._serial_short = self._info['ID_SERIAL_SHORT'] + self._serial = self._info['ID_SERIAL'] @property def identity(self): @@ -2791,7 +2792,7 @@ class MultipathDevice(DiskDevice): @property def wwid(self): - serial = self.identity + serial = self._serial_short ret = [] while serial: ret.append(serial[:2]) -- 1.6.5.rc2

2 1

[PATCH] Update drivelist with bootloader --driveorder ks option instead of replacing it (#506073).
by Radek Vykydal 12 Oct '09

12 Oct '09

Just update the order of drives instead of using only drives set in --driveorder option. F12 material, I think. Another thing I hit which might cause problems somewhere is that bootloaderInfo is old-style class, so setting of its property drivelist doesn't work (instead the property is overwritten with attribute and therefore for example any following calls of updateDriveList have no effect). Although beside code replaced in this patch, we are doing it only in one place in bootloaader UI where it seems harmless, and making bootloaderInfo new-style class will require modification of bootloader.configfile handling (which relies on bad behavior of property in bootloaderInfo), I think we should fix it. I'll come with a patch. --- kickstart.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kickstart.py b/kickstart.py index 57f7aa3..8029861 100644 --- a/kickstart.py +++ b/kickstart.py @@ -257,7 +257,7 @@ class Bootloader(commands.bootloader.F12_Bootloader): log.warning("requested drive %s in boot drive order " "doesn't exist" %(drive,)) - self.handler.id.bootloader.drivelist = new + self.handler.id.bootloader.updateDriveList(new) self.handler.permanentSkipSteps.extend(["upgbootloader", "bootloader"]) return retval -- 1.6.0.6

3 2

[PATCH][devel, f12] Missing volume_key shouldn't break LUKS support completely. (#526899)
by David Lehman 12 Oct '09

12 Oct '09

Live images don't contain volume_key, which makes sense since key escrow is kickstart-only functionality. At any rate, failure to import volume_key should only break key escrow. --- storage/formats/luks.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/storage/formats/luks.py b/storage/formats/luks.py index 15b92b6..668e689 100644 --- a/storage/formats/luks.py +++ b/storage/formats/luks.py @@ -24,7 +24,10 @@ import os -import volume_key +try: + import volume_key +except ImportError: + volume_key = None from iutil import log_method_call from ..errors import * @@ -266,6 +269,9 @@ class LUKS(DeviceFormat): def escrow(self, directory, backupPassphrase): log.debug("escrow: escrowVolume start for %s" % self.device) + if volume_key is None: + raise LUKSError("Missing key escrow support libraries") + vol = volume_key.Volume.open(self.device) volume_ident = self._escrowVolumeIdent(vol) -- 1.6.2.5

2 1

[PATCH] Write multipathd.conf in anaconda so that dracut can find it.
by Peter Jones 12 Oct '09

12 Oct '09

This writes a multipathd.conf that whitelists the devices we're using in our multipath devices. It's a fairly basic configuration, and it doesn't handle ALUA yet. --- storage/__init__.py | 17 +++++++++++++++++ storage/devicelibs/mpath.py | 37 +++++++++++++++++++++++++++++++++++++ storage/devices.py | 16 ++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) create mode 100644 storage/devicelibs/mpath.py diff --git a/storage/__init__.py b/storage/__init__.py index 640014a..9a3752e 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -46,6 +46,7 @@ from formats import get_default_filesystem_type from devicelibs.lvm import safeLvmName from devicelibs.dm import name_from_dm_node from devicelibs.crypto import generateBackupPassphrase +from devicelibs.mpath import MultipathConfigWriter from udev import * import iscsi import fcoe @@ -1951,6 +1952,11 @@ class FSSet(object): if mdadm_conf: open(mdadm_path, "w").write(mdadm_conf) + multipath_path = os.path.normpath("%s/etc/multipath.conf" % instPath) + multipath_conf = self.multipathConf() + if multipath_conf: + open(multipath_path, "w").write(multipath_conf) + def crypttab(self): # if we are upgrading, do we want to update crypttab? # gut reaction says no, but plymouth needs the names to be very @@ -2005,6 +2011,17 @@ class FSSet(object): return retval + def multipathConf(self): + """ Return the contents of multipath.conf. """ + mpaths = self.devicetree.getDevicesByType("dm-multipath") + if not mpaths: + return None + mpaths.sort(key=lambda d: d.name) + config = MultipathConfigWriter() + for mpath in mpaths: + config.addMultipathDevice(mpath) + return config.write() + def fstab (self): format = "%-23s %-23s %-7s %-15s %d %d\n" fstab = """ diff --git a/storage/devicelibs/mpath.py b/storage/devicelibs/mpath.py new file mode 100644 index 0000000..3de91af --- /dev/null +++ b/storage/devicelibs/mpath.py @@ -0,0 +1,37 @@ + +class MultipathConfigWriter: + def __init__(self): + self.blacklist_exceptions = [] + self.mpaths = [] + + def addMultipathDevice(self, mpath): + for parent in mpath.parents: + self.blacklist_exceptions.append(parent.name) + self.mpaths.append(mpath) + + def write(self): + ret = "" + ret += """\ +# multipath.conf written by anaconda + +blacklist { + devnode "*" +} + +blacklist_exceptions { +""" + for device in self.blacklist_exceptions: + ret += "\tdevnode \"^%s$\"\n" % (device,) + ret += """\ +} + +multipaths { +""" + for mpath in self.mpaths: + ret += "\tmultipath {\n" + for k,v in mpath.config.items(): + ret += "\t\t%s %s\n" % (k, v) + ret += "\t}\n\n" + ret += "}\n" + + return ret diff --git a/storage/devices.py b/storage/devices.py index 261b9a1..5f9d068 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2752,6 +2752,22 @@ class MultipathDevice(DiskDevice): DiskDevice.__init__(self, name, format=format, size=size, parents=parents, sysfsPath=sysfsPath) + # PJTODO: these need better setup + self.config = { + 'wwid' : self.identity, + 'alias' : self.name, + 'path_grouping_policy' : 'failover', + 'path_selector' : '\"round-robin 0\"', + 'failback' : 'manual', + 'rr_weight' : 'priorities', + 'no_path_retry' : 'queue', + 'rr_min_io' : '100', + #'flush_on_last_del' : 'yes', + 'mode' : '0644', + 'uid' : '0', + 'gid' : '0', + } + def setupIdentity(self): """ Adds identifying remarks to MultipathDevice object. -- 1.6.5.rc2

2 1

[PATCH] We moved from dialog to newt.. (#528497)
by Martin Sivak 12 Oct '09

12 Oct '09

--- rescue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rescue.py b/rescue.py index 775f159..7252b83 100644 --- a/rescue.py +++ b/rescue.py @@ -202,7 +202,7 @@ def runShell(screen = None, msg=""): proc = None - if os.path.exists("/usr/bin/firstaidkit-qs") and os.path.exists("/usr/bin/dialog"): + if os.path.exists("/usr/bin/firstaidkit-qs"): proc = subprocess.Popen(["/usr/bin/firstaidkit-qs"]) proc.wait() -- 1.6.4.4

2 1

[PATCH] Mark live device as protected instead of ignoring it. (#517260)
by David Lehman 12 Oct '09

12 Oct '09

--- storage/devicetree.py | 13 +++++++++++++ storage/udev.py | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/storage/devicetree.py b/storage/devicetree.py index a9b74eb..111e7e1 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -21,6 +21,7 @@ # import os +import stat import block import re @@ -1961,6 +1962,18 @@ class DeviceTree(object): if name: self.protectedDevNames.append(name) + # FIXME: the backing dev for the live image can't be used as an + # install target. note that this is a little bit of a hack + # since we're assuming that /dev/live will exist + if os.path.exists("/dev/live") and \ + stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): + livetarget = os.path.realpath("/dev/live") + if livetarget.startswith("/dev"): + livetarget = livetarget[5:] + log.info("%s looks to be the live device; marking as protected" + % (livetarget,)) + self.protectedDevNames.append(livetarget) + # each iteration scans any devices that have appeared since the # previous iteration old_devices = {} diff --git a/storage/udev.py b/storage/udev.py index 2c41343..79e00e5 100644 --- a/storage/udev.py +++ b/storage/udev.py @@ -77,17 +77,6 @@ def __is_blacklisted_blockdev(dev_name): """Is this a blockdev we never want for an install?""" if dev_name.startswith("loop") or dev_name.startswith("ram") or dev_name.startswith("fd"): return True - # FIXME: the backing dev for the live image can't be used as an - # install target. note that this is a little bit of a hack - # since we're assuming that /dev/live will exist - if os.path.exists("/dev/live") and \ - stat.S_ISBLK(os.stat("/dev/live")[stat.ST_MODE]): - livetarget = os.path.realpath("/dev/live") - if livetarget.startswith("/dev"): - livetarget = livetarget[5:] - if livetarget.startswith(dev_name): - log.info("%s looks to be the live device; ignoring" % (dev_name,)) - return True if os.path.exists("/sys/class/block/%s/device/model" %(dev_name,)): model = open("/sys/class/block/%s/device/model" %(dev_name,)).read() -- 1.6.2.5

3 2

[master] & [f12-branch] dracutSetupString changes
by David Cantrell 10 Oct '09

10 Oct '09

[NOTE: I am still working a lot on this code, but I wanted to send a first draft of patches to the list to get feedback from people. I am able to do installs of x86_64 rawhide with these changes. I do not have the DASD filter method done either, but you can see how that code is hooked up within the dracutSetupData stuff.] I've expanded the dracutSetupString code in anaconda to offer some more flexibility for picky kernel modules as well as adding in some support for option-specific data mangling if we need it. Many thanks to Hans for what he'd already implemented. It made expanding things quite easy. First, I've renamed dracutSetupString() to dracutSetupData(). These methods are now returning a list of dicts instead of just a string. The main motivation behind this is the complexities involved with the dasd kernel modules. We have device classes in storage/devices.py that know how to write a kernel parameter for themselves. The catch with dasd is that all of those parameters need to be combined in to a single dasd= parameter. I've tried to keep the code as generic and flexible as possible. The list of dicts returned by dracutSetupData: Each kernel parameter (e.g., 'acpi=off') is a dict. A dracutSetupData method can return multiple kernel parameters, hence the list of dicts. The dict for each kernel parameter at a minimum must contain two keys. The 'option' and 'value' keys. Pretty self explanatory. By storing the information this way, we avoid having to reparse strings later, which makes life easy for the combining step described below. The dicts may also store optional keys: combine If this exists and is True, booty will take all kernel parameters for this key (e.g., 'dasd') and combine the values in to one string. Use of this key requires the next key. delimiter A string holding the delimiter to use when combining all the values in to a single string. e.g., "," filter A callback function taking a list of values. If this key exists and combine is True, booty will call the filter function and pass it a list of all the values before they are combined in to a single string. This function needs to return a list of values. Use this to implement device-specific option filtering. For DASD, I am using this to reduce the list of DASD bus IDs to a range specification. DASD needs this to avoid incredibly long dasd= parameters when systems have thousands of DASDs configured. The way I've implemented the filter calls allows you to have multiple filters per kernel parameter. In booty/bootloaderInfo.py, you'll find the code that calls dracutSetupData and does all of the above. Each dracutSetupData method knows how to build the list of dicts so that booty can then act on it appropriately. Another catch with DASD is the need for *all* DASD bus IDs to be included in the dasd= parameter, regardless of whether or not they are used by the root device. If you don't include them all, the administrator will have to bring them up manually. To get around this problem, I added a property called forceDracut in storage/devices.py. It's False for everything except DASDDevice. Set it to True for force inclusion of dracutSetupData even if the device isn't used by the root device. Specific to DASD: During the 'Finding devices...' step in anaconda is when the kernel parameter information is collected. Values are read directly from sysfs. While we don't expose any method in anaconda for changing these settings now, users could theoretically change things using a %pre script in a kickstart file and this code would still pick up the user's settings. In the future I hope we can add an overwhelming and super confusing screen to let people configure the DASD parameters. Also, kickstart methods for changing those settings might be helpful. I don't know. But at least we can pick up the settings as they exist during installation and send them to dracut. Things remaining: * DASD value filtering method. * Patch for system-config-keyboard to change dracutSetupString to dracutSetupData like the other methods. That about covers these changes. Questions or comments are appreciated. Ideas I have thought about but didn't do anything about: * Kernel parameter ordering. Does this ever matter? * DASD global options such as nopav and nofcx, but that's a question for IBM. And by IBM, I mean Steffen. * Another one for IBM: Do we ever care about the autodetect or probeonly dasd parameters? My guess is no. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 24

[PATCH] Add MultipathDevice.updateSysfsPath()
by Peter Jones 09 Oct '09

09 Oct '09

MultipathDevice needs its own .updateSysfsPath(), because self.name is "mpath0" but the sysfs directory is /sys/class/block/dm-0 . Hopefully dm-${MINOR} is good enough. --- storage/devices.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index 3cc3aac..a0048f3 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2809,6 +2809,14 @@ class MultipathDevice(DiskDevice): self._isUp = False self._pyBlockMultiPath = None + def updateSysfsPath(self): + """ Update this device's sysfs path. """ + log_method_call(self, self.name, status=self.status) + path = os.path.join("/sys/class/block", "dm-%d" % \ + (self._pyBlockMultiPath.bdev.minor,)) + self.sysfsPath = os.path.realpath(path)[4:] + log.debug("%s sysfsPath set to %s" % (self.name, self.sysfsPath)) + class NoDevice(StorageDevice): """ A nodev device for nodev filesystems like tmpfs. """ _type = "nodev" -- 1.6.5.rc2

2 1

[PATCH] Reset PartitionDevice attributes after failed edit. (#498026)
by David Lehman 09 Oct '09

09 Oct '09

If we are editing, not creating, we overwite several attributes instead of creating a new device/action pair. Since these changes have no corresponding action they need to be reversed manually. --- iw/partition_gui.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index e295e92..085abe6 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -31,6 +31,7 @@ import gui import parted import string import types +import copy from constants import * import storage @@ -1118,8 +1119,9 @@ class PartitionWindow(InstallWindow): isNew = isNew, restrictfs = restrictfs) - while 1: - actions = parteditor.run() + while 1: + orig_device = copy.copy(device) + actions = parteditor.run() for action in actions: # XXX we should handle exceptions here @@ -1132,6 +1134,15 @@ class PartitionWindow(InstallWindow): for action in actions: self.anaconda.id.storage.devicetree.cancelAction(action) + # hack + if not isNew: + device.req_size = orig_device.req_size + device.req_base_size = orig_device.req_base_size + device.req_grow = orig_device.req_grow + device.req_max_size = orig_device.req_max_size + device.req_primary = orig_device.req_primary + device.req_disks = orig_device.req_disks + if self.refresh(): # this worked before and doesn't now... raise RuntimeError, ("Returning partitions to state " -- 1.6.0.6

2 1

[PATCH] Fix parsing of optional portnr in iscsi target IP (#525118)
by Hans de Goede 09 Oct '09

09 Oct '09

This patch fixes 2 issues with the parsing of the optional portnr in iscsi target IP's: 1) We don't want to include the : in the portno, so port = target[idx:] should be port = target[idx+1:] 2) An IPV6 IP always includes the : character, so specifying the port was mandatory with IPV6, this patch looks for "]:" inside the string to determine if a port is present for IPV6 strings. --- iw/autopart_type.py | 11 +++++++++-- textw/partition_text.py | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index e41f618..f07bccd 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -297,10 +297,17 @@ class PartitionTypeWindow(InstallWindow): err = None try: - idx = target.rfind(":") + count = len(target.split(":")) + idx = target.rfind("]:") + # Check for IPV6 [IPV6-ip]:port if idx != -1: + ip = target[1:idx] + port = target[idx+2:] + # Check for IPV4 aaa.bbb.ccc.ddd:port + elif count == 2: + idx = target.rfind(":") ip = target[:idx] - port = target[idx:] + port = target[idx+1:] else: ip = target port = "3260" diff --git a/textw/partition_text.py b/textw/partition_text.py index 412a7d7..0024505 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -260,10 +260,17 @@ class PartitionTypeWindow: target = entries[0].strip() try: - idx = target.rfind(":") + count = len(target.split(":")) + idx = target.rfind("]:") + # Check for IPV6 [IPV6-ip]:port if idx != -1: + ip = target[1:idx] + port = target[idx+2:] + # Check for IPV4 aaa.bbb.ccc.ddd:port + elif count == 2: + idx = target.rfind(":") ip = target[:idx] - port = target[idx:] + port = target[idx+1:] else: ip = target port = "3260" -- 1.6.5.rc2

2 1

[PATCH] Consider encryption when checking for duplicate mountpoint. (#526697)
by David Lehman 09 Oct '09

09 Oct '09

--- iw/lvm_dialog_gui.py | 5 ++++- iw/partition_dialog_gui.py | 5 ++++- iw/raid_dialog_gui.py | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index b481c40..a93a646 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -640,9 +640,12 @@ class VolumeGroupEditor: # we checked this VG's LVs above; now check the rest of # the devices in the tree mountdevs = self.lvs.values() + full_name = "%s-%s" % (self.vg.name, lv['name']) for (mp,d) in self.storage.mountpoints.iteritems(): if (d.type != "lvmlv" or d.vg.id != self.vg.id) and \ - mp == mountpoint: + mp == mountpoint and \ + not (isinstance(d, LUKSDevice) and + full_name in [d.name for d in dev.parents]): used = True break diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 5a9c19d..80affbd 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -115,7 +115,10 @@ class PartitionEditor: if mountpoint: used = False for (mp, dev) in self.storage.mountpoints.iteritems(): - if mp == mountpoint and dev.id != self.origrequest.id: + if mp == mountpoint and \ + dev.id != self.origrequest.id and \ + not (self.origrequest.format.type == "luks" and + self.origrequest in dev.parents): used = True break diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 0910a97..a256969 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -169,7 +169,10 @@ class RaidEditor: if mountpoint: used = False for (mp, dev) in self.storage.mountpoints.iteritems(): - if mp == mountpoint and dev.id != self.origrequest.id: + if mp == mountpoint and \ + dev.id != self.origrequest.id and \ + not (self.origrequest.format.type == "luks" and + self.origrequest in dev.parents): used = True break -- 1.6.2.5

2 1

[PATCH] Do not show the VNC-over-text question, when there is not enough memory for GUI (#527979)
by Martin Sivak 09 Oct '09

09 Oct '09

--- anaconda | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/anaconda b/anaconda index 84dbbb7..6b01ed0 100755 --- a/anaconda +++ b/anaconda @@ -774,6 +774,11 @@ if __name__ == "__main__": # if not opts.display_mode: opts.display_mode = 'g' + + # disable VNC over text question when not enough memory is available + if iutil.memInstalled() < isys.MIN_GUI_RAM: + flags.vncquestion = False + if opts.display_mode == 't' and flags.vncquestion: #we prefer vnc over text mode, so ask about that title = _("Would you like to use VNC?") -- 1.6.4.4

2 1

[PATCH] Fix filtering out of 'Sending translation for' log messages in bumpver.
by Radek Vykydal 08 Oct '09

08 Oct '09

I hit it in the last build that I've done where the filtering was introduced (and I have to add that I also acked the original patch). --- Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index dac4335..dc345e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,7 +114,7 @@ rpmlog: @git log --pretty="format:- %s (%ae)" \ $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE).. | \ sed -e 's/@.*)/)/' | sed -e 's/%/%%/g' | \ - grep -v "- Sending translation for " + grep -v -- "- Sending translation for " @echo bumpver: -- 1.6.0.6

3 2

[PATCH] Use addUdevPartitionDevice() for adding dmraid / multipath partitions (#527785)
by Hans de Goede 08 Oct '09

08 Oct '09

With a kickstart install, with "clearpart --label", we will end up scanning pre-existing partitions after clearing the label. This leads to the backtrace as seen in #527785 and #526517. addUdevPartitionDevice() has special handling for this case, instead of copy and pasting this, this patch modifies addUdevPartitionDevice() so that it can be used for dmraid and multipath partitions too. --- storage/devicetree.py | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/storage/devicetree.py b/storage/devicetree.py index cce8013..6df57cf 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -1032,21 +1032,11 @@ class DeviceTree(object): if udev_device_is_multipath_partition(info, self): diskname = udev_device_get_multipath_partition_disk(info) disk = self.getDeviceByName(diskname) - device = PartitionDevice(name, sysfsPath=sysfs_path, - major=udev_device_get_major(info), - minor=udev_device_get_minor(info), - exists=True, parents=[disk]) + return self.addUdevPartitionDevice(info, disk=disk) elif udev_device_is_dmraid_partition(info, self): diskname = udev_device_get_dmraid_partition_disk(info) disk = self.getDeviceByName(diskname) - device = PartitionDevice(name, sysfsPath=sysfs_path, - major=udev_device_get_major(info), - minor=udev_device_get_minor(info), - exists=True, parents=[disk]) - if not device is None: - # DWL FIXME: call self.addUdevPartitionDevice here instead - self._addDevice(device) - + return self.addUdevPartitionDevice(info, disk=disk) # if we get here, we found all of the slave devices and # something must be wrong -- if all of the slaves are in @@ -1114,16 +1104,17 @@ class DeviceTree(object): return device - def addUdevPartitionDevice(self, info): + def addUdevPartitionDevice(self, info, disk=None): name = udev_device_get_name(info) log_method_call(self, name=name) uuid = udev_device_get_uuid(info) sysfs_path = udev_device_get_sysfs_path(info) device = None - disk_name = os.path.basename(os.path.dirname(sysfs_path)) - disk_name = disk_name.replace('!','/') - disk = self.getDeviceByName(disk_name) + if disk is None: + disk_name = os.path.basename(os.path.dirname(sysfs_path)) + disk_name = disk_name.replace('!','/') + disk = self.getDeviceByName(disk_name) if disk is None: # create a device instance for the disk -- 1.6.5.rc2

2 1

[PATCH 1/2] Reset parted flags in createFormat not destroyFormat
by Hans de Goede 08 Oct '09

08 Oct '09

We were resetting the parted flags for re-use of existing partitions in destroyFormat, but this assumes that the existing partition actually has a type in the partition table matching its current formatting, this has 2 problems: 1: If the partition has a type which needs to have flags reset to become the correct type for the new format (for example swap -> ext2), but it is not formatted, the flags wont get reset 2: If the partition has a type which does not match the formatting (for example type linux raid, formatting ext2), the flags won't get reset This patch moves the resetting of the flags to the creation of the new format, and resets all flags except for the one for the to be created format (and boot and lba which are special). --- storage/deviceaction.py | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/storage/deviceaction.py b/storage/deviceaction.py index c6952f3..15f46b7 100644 --- a/storage/deviceaction.py +++ b/storage/deviceaction.py @@ -26,6 +26,7 @@ from udev import * from devices import StorageDevice, PartitionDevice from formats import getFormat from errors import * +from parted import partitionFlag, PARTITION_BOOT, PARTITION_LBA import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -263,9 +264,17 @@ class ActionCreateFormat(DeviceAction): self.device.setup() if isinstance(self.device, PartitionDevice): + # Flags which are truely flags, not types, so we shouldn't reset + reallyFlags = [ PARTITION_BOOT, PARTITION_LBA ] + for flag in partitionFlag.keys(): + if flag in reallyFlags or flag == self.format.partedFlag: + continue + self.device.unsetFlag(flag) + if self.format.partedFlag is not None: self.device.setFlag(self.format.partedFlag) - self.device.disk.format.commitToDisk() + + self.device.disk.format.commitToDisk() self.device.format.create(intf=intf, device=self.device.path, @@ -299,13 +308,6 @@ class ActionDestroyFormat(DeviceAction): """ wipe the filesystem signature from the device """ if self.origFormat: self.device.setup() - - if isinstance(self.device, PartitionDevice) and \ - self.origFormat.partedFlag is not None: - # unset partition flags and commit - self.device.unsetFlag(self.origFormat.partedFlag) - self.device.disk.format.commitToDisk() - self.origFormat.destroy() udev_settle() self.device.teardown() -- 1.6.5.rc2

3 5

[PATCH f12-branch] Reset parted flags in createFormat not destroyFormat
by Hans de Goede 08 Oct '09

08 Oct '09

We were resetting the parted flags for re-use of existing partitions in destroyFormat, but this assumes that the existing partition actually has a type in the partition table matching its current formatting, this has 2 problems: 1: If the partition has a type which needs to have flags reset to become the correct type for the new format (for example swap -> ext2), but it is not formatted, the flags wont get reset 2: If the partition has a type which does not match the formatting (for example type linux raid, formatting ext2), the flags won't get reset This patch moves the resetting of the flags to the creation of the new format, and resets all flags except for the one for the to be created format (and boot and lba which are special). For the F-12 branch this also has the benefit that the resetting of the flags happens at all, as there the resetting was happening on a deep copy of the device (and thus the label) and never actually got written to the disk. --- storage/deviceaction.py | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/storage/deviceaction.py b/storage/deviceaction.py index a01ee41..1f8d5a7 100644 --- a/storage/deviceaction.py +++ b/storage/deviceaction.py @@ -28,6 +28,7 @@ from udev import * from devices import StorageDevice, PartitionDevice from formats import getFormat from errors import * +from parted import partitionFlag, PARTITION_BOOT, PARTITION_LBA import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -265,9 +266,17 @@ class ActionCreateFormat(DeviceAction): self.device.setup() if isinstance(self.device, PartitionDevice): + # Flags which are truely flags, not types, so we shouldn't reset + reallyFlags = [ PARTITION_BOOT, PARTITION_LBA ] + for flag in partitionFlag.keys(): + if flag in reallyFlags or flag == self.format.partedFlag: + continue + self.device.unsetFlag(flag) + if self.format.partedFlag is not None: self.device.setFlag(self.format.partedFlag) - self.device.disk.format.commitToDisk() + + self.device.disk.format.commitToDisk() self.device.format.create(intf=intf, device=self.device.path, @@ -310,13 +319,6 @@ class ActionDestroyFormat(DeviceAction): # since then (most notably, formats removed by this very # class' constructor) self._device.setup() - - if isinstance(self._device, PartitionDevice) and \ - self.origFormat.partedFlag is not None: - # unset partition flags and commit - self._device.unsetFlag(self.origFormat.partedFlag) - self._device.disk.format.commitToDisk() - self.origFormat.destroy() udev_settle() self._device.teardown() -- 1.6.5.rc2

2 1

Repeated setup / teardown of dmraid arrays as done in master has issues
by Hans de Goede 08 Oct '09

08 Oct '09

Hi, The master branch has this piece of code, causing dmraid arrays to potentially be brought down and then up again when executing actions: def processActions(self, dryRun=None): <snip> for action in self._actions: log.info("executing action: %s" % action) if not dryRun: try: action.execute(intf=self.intf) except DiskLabelCommitError: # it's likely that a previous format destroy action # triggered setup of an lvm or md device. self.teardownAll() action.execute(intf=self.intf) udev_settle(timeout=10) This is a problem as pyblock does the following when bringing up a set: 1) Add a device map for the set, remember the set map 2) Read partition table from the map for the set 3) Create device maps for the partitions, remember them And then when bringing down a set: 1) Remove device maps for the partitions as remembered 2) Remove device map for the set Now when the set gets brought down after some actions have been executed, 1) from the pyblock teardown may fail, as the partition table may have been modified and parted's commit_to_os will update the partition device maps when this happens. This means some of the partition maps pyblock tries to remove may no longer be there, causing a backtrace. Or there might be more maps then it has remembered, and then 2) will fail as the set map is still busy There are 2 solutions to this: 1) Stop the ping pong up down of BIOS RAID sets, there is no need for this, we dont go unload / reload sd_mod either (I know it aint modular anymore). BIOS RAID sets are really just plain disks, and we already acknowledge this by hiding the real disks and only showing / using the set. Please lets just stop this ping pong. While testing dmraid with F-12 yesterday for the first time in a while I found and fixed 3 separate bugs all triggered by this ping ponging. 2 of which where dmraid specific and would have not been an issue if not for this ping ponging. 2) Let pyblock re-read the partition table on teardown, and let it create and remove mappings based on the current state of the partition table. This could be rather tricky though. In case it is not clear already I greatly prefer solution 1. Regards, Hans

2 2

[PATCH] Fix a segfault when stage2= boot parameter and kickstart url method is used (#524417).
by Radek Vykydal 08 Oct '09

08 Oct '09

Concerns cases when stage2= can't be parsed as http or ftp url. I am resending new version of a patch for F12Blocker (it is also attached to my reply to clumen's review. (https://www.redhat.com/archives/anaconda-devel-list/2009-September/msg00508…) --- loader/urlinstall.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/loader/urlinstall.c b/loader/urlinstall.c index 150800e..57b9bc2 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -463,9 +463,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, } /* determine install type */ - if (strstr(url, "http://") || strstr(url, "ftp://")) - loaderData->method = METHOD_URL; - else { + if (!strstr(url, "http://") && !strstr(url, "ftp://")) { newtWinMessage(_("Kickstart Error"), _("OK"), _("Unknown Url method %s"), url); return; @@ -479,6 +477,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, return; ((struct urlInstallData *)loaderData->stage2Data)->url = url; + loaderData->method = METHOD_URL; } logMessage(INFO, "results of url ks, url %s", url); -- 1.6.0.6

2 1

[PATCH] Run implantisomd5 on boot.iso on x86. (bz#526902)
by Peter Jones 08 Oct '09

08 Oct '09

We're doing this on other architectures but not here, and we prompt to run mediacheck on the disc, so we ought to be checksumming it. --- scripts/mk-images.x86 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 93b7a64..7495ad4 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -177,5 +177,6 @@ doPostImages() { if [ -x /usr/bin/isohybrid ]; then isohybrid $TOPDESTPATH/images/$BOOTISO || echo "Unable to make hybrid boot.iso" fi + implantisomd5 $TOPDESTPATH/images/$BOOTISO fi } -- 1.6.4.4

2 1

[PATCH] Stop trying to run xrandr (#527678).
by Chris Lumens 08 Oct '09

08 Oct '09

This has only rarely worked, and hasn't at all in quite a long time. What we really need to do is redesign the UI so it fits the screen appropriately instead of pushing X around to do what we want. --- anaconda | 13 ------------- scripts/upd-instroot | 1 - 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/anaconda b/anaconda index 8f67807..84dbbb7 100755 --- a/anaconda +++ b/anaconda @@ -82,19 +82,6 @@ def doStartupX11Actions(runres="800x600"): miniwm_pid = None log.error("Unable to start mini-wm") - # cant do this if miniwm didnt run because otherwise when - # we open and close an X connection in the xutils calls - # the X server will exit since this is the first X - # connection (if miniwm isnt running) - if miniwm_pid is not None and not flags.usevnc: - try: - iutil.execWithRedirect("xrandr", ["-s", runres, "--dpi", "96"], - searchPath=1, stdout="/dev/tty5", - stderr="/dev/tty5") - except Exception, e: - log.error("Exception when running xrandr: %s" % str(e)) - - if miniwm_pid is not None: import xutils import gtk diff --git a/scripts/upd-instroot b/scripts/upd-instroot index a1dff17..64017d1 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -524,7 +524,6 @@ usr/bin/vncconfig usr/bin/vncpasswd usr/bin/wget usr/bin/xkbcomp -usr/bin/xrandr usr/bin/zenity usr/lib/anaconda usr/lib/anaconda-runtime -- 1.6.4.2

3 3

Re: [PATCH 1/2] Reset parted flags in createFormat not destroyFormat
by Martin Sivak 08 Oct '09

08 Oct '09

If I understand it correctly, this makes sense and actually fixes one of my older bugs.. Martin ----- "Hans de Goede" <hdegoede(a)redhat.com> wrote: > We were resetting the parted flags for re-use of existing partitions > in > destroyFormat, but this assumes that the existing partition actually > has > a type in the partition table matching its current formatting, this > has 2 > problems: > 1: If the partition has a type which needs to have flags reset to > become > the correct type for the new format (for example swap -> ext2), but > it > is not formatted, the flags wont get reset > 2: If the partition has a type which does not match the formatting > (for > example type linux raid, formatting ext2), the flags won't get > reset > > This patch moves the resetting of the flags to the creation of the > new > format, and resets all flags except for the one for the to be created > format (and boot and lba which are special). > --- > storage/deviceaction.py | 18 ++++++++++-------- > 1 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/storage/deviceaction.py b/storage/deviceaction.py > index c6952f3..15f46b7 100644 > --- a/storage/deviceaction.py > +++ b/storage/deviceaction.py > @@ -26,6 +26,7 @@ from udev import * > from devices import StorageDevice, PartitionDevice > from formats import getFormat > from errors import * > +from parted import partitionFlag, PARTITION_BOOT, PARTITION_LBA > > import gettext > _ = lambda x: gettext.ldgettext("anaconda", x) > @@ -263,9 +264,17 @@ class ActionCreateFormat(DeviceAction): > self.device.setup() > > if isinstance(self.device, PartitionDevice): > + # Flags which are truely flags, not types, so we > shouldn't reset > + reallyFlags = [ PARTITION_BOOT, PARTITION_LBA ] > + for flag in partitionFlag.keys(): > + if flag in reallyFlags or flag == > self.format.partedFlag: > + continue > + self.device.unsetFlag(flag) > + > if self.format.partedFlag is not None: > self.device.setFlag(self.format.partedFlag) > - self.device.disk.format.commitToDisk() > + > + self.device.disk.format.commitToDisk() > > self.device.format.create(intf=intf, > device=self.device.path, > @@ -299,13 +308,6 @@ class ActionDestroyFormat(DeviceAction): > """ wipe the filesystem signature from the device """ > if self.origFormat: > self.device.setup() > - > - if isinstance(self.device, PartitionDevice) and \ > - self.origFormat.partedFlag is not None: > - # unset partition flags and commit > - self.device.unsetFlag(self.origFormat.partedFlag) > - self.device.disk.format.commitToDisk() > - > self.origFormat.destroy() > udev_settle() > self.device.teardown() > -- > 1.6.5.rc2 > > _______________________________________________ > Anaconda-devel-list mailing list > Anaconda-devel-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/anaconda-devel-list

1 0

Repeated setup / teardown of dmraid arrays as done in master has issues
by Hans de Goede 08 Oct '09

08 Oct '09

Hi, The master branch has this piece of code, causing dmraid arrays to potentially be brought down and then up again when executing actions: def processActions(self, dryRun=None): <snip> for action in self._actions: log.info("executing action: %s" % action) if not dryRun: try: action.execute(intf=self.intf) except DiskLabelCommitError: # it's likely that a previous format destroy action # triggered setup of an lvm or md device. self.teardownAll() action.execute(intf=self.intf) udev_settle(timeout=10) This is a problem as pyblock does the following when bringing up a set: 1) Add a device map for the set, remember the set map 2) Read partition table from the map for the set 3) Create device maps for the partitions, remember them And then when bringing down a set: 1) Remove device maps for the partitions as remembered 2) Remove device map for the set Now when the set gets brought down after some actions have been executed, 1) from the pyblock teardown may fail, as the partition table may have been modified and parted's commit_to_os will update the partition device maps when this happens. This means some of the partition maps pyblock tries to remove may no longer be there, causing a backtrace. Or there might be more maps then it has remembered, and then 2) will fail as the set map is still busy There are 2 solutions to this: 1) Stop the ping pong up down of BIOS RAID sets, there is no need for this, we dont go unload / reload sd_mod either (I know it aint modular anymore). BIOS RAID sets are really just plain disks, and we already acknowledge this by hiding the real disks and only showing / using the set. Please lets just stop this ping pong. While testing dmraid with F-12 yesterday for the first time in a while I found and fixed 3 separate bugs all triggered by this ping ponging. 2 of which where dmraid specific and would have not been an issue if not for this ping ponging. 2) Let pyblock re-read the partition table on teardown, and let it create and remove mappings based on the current state of the partition table. This could be rather tricky though. In case it is not clear already I greatly prefer solution 1. Regards, Hans

1 0

[PATCH] Override fstabSpec in PartitionDevice for by-path DASD (#526364).
by David Cantrell 08 Oct '09

08 Oct '09

If the partition is on a DASD disk, write out the /dev/disk/by-path/... value to the /etc/fstab file rather than a UUID= line. --- storage/devices.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index 61a0b67..3cc3aac 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -993,6 +993,15 @@ class PartitionDevice(StorageDevice): return (self.partType is not None and self.partType & parted.PARTITION_PROTECTED) + @property + def fstabSpec(self): + spec = self.path + if self.disk and self.disk.type == 'dasd': + spec = deviceNameToDiskByPath(self.path) + elif self.format and self.format.uuid: + spec = "UUID=%s" % self.format.uuid + return spec + def _getPartedPartition(self): if not self.exists: return self._partedPartition -- 1.6.2.5

3 2

[PATCH 1/2] Action...Format setup device before modifying the partition table
by Hans de Goede 07 Oct '09

07 Oct '09

--- storage/deviceaction.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/storage/deviceaction.py b/storage/deviceaction.py index 7e73dfb..c6952f3 100644 --- a/storage/deviceaction.py +++ b/storage/deviceaction.py @@ -260,12 +260,13 @@ class ActionCreateFormat(DeviceAction): self.origFormat = getFormat(None) def execute(self, intf=None): + self.device.setup() + if isinstance(self.device, PartitionDevice): if self.format.partedFlag is not None: self.device.setFlag(self.format.partedFlag) self.device.disk.format.commitToDisk() - self.device.setup() self.device.format.create(intf=intf, device=self.device.path, options=self.device.formatArgs) @@ -297,13 +298,14 @@ class ActionDestroyFormat(DeviceAction): def execute(self, intf=None): """ wipe the filesystem signature from the device """ if self.origFormat: + self.device.setup() + if isinstance(self.device, PartitionDevice) and \ self.origFormat.partedFlag is not None: # unset partition flags and commit self.device.unsetFlag(self.origFormat.partedFlag) self.device.disk.format.commitToDisk() - self.device.setup() self.origFormat.destroy() udev_settle() self.device.teardown() -- 1.6.5.rc2

2 3

Re: [PATCH] Fix parsing of optional portnr in iscsi target IP (#525118)
by Martin Sivak 07 Oct '09

07 Oct '09

Hi Hans, Have you considered the :: abbreviation in ipv6 addresses? (2001:dead::1/XY) Also what about the transitional AABB:CCDD:EEFF:GGHH:IIJJ:KKLL:111.222.333.444 format? Martin ----- "Hans de Goede" <hdegoede(a)redhat.com> wrote: > This patch fixes 2 issues with the parsing of the optional portnr in > iscsi target IP's: > 1) We don't want to include the : in the portno, so port = > target[idx:] > should be port = target[idx+1:] > 2) An IPV6 IP always includes the : character, so specifying the port > was mandatory with IPV6, this patch counts the number of : inside > the > string to determine if a port is present for IPV6 strings. > > This patch is meant for both F-12 and F-13 > --- > iw/autopart_type.py | 7 ++++--- > textw/partition_text.py | 7 ++++--- > 2 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/iw/autopart_type.py b/iw/autopart_type.py > index e41f618..2b22c64 100644 > --- a/iw/autopart_type.py > +++ b/iw/autopart_type.py > @@ -297,10 +297,11 @@ class PartitionTypeWindow(InstallWindow): > > err = None > try: > - idx = target.rfind(":") > - if idx != -1: > + count = len(target.split(":")) > + if count == 2 or count == 9: > + idx = target.rfind(":") > ip = target[:idx] > - port = target[idx:] > + port = target[idx+1:] > else: > ip = target > port = "3260" > diff --git a/textw/partition_text.py b/textw/partition_text.py > index 412a7d7..bb70922 100644 > --- a/textw/partition_text.py > +++ b/textw/partition_text.py > @@ -260,10 +260,11 @@ class PartitionTypeWindow: > > target = entries[0].strip() > try: > - idx = target.rfind(":") > - if idx != -1: > + count = len(target.split(":")) > + if count == 2 or count == 9: > + idx = target.rfind(":") > ip = target[:idx] > - port = target[idx:] > + port = target[idx+1:] > else: > ip = target > port = "3260" > -- > 1.6.5.rc2 > > _______________________________________________ > Anaconda-devel-list mailing list > Anaconda-devel-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/anaconda-devel-list

2 1

[PATCH] implantisomd5 for boot.iso on x86/x86_64
by Dennis Gregorovic 07 Oct '09

07 Oct '09

Currently, boot.iso on ppc gets an implanted md5sum, but not on x86 or x86_64. The attached patch fixes that. Cheers -- Dennis

1 0

[PATCH] ActionDestroyFormat setup device before modifying the partition table
by Hans de Goede 07 Oct '09

07 Oct '09

--- storage/deviceaction.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/storage/deviceaction.py b/storage/deviceaction.py index 7e73dfb..44ba8a6 100644 --- a/storage/deviceaction.py +++ b/storage/deviceaction.py @@ -297,13 +297,14 @@ class ActionDestroyFormat(DeviceAction): def execute(self, intf=None): """ wipe the filesystem signature from the device """ if self.origFormat: + self.device.setup() + if isinstance(self.device, PartitionDevice) and \ self.origFormat.partedFlag is not None: # unset partition flags and commit self.device.unsetFlag(self.origFormat.partedFlag) self.device.disk.format.commitToDisk() - self.device.setup() self.origFormat.destroy() udev_settle() self.device.teardown() -- 1.6.5.rc2

2 1

[PATCH f12-branch] ActionDestroyFormat setup device before modifying the partition table
by Hans de Goede 07 Oct '09

07 Oct '09

--- storage/deviceaction.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/storage/deviceaction.py b/storage/deviceaction.py index 0b34555..8901e50 100644 --- a/storage/deviceaction.py +++ b/storage/deviceaction.py @@ -304,17 +304,18 @@ class ActionDestroyFormat(DeviceAction): def execute(self, intf=None): """ wipe the filesystem signature from the device """ if self.origFormat: + # set up our copy of the original device stack since the + # reference we got may have had any number of things changed + # since then (most notably, formats removed by this very + # class' constructor) + self._device.setup() + if isinstance(self._device, PartitionDevice) and \ self.origFormat.partedFlag is not None: # unset partition flags and commit self._device.unsetFlag(self.origFormat.partedFlag) self._device.disk.format.commitToDisk() - # set up our copy of the original device stack since the - # reference we got may have had any number of things changed - # since then (most notably, formats removed by this very - # class' constructor) - self._device.setup() self.origFormat.destroy() udev_settle() self._device.teardown() -- 1.6.5.rc2

2 1

[PATCH] (master) Fix grub stage1 installation for /boot on md raid1.
by Radek Vykydal 07 Oct '09

07 Oct '09

From: David Cantrell <dcantrell(a)redhat.com> This is a patch to fix installation of grub in case we have md raid 1 /boot device. I posted similar patch some time ago, Hans reviewed it, but it didn't gather much attention so I was afraid to push it - it changes behavior. Now I decided to do things a bit differently. Also, some weeks ago Hans has pushed a patch fixing bootloader target selection for mdraid (commit 45a7048e5f56316e052e4699b5ec70aa291ddd5e) upon which my patch is standing. So here I come again (sorry for repeating myself). We offer installation into mbr or boot partition (/dev/mdX) in UI. In F11 and RHEL5 if md boot partition was on /dev/sda1 and /dev/sdb1, in case of "mbr" we installed grub twice into mbr of /dev/sda, and in case of "partition" into mbr of /dev/sda and /dev/sdb. Member drive removal in the second case didn't work I think (no boot). Hans's patch changed the behavior (it was expected) - we are really installing bootloader into boot device if /dev/mdX is selected, and if mbr is selected, we are installing twice into mbr of selected drive as before. My patch wants to make it behave "the right" way, that is - install where you were asked to, and be able to boot when one member disk is removed (see bug https://bugzilla.redhat.com/show_bug.cgi?id=213578) so: A) In case of installing into boot partition: install it there in a way that the boot works if one member is removed. B) In case of installing into mbr: iff the disk contains member of boot md array, install also into mbrs of other members. If one member is removed, be able to boot - this is fixed by the patch. Note: I'd like to fix upgrade of grub part too, especially when now the behavior has changed wrt what we write out in grub.conf and /etc/sysconfig/grub. Also UI can writing for mbr could say that we'd install into mbr of other member disks too (if it is the case) If you want details, below are some cases that illustrate the change (also the code may be hard to follow for given case, I can post a test script using which you can get resulting grub input for given case) 1) sda, sdb, install to mbr, /boot is sdb1 works both with and without the patch, the same grub commands are run 2) sda, sdb, sdc, install to mbr of sda, /boot is mdarray of sdb3 and sdc3 without the patch: - boots with both disks, doesn't if any is removed - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd0,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,2)/grub/grub.conf grub> Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd1,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd1,2)/grub/grub.conf grub> both disks - OK 2nd disk removed - OK 1st disk removed - OK with the patch: - boots even when any of member disks is removed - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd1,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd1,2)/grub/grub.conf grub> 3) sda, sdb, install to mbr of sda, /boot is mdarray of sda3 and sdb3 without patch: - it boots with both disks, doesn't find stage1 (_ on screen) if any of them is removed - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd1,1) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd1,1)/grub/grub.conf grub> Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd2,1) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd2,1)/grub/grub.conf grub> with the patch: - boots even when one of member disks is removed - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> device (hd0) /dev/sdb grub> root (hd0,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,2)/grub/grub.conf grub> Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd0,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,2)/grub/grub.conf grub> 4) like 3), but /boot is mdarray of sda3 and sdb2 - notice different partition numbers - removing a specific one of member disks can't work as location of grub.conf file stored in first block of stage2 is shared and so contains only the last grub-installed value. without the patch: - doesn't boot with both disks, doesn't boot with any single disk - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd0,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,2)/grub/grub.conf grub> Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd1,1) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd1,1)/grub/grub.conf grub> with the patch: - boots when one second disk is removed, not when the first one is removed (in the sense of boot order) - log: Running... ['/sbin/grub-install', '--just-copy'] Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> device (hd0) /dev/sdb grub> root (hd0,1) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,1)/grub/grub.conf grub> Running... ['/sbin/grub', '--batch', '--no-floppy', '--device-map=/boot/grub/device.map'] GNU GRUB version 0.97 (640K lower / 3072K upper memory) [ Minimal BASH-like line editing is supported. For the first word, TAB lists possible command completions. Anywhere else TAB lists the possible completions of a device/filename.] grub> root (hd0,2) Filesystem type is ext2fs, partition type 0xfd grub> install --stage2=/boot/grub/stage2 /grub/stage1 d (hd0) /grub/stage2 p (hd0,2)/grub/grub.conf grub> --- booty/bootloaderInfo.py | 2 +- booty/x86.py | 125 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 95 insertions(+), 32 deletions(-) diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index f67083f..4919cf3 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -628,7 +628,7 @@ class efiBootloaderInfo(bootloaderInfo): stderr = "/dev/tty5") return rc - def installGrub(self, instRoot, bootDevs, grubTarget, grubPath, + def installGrub(self, instRoot, bootDev, grubTarget, grubPath, target, cfPath): if not iutil.isEfi(): raise EnvironmentError diff --git a/booty/x86.py b/booty/x86.py index ececf0f..69b6b86 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -99,34 +99,106 @@ class x86BootloaderInfo(efiBootloaderInfo): if rc: return rc - def installGrub(self, instRoot, bootDevs, grubTarget, grubPath, + def matchingBootTargets(self, stage1Devs, bootDevs): + matches = [] + for stage1Dev in stage1Devs: + for mdBootPart in bootDevs: + if getDiskPart(stage1Dev, self.storage)[0] == getDiskPart(mdBootPart, self.storage)[0]: + matches.append((stage1Dev, mdBootPart)) + return matches + + def addMemberMbrs(self, matches, bootDevs): + updatedMatches = list(matches) + bootDevsHavingStage1Dev = [match[1] for match in matches] + for mdBootPart in bootDevs: + if mdBootPart not in bootDevsHavingStage1Dev: + updatedMatches.append((getDiskPart(mdBootPart, self.storage)[0], mdBootPart)) + return updatedMatches + + def installGrub(self, instRoot, bootDev, grubTarget, grubPath, target, cfPath): if iutil.isEfi(): - return efiBootloaderInfo.installGrub(self, instRoot, bootDevs, grubTarget, + return efiBootloaderInfo.installGrub(self, instRoot, bootDev, grubTarget, grubPath, target, cfPath) args = "--stage2=/boot/grub/stage2 " - for bootDev in bootDevs: - cmds = [] - gtPart = self.getMatchingPart(bootDev, grubTarget) - gtDisk = self.grubbyPartitionName(getDiskPart(gtPart, self.storage)[0]) - bPart = self.grubbyPartitionName(bootDev) - cmd = "root %s\n" % (bPart,) + stage1Devs = self.getPhysicalDevices(grubTarget) + bootDevs = self.getPhysicalDevices(bootDev.name) - stage1Target = gtDisk - if target == "partition": - stage1Target = self.grubbyPartitionName(gtPart) + installs = [(None, + self.grubbyPartitionName(stage1Devs[0]), + self.grubbyPartitionName(bootDevs[0]))] + + if bootDev.type == "mdarray": + + matches = self.matchingBootTargets(stage1Devs, bootDevs) + + # If the stage1 target disk contains member of boot raid array (mbr + # case) or stage1 target partition is member of boot raid array + # (partition case) + if matches: + # 1) install stage1 on target disk/partiton + stage1Dev, mdMemberBootPart = matches[0] + installs = [(None, + self.grubbyPartitionName(stage1Dev), + self.grubbyPartitionName(mdMemberBootPart))] + firstMdMemberDiskGrubbyName = self.grubbyDiskName(getDiskPart(stage1Dev, self.storage)[0]) + + # 2) and install stage1 on other members' disks/partitions too + # NOTES: + # - the goal is to be able to boot after a members' disk removal + # - so we have to use grub device names as if after removal + # (i.e. the same disk name (e.g. (hd0)) for both member disks) + # - if member partitions have different numbers only removal of + # specific one of members will work because stage2 containing + # reference to config file is shared and therefore can contain + # only one value + + # if target is mbr, we want to install also to mbr of other + # members, so extend the matching list + matches = self.addMemberMbrs(matches, bootDevs) + for stage1Target, mdMemberBootPart in matches[1:]: + # prepare special device mapping corresponding to member removal + mdMemberBootDisk = getDiskPart(mdMemberBootPart, self.storage)[0] + # It can happen due to ks --driveorder option, but is it ok? + if not mdMemberBootDisk in self.drivelist: + continue + mdRaidDeviceRemap = (firstMdMemberDiskGrubbyName, + mdMemberBootDisk) + + stage1TargetGrubbyName = self.grubbyPartitionName(stage1Target) + rootPartGrubbyName = self.grubbyPartitionName(mdMemberBootPart) + + # now replace grub disk name part according to special device + # mapping + old = self.grubbyDiskName(mdMemberBootDisk).strip('() ') + new = firstMdMemberDiskGrubbyName.strip('() ') + rootPartGrubbyName = rootPartGrubbyName.replace(old, new) + stage1TargetGrubbyName = stage1TargetGrubbyName.replace(old, new) + + installs.append((mdRaidDeviceRemap, + stage1TargetGrubbyName, + rootPartGrubbyName)) + + # This is needed for case when /boot member partitions have + # different numbers. Shared stage2 can contain only one reference + # to grub.conf file, so let's ensure that it is reference to partition + # on disk which we will boot from - that is, install grub to + # this disk as last so that its reference is not overwritten. + installs.reverse() + cmds = [] + for mdRaidDeviceRemap, stage1Target, rootPart in installs: + if mdRaidDeviceRemap: + cmd = "device (%s) /dev/%s\n" % tuple(mdRaidDeviceRemap) + else: + cmd = '' + cmd += "root %s\n" % (rootPart,) cmd += "install %s%s/stage1 d %s %s/stage2 p %s%s/grub.conf" % \ - (args, grubPath, stage1Target, grubPath, bPart, grubPath) + (args, grubPath, stage1Target, grubPath, rootPart, grubPath) cmds.append(cmd) - - rc = self.runGrubInstall(instRoot, bootDev, cmds, cfPath) - if rc: - return rc - - return 0 + return self.runGrubInstall(instRoot, bootDev.name, cmds, cfPath) def writeGrub(self, instRoot, bl, kernelList, chainList, defaultDev, justConfigFile): @@ -165,7 +237,7 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write("# all kernel and initrd paths are relative " "to /boot/, eg.\n") except KeyError: - bootDev = self.storage.rootDevice + bootDev = rootDev grubPath = "/boot/grub" cfPath = "/boot/" f.write("# NOTICE: You do not have a /boot partition. " @@ -347,20 +419,11 @@ class x86BootloaderInfo(efiBootloaderInfo): f.close() if not justConfigFile: - return self.installGrub(instRoot, bootDevs, grubTarget, grubPath, - target, cfPath) + return self.installGrub(instRoot, bootDev, grubTarget, grubPath, + target, cfPath) 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 2

[PATCH] When lookup a PartedDevice also check for _ped.DeviceException (#527699)
by Hans de Goede 07 Oct '09

07 Oct '09

The machine in #527699 has one seriously broken disk, this causes (py)parted to throw a different exception type when looking up the device this patch catches this exception too (which will result in the disk being handled as a removeable disk (ie cardreader) with no media present, causing us to ignore it. --- storage/devices.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index c0d8197..4fb1158 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -477,7 +477,7 @@ class StorageDevice(Device): # to find a device. try: self._partedDevice = parted.Device(path=self.path) - except _ped.IOException: + except (_ped.IOException, _ped.DeviceException): pass return self._partedDevice -- 1.6.5.rc2

2 1

[PATCH] Only initialize escrow packet code if there's devices that need it (#527668).
by Chris Lumens 07 Oct '09

07 Oct '09

--- storage/__init__.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/storage/__init__.py b/storage/__init__.py index 0f71d3c..54fec41 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -171,6 +171,12 @@ def storageComplete(anaconda): return DISPATCH_BACK def writeEscrowPackets(anaconda): + escrowDevices = map(lambda d: d.format.type == "luks" and not d.format.escrow_cert, + anaconda.id.storage.devices) + + if not escrowDevices: + return + log.debug("escrow: writeEscrowPackets start") wait_win = anaconda.intf.waitWindow(_("Running..."), @@ -180,13 +186,11 @@ def writeEscrowPackets(anaconda): backupPassphrase = generateBackupPassphrase() try: - for device in anaconda.id.storage.devices: + for device in escrowDevices: log.debug("escrow: device %s: %s" % (repr(device.path), repr(device.format.type))) - if (device.format.type == "luks" and - device.format.escrow_cert is not None): - device.format.escrow(anaconda.rootPath + "/root", - backupPassphrase) + device.format.escrow(anaconda.rootPath + "/root", + backupPassphrase) wait_win.pop() except (IOError, RuntimeError) as e: -- 1.6.4.2

2 2

[PATCH pyblock 1/2] Use libdmraid's status instead of figuring out if a set is degraded ourselves
by Hans de Goede 07 Oct '09

07 Oct '09

Before this patch we checked (rs->total_devs != rs->found_devs) to see if a set is degraded. This can lead to false positives, such as for example with Promise RAID 10, see: http://bugzilla.redhat.com/show_bug.cgi?id=524168 This patch modifies pyblock to instead use libdmraid's status field to check for degraded sets. --- dmraid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dmraid.c b/dmraid.c index 6d4e7b7..2faf026 100644 --- a/dmraid.c +++ b/dmraid.c @@ -942,7 +942,7 @@ pydmraid_raidset_get(PyObject *self, void *data) return PyLong_FromUnsignedLong(rs->found_devs); } else if (!strcmp(attr, "degraded")) { PyObject *ret = Py_False; - if (rs->total_devs != rs->found_devs) + if (S_INCONSISTENT(rs->status)) ret = Py_True; Py_INCREF(ret); return ret; -- 1.6.5.rc2

2 3

[PATCH] Default to mbr bootloader target for md raid 1 boot device too (#526822)
by Radek Vykydal 06 Oct '09

06 Oct '09

It used to be so, because for boot device target (/dev/mdX) we installed to MBRs anyway. With Hans's patch 45a7048e5f56316e052e4699b5ec70aa291ddd5e we do what we promise (install to boot device) in this case, but it is a change and it doesn't seem to be expected as default by users. I have also one bigger patch dealing with installation into mbr (when having mdraid boot partition) waiting for review. --- bootloader.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/bootloader.py b/bootloader.py index 0847f7e..3960851 100644 --- a/bootloader.py +++ b/bootloader.py @@ -110,8 +110,7 @@ def bootloaderSetupChoices(anaconda): anaconda.id.bootloader.setDevice(choices[anaconda.id.bootloader.defaultDevice][0]) elif choices and iutil.isMactel() and choices.has_key("boot"): # haccckkkk anaconda.id.bootloader.setDevice(choices["boot"][0]) - elif choices and choices.has_key("mbr") and not \ - (choices.has_key("boot") and choices["boot"][1] == N_("RAID Device")): + elif choices and choices.has_key("mbr"): anaconda.id.bootloader.setDevice(choices["mbr"][0]) elif choices and choices.has_key("boot"): anaconda.id.bootloader.setDevice(choices["boot"][0]) -- 1.6.0.6

1 0

[PATCH] formatByDefault: Don't traceback when mountpoint is None (#522609)
by Hans de Goede 06 Oct '09

06 Oct '09

Don't traceback in formatByDefault() when a device with a mountable format has a mountpoint of None. Instead simply assume that if we don't mount it anywhere it does not need to be formatted. --- storage/__init__.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/storage/__init__.py b/storage/__init__.py index ef39277..0f71d3c 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -722,6 +722,9 @@ class Storage(object): return False if device.format.mountable: + if not device.format.mountpoint: + return False + if device.format.mountpoint == "/" or \ device.format.mountpoint in formatlist: return True -- 1.6.5.rc2

3 3

repo editing patches
by Radek Vykydal 06 Oct '09

06 Oct '09

This is patch 5/6 from my first repo editing patches set split into smaller bits.

3 43

[PATCH] Tell udev to ignore temporary cryptsetup devices. (#526699)
by David Lehman 06 Oct '09

06 Oct '09

--- 70-anaconda.rules | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/70-anaconda.rules b/70-anaconda.rules index 28e4062..b9657f2 100644 --- a/70-anaconda.rules +++ b/70-anaconda.rules @@ -8,6 +8,9 @@ IMPORT{program}="$env{ANACBIN}/blkid -o udev -p $tempnode" KERNEL!="dm-*", GOTO="anaconda_mdraid" +ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="anaconda_end" +ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*",GOTO="anaconda_end" + IMPORT{program}="$env{ANACBIN}/dmsetup info -c --nameprefixes --unquoted --rows --noheadings -o name,uuid,suspended,readonly,major,minor,open,tables_loaded,names_using_dev -j%M -m%m" ENV{DM_NAME}!="?*", GOTO="anaconda_end" -- 1.6.0.6

2 1

[PATCH] Use $LIBDIR to find the boot-wrapper file.
by Jesse Keating 06 Oct '09

06 Oct '09

Instead of using the hardcoded library path, use a variable which is set in mk-images, as it seems that they can work across arch like this, and we typically only have one wrapper file available to us at compose time. --- scripts/mk-images.ppc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc index 1a85dc9..47af389 100644 --- a/scripts/mk-images.ppc +++ b/scripts/mk-images.ppc @@ -50,11 +50,11 @@ __EOT__ if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then echo "zimage = images/netboot/ppc64.img" >> $TOPDESTPATH/.treeinfo fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib64/kernel-wrapper/wrapper.a ]; then + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then mkdir -p $TOPDESTPATH/images/netboot $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc64.img \ -i $TOPDESTPATH/ppc/ppc64/ramdisk.image.gz \ - -D $IMGPATH/usr/lib64/kernel-wrapper \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc64/vmlinuz rmdir $TOPDESTPATH/images/netboot || : if [ -f $TOPDESTPATH/images/netboot/ppc64.img ]; then @@ -96,11 +96,11 @@ __EOT__ if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then echo "zimage = images/netboot/ppc32.img" >> $TOPDESTPATH/.treeinfo fi - elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/lib/kernel-wrapper/wrapper.a ]; then + elif [ -x $IMGPATH/usr/sbin/wrapper -a -r $IMGPATH/usr/$LIBDIR/kernel-wrapper/wrapper.a ]; then mkdir -p $TOPDESTPATH/images/netboot $IMGPATH/usr/sbin/wrapper -o $TOPDESTPATH/images/netboot/ppc32.img \ -i $TOPDESTPATH/ppc/ppc32/ramdisk.image.gz \ - -D $IMGPATH/usr/lib/kernel-wrapper \ + -D $IMGPATH/usr/$LIBDIR/kernel-wrapper \ $TOPDESTPATH/ppc/ppc32/vmlinuz rmdir $TOPDESTPATH/images/netboot || : if [ -f $TOPDESTPATH/images/netboot/ppc32.img ]; then -- 1.6.5.rc2

2 1

[master] & [f12-branch] 70-persistent-net.rules fix
by David Cantrell 06 Oct '09

06 Oct '09

Applies to both F-12 and rawhide at this point. The description in the patch gives an idea of what's going on. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[PATCH] Fix parsing of optional portnr in iscsi target IP (#525118)
by Hans de Goede 06 Oct '09

06 Oct '09

This patch fixes 2 issues with the parsing of the optional portnr in iscsi target IP's: 1) We don't want to include the : in the portno, so port = target[idx:] should be port = target[idx+1:] 2) An IPV6 IP always includes the : character, so specifying the port was mandatory with IPV6, this patch counts the number of : inside the string to determine if a port is present for IPV6 strings. This patch is meant for both F-12 and F-13 --- iw/autopart_type.py | 7 ++++--- textw/partition_text.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index e41f618..2b22c64 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -297,10 +297,11 @@ class PartitionTypeWindow(InstallWindow): err = None try: - idx = target.rfind(":") - if idx != -1: + count = len(target.split(":")) + if count == 2 or count == 9: + idx = target.rfind(":") ip = target[:idx] - port = target[idx:] + port = target[idx+1:] else: ip = target port = "3260" diff --git a/textw/partition_text.py b/textw/partition_text.py index 412a7d7..bb70922 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -260,10 +260,11 @@ class PartitionTypeWindow: target = entries[0].strip() try: - idx = target.rfind(":") - if idx != -1: + count = len(target.split(":")) + if count == 2 or count == 9: + idx = target.rfind(":") ip = target[:idx] - port = target[idx:] + port = target[idx+1:] else: ip = target port = "3260" -- 1.6.5.rc2

1 0

[PATCH f12-branch] Don't warn /usr should be formatted when "Format as:" is already selected
by Hans de Goede 06 Oct '09

06 Oct '09

When editing a pre-existing mdraid set and selecting /usr (or any of the other mountpoints listed in formatByDefault()) as mountpoint, anaconda always tells that this mountpoint should be formatted before installation. This patch makes anaconda not give this warning when the user has already selected "Format as:" (ext4, ...). --- iw/raid_dialog_gui.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 64c0a8a..f2a8a28 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -285,7 +285,7 @@ class RaidEditor: usedev = self.origrequest migrate = True - if self.origrequest.format.exists and \ + if self.origrequest.format.exists and not format and \ self.storage.formatByDefault(self.origrequest): if not queryNoFormatPreExisting(self.intf): continue -- 1.6.5.rc2

2 1

[PATCH] Bring up network interface before trying to use it for FCoE
by Hans de Goede 06 Oct '09

06 Oct '09

Note this patch deliberately does not use NetworkManager, all we need for FCoE is for the OSI layers 1 (PHY) and 2 (MAC) to be brought up. --- storage/fcoe.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/storage/fcoe.py b/storage/fcoe.py index 1ea5e9d..ca604cd 100644 --- a/storage/fcoe.py +++ b/storage/fcoe.py @@ -75,6 +75,10 @@ class fcoe(object): log.info("Activating FCoE SAN attached to %s" % nic) + iutil.execWithRedirect("ip", [ "link", "set", nic, "up" ], + stdout = "/dev/tty5", stderr="/dev/tty5", + searchPath = 1) + f = open("/sys/module/fcoe/parameters/create", "w") f.write(nic) f.close() -- 1.6.5.rc2

2 1

[parted] ped_partition_busy should not call the libparted exception handler
by Hans de Goede 06 Oct '09

06 Oct '09

Modify libparted/arch/linux.c _partition_get_part_dev() to not call _device_stat() but instead use stat directly, as _device_stat() calls the libparted exception handler and we don't want this here, the only caller of _partition_get_part_dev() is _partition_is_mounted(), which in turn only gets called by linux_partition_is_busy(), and we don't want to "throw" exceptions from ped_partition_busy() This issue was noticed in combination with pyparted as used by anaconda, see: https://bugzilla.redhat.com/show_bug.cgi?id=527035#c10 --- libparted/arch/linux.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index 52f7d21..a8d6daf 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -2127,7 +2127,7 @@ _partition_get_part_dev (const PedPartition* part) struct stat dev_stat; int dev_major, dev_minor; - if (!_device_stat (part->disk->dev, &dev_stat)) + if (stat (part->disk->dev->path, &dev_stat)) return (dev_t)0; dev_major = major (dev_stat.st_rdev); dev_minor = minor (dev_stat.st_rdev); @@ -2184,6 +2184,8 @@ _partition_is_mounted (const PedPartition *part) if (!ped_partition_is_active (part)) return 0; dev = _partition_get_part_dev (part); + if (!dev) + return 0; return _partition_is_mounted_by_dev (dev); } -- 1.6.5.rc2

3 5

[PATCH] (master) UI patches
by Joel Granados Moreno 06 Oct '09

06 Oct '09

Hello list. With these set of patches I want to implement a alternative workflow for the creation of partitions and of logical volumes. Since clicking on 'create' and selecting the type of device needed and then clicking once more is 2 clicks too many, I implemented a method where the user is directed to the create partition or create logical volume after double clicking the free space row or free space slice (in the bar view). So, if the user double clicks LVM free space, he/she will get a dialog to create a logical volume. And, if the user double clicks on a device free space, he/she will get a dialog to create a partition. Suggestions and review appreciated. Regards. Joel Andres Granados Brno, Czech Republic, Red Hat.

3 10

[PATCH 1/2] Wait for udev to settle before trying to find dmraid sets in udev DB
by Hans de Goede 05 Oct '09

05 Oct '09

I hit the race fixed by this during some local dmraid install testing while investigating bug 527035. This patch is intended for both F-12 and the devel branch. --- storage/devicetree.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/storage/devicetree.py b/storage/devicetree.py index a9b74eb..cce8013 100644 --- a/storage/devicetree.py +++ b/storage/devicetree.py @@ -1664,6 +1664,10 @@ class DeviceTree(object): self._addDevice(dm_array) + # Wait for udev to scan the just created nodes, to avoid a race + # with the udev_get_block_device() call below. + udev_settle() + # Get the DMRaidArrayDevice a DiskLabel format *now*, in case # its partitions get scanned before it does. dm_array.updateSysfsPath() -- 1.6.5.rc2

2 2

Partial fix for 526320, missing netboot images for ppc32/64
by Jesse Keating 05 Oct '09

05 Oct '09

This partially fixes https://bugzilla.redhat.com/show_bug.cgi?id=526320 It gets the 32bit ppc netboot images created again, but not the ppc64. The ppc64 images will have to wait until we figure out how to get the kernel-bootwrapper.ppc64 package installed into the instroot in order to find and use the 64bit wrapper file. Not going to be easy since we seem to run in setarch ppc. While I was mucking with these files I fixed a few other things, the subjects should be explanitory. -- Jes

2 4

[PATCH] Re-enable usable pdb with vnc on s390x
by Steffen Maier 05 Oct '09

05 Oct '09

d2d66577fbe3dd34efa0ddcec9640ebf41a9d49d introduced a shell on tty1 with vnc to help debugging when there are no virtual terminals. 047bc24212bd68942303242b864459bfc46be5d0 made the availability of this shell dependent on isConsoleOnVirtualTerminal() so only for s390 and serial. However, this shell makes pdb unusable due a race between both pdb and the shell accessing the same terminal. See also #520831. In fact, s390 has a default preferred console ttyS0, on which /sbin/init (linuxrc.s390) provides a rescue shell already. The shell on tty1 requires an ssh login on s390 anyway and with available ssh logins, the user can get as many shells as he wants. Therefore, s390 does not need the shell on tty1, not even with broken net. This patch removes the shell on tty1 also for s390. The if clause actually boils down to "if not flags.serial:". Note that iutil.isConsoleOnVirtualTerminal() is used elsewhere since 60ac73a7e6241030392974e4a23e7a3abf549706, so we cannot just modify its semantics. This patch is intended for both devel and F-12. --- anaconda | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index 8f67807..d88f029 100755 --- a/anaconda +++ b/anaconda @@ -366,11 +366,12 @@ def runVNC(): break while True: - # s390/s390x are the only places we /really/ need a shell on tty1, + # Not having a virtual terminal or otherwise free console + # are the only places we /really/ need a shell on tty1, # and everywhere else this just gets in the way of pdb. But we # don't want to return, because that'll return try to start X # a second time. - if iutil.isConsoleOnVirtualTerminal(): + if iutil.isConsoleOnVirtualTerminal() or iutil.isS390(): time.sleep(10000) else: print _("Press <enter> for a shell") -- 1.6.4.4

2 1

[PATCH] support for ARCH==i686 in upd-instroot
by Dennis Gregorovic 05 Oct '09

05 Oct '09

In case ARCH is set to i686 in mk-images, the attached patch will make sure that upd-instroot still works correctly. Cheers -- Dennis

2 1

[PATCH] (master) UI rewrite
by Joel Granados Moreno 05 Oct '09

05 Oct '09

Hello list. Sorry for the very very very very long patch set. :) IMO each patch is pretty well commented and speaks for itself. I tried to separate the patches as much as I could. I would like to comment on the method I used to find out if there was space left in the system partitions. I basically wanted to know if there was some space in the partition after allocation but before growing. I'm not to proud of the way it is done but it gets the job done. With that said, I would be ok with NOT including the related patches and assuming we have free space in the partitions. In the case we would error out after the user tries to create a partition. Moreover, I think we should make the autopartitioning optional. Right now we are reorganizing everything every time the user does something. IMO, it would be much better to give the user a little bit more of responsibility and let him/her be more specific as to the size and location of the partitions. But thats a battle for another time, I guess. I have been testing this against master and there are still 2 issues that are left to be addressed. IMO, these are minor issues that will probably get ironed out soonish. 1. The direct "create LV" does not work yet. One has to go through the VG screen 2. After an action the bar view gets erased and is blank until one clicks as device. As suggested by clumens, I'll make some videos about the enhancements that were created and post them shortly. Regards. Joel Andres Granados Brno, Czech Republic, Red Hat.

7 106

[PATCH] Add --label to anaconda-ks.cfg if needed (#526223).
by Chris Lumens 02 Oct '09

02 Oct '09

--- storage/formats/fs.py | 3 +++ storage/formats/swap.py | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/storage/formats/fs.py b/storage/formats/fs.py index ec83586..1b389d1 100644 --- a/storage/formats/fs.py +++ b/storage/formats/fs.py @@ -794,6 +794,9 @@ class FS(DeviceFormat): def writeKS(self, f): f.write("%s --fstype=%s" % (self.mountpoint, self.type)) + if self.label: + f.write(" --label=\"%s\"" % self.label) + class Ext2FS(FS): """ ext2 filesystem. """ diff --git a/storage/formats/swap.py b/storage/formats/swap.py index e1dacb0..713ff58 100644 --- a/storage/formats/swap.py +++ b/storage/formats/swap.py @@ -149,6 +149,9 @@ class SwapSpace(DeviceFormat): def writeKS(self, f): f.write("swap") + if self.label: + f.write(" --label=\"%s\"" % self.label) + register_device_format(SwapSpace) -- 1.6.4.2

2 1

[master] & [f12-branch] hook up --label in ks
by David Cantrell 02 Oct '09

02 Oct '09

If people pass --label=whatever to a 'part' command in kickstart files, nothing would happen during installation to set that label. This patch hooks that up so if a label exists in the format object, set it during doFormat(). Suitable for master and f12-branch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[PATCH] Stop dragging mkinitrd into the install
by Hans de Goede 02 Oct '09

02 Oct '09

We were forcebly installing mkinitrd, but nothing uses it anymore now that we've switched to dracut. There is no need to force installing dracut as the kernel requires it. And if someone decides to not install the kernel, well though luck buddy. p.s. This patch is intended for both devel and F-12 --- yuminstall.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 5a116f5..9d2f3c7 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1327,7 +1327,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon # installed (they could have been removed in kickstart). So we'll force # it. def selectAnacondaNeeds(self): - for pkg in ['authconfig', 'chkconfig', 'mkinitrd', 'system-config-firewall-tui']: + for pkg in ['authconfig', 'chkconfig', 'system-config-firewall-tui']: self.selectPackage(pkg) def doPostSelection(self, anaconda): -- 1.6.5.rc2

2 1

[master] & [f12-branch] fix NTFS existing size calculation
by David Cantrell 02 Oct '09

02 Oct '09

Rounding errors. Since we're using megabytes throughout the format code, we're sometimes hitting rounding errors when computing existing filesystem sizes. In the bug I'm fixing, the problem led to the Resize spinner box have an upper bound that was one megabyte larger than the existing volume size. Applicable to master and f12-branch. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

2 2

[master] loader network & i18n patches
by David Cantrell 01 Oct '09

01 Oct '09

The first patch is suitable for master and f12-branch. The others are only suitable for master. Would have more tested and submitted today, but the VPN connection is jerking me around right now. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

4 11

[PATCH] (master) makeupdates fix
by Joel Granados Moreno 01 Oct '09

01 Oct '09

Hello Little fix to the makeupdates script. It failed when it encountered deleted files. Regards. Joel Andres Granados Brno, Czech Republic, Red Hat.

2 2

[PATCH] kernel-PAE
by Dennis Gregorovic 01 Oct '09

01 Oct '09

The attached patch does two things. One, it changes ARCH from i586 to i686. Second, it drops reference to kernel-PAE, which is needed to correct .treeinfo for RHEL 6. Cheers -- Dennis

1 0

[PATCH] Only ignore partitions <1MB that are freespace. (#526445)
by David Lehman 01 Oct '09

01 Oct '09

This originally came from bug 119479, which only complained of small free space partitions created by partition magic. Small partitions still will not be represented in the graph. --- iw/partition_gui.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 4fc5e4f..9762041 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -1019,8 +1019,9 @@ class PartitionWindow(InstallWindow): log.debug("can't find partition %s in device" " tree" % partName) - # ignore the tiny < 1 MB partitions (#119479) - if part.getSize(unit="MB") <= 1.0: + # ignore the tiny < 1 MB free space partitions (#119479) + if part.getSize(unit="MB") <= 1.0 and \ + part.type & parted.PARTITION_FREESPACE: if not part.active or not device.bootable: part = part.nextPartition() continue -- 1.6.0.6

2 1

[PATCH] Try to include error messages in lvm/mdadm exceptions.
by David Lehman 01 Oct '09

01 Oct '09

This should reduce the dogpiling in bugzilla for overly-generic errors like "lvcreate failed for VolGroup/lv_root". --- storage/devicelibs/lvm.py | 153 ++++++++++++++++++----------------------- storage/devicelibs/mdraid.py | 85 +++++++++++------------ 2 files changed, 107 insertions(+), 131 deletions(-) diff --git a/storage/devicelibs/lvm.py b/storage/devicelibs/lvm.py index 5fa9198..1f7e1c7 100644 --- a/storage/devicelibs/lvm.py +++ b/storage/devicelibs/lvm.py @@ -157,17 +157,30 @@ def clampSize(size, pesize, roundup=None): return long(round(float(size)/float(pesize)) * pesize) +def lvm(args): + rc = iutil.execWithRedirect("lvm", args, + stdout = "/dev/tty5", + stderr = "/dev/tty5", + searchPath=1) + if not rc: + return + + try: + msg = open("/tmp/program.log").readlines()[-1].strip() + except Exception: + msg = "" + + raise LVMError(msg) + def pvcreate(device): args = ["pvcreate"] + \ config_args + \ [device] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - if rc: - raise LVMError("pvcreate failed for %s" % device) + try: + lvm(args) + except LVMError as msg: + raise LVMError("pvcreate failed for %s: %s" % (device, msg)) def pvresize(device, size): args = ["pvresize"] + \ @@ -175,24 +188,20 @@ def pvresize(device, size): config_args + \ [device] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - if rc: - raise LVMError("pvresize failed for %s" % device) + try: + lvm(args) + except LVMError as msg: + raise LVMError("pvresize failed for %s: %s" % (device, msg)) def pvremove(device): args = ["pvremove"] + \ config_args + \ [device] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - if rc: - raise LVMError("pvremove failed for %s" % device) + try: + lvm(args) + except LVMError as msg: + raise LVMError("pvremove failed for %s: %s" % (device, msg)) def pvinfo(device): """ @@ -237,51 +246,40 @@ def vgcreate(vg_name, pv_list, pe_size): argv.append(vg_name) argv.extend(pv_list) - rc = iutil.execWithRedirect("lvm", argv, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("vgcreate failed for %s" % vg_name) + try: + lvm(argv) + except LVMError as msg: + raise LVMError("vgcreate failed for %s: %s" % (vg_name, msg)) def vgremove(vg_name): args = ["vgremove"] + \ config_args +\ [vg_name] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("vgremove failed for %s" % vg_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("vgremove failed for %s: %s" % (vg_name, msg)) def vgactivate(vg_name): args = ["vgchange", "-a", "y"] + \ config_args + \ [vg_name] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - if rc: - raise LVMError("vgactivate failed for %s" % vg_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("vgactivate failed for %s: %s" % (vg_name, msg)) def vgdeactivate(vg_name): args = ["vgchange", "-a", "n"] + \ config_args + \ [vg_name] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("vgdeactivate failed for %s" % vg_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("vgdeactivate failed for %s: %s" % (vg_name, msg)) def vgreduce(vg_name, pv_list, rm=False): """ Reduce a VG. @@ -296,13 +294,10 @@ def vgreduce(vg_name, pv_list, rm=False): else: args.extend([vg_name] + pv_list) - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("vgreduce failed for %s" % vg_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("vgreduce failed for %s: %s" % (vg_name, msg)) def vginfo(vg_name): args = ["vgs", "--noheadings", "--nosuffix"] + \ @@ -372,26 +367,20 @@ def lvcreate(vg_name, lv_name, size): config_args + \ [vg_name] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("lvcreate failed for %s/%s" % (vg_name, lv_name)) + try: + lvm(args) + except LVMError as msg: + raise LVMError("lvcreate failed for %s/%s: %s" % (vg_name, lv_name, msg)) def lvremove(vg_name, lv_name): args = ["lvremove"] + \ config_args + \ ["%s/%s" % (vg_name, lv_name)] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("lvremove failed for %s" % lv_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("lvremove failed for %s: %s" % (lv_name, msg)) def lvresize(vg_name, lv_name, size): args = ["lvresize"] + \ @@ -399,13 +388,10 @@ def lvresize(vg_name, lv_name, size): config_args + \ ["%s/%s" % (vg_name, lv_name)] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("lvresize failed for %s" % lv_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("lvresize failed for %s: %s" % (lv_name, msg)) def lvactivate(vg_name, lv_name): # see if lvchange accepts paths of the form 'mapper/$vg-$lv' @@ -413,23 +399,18 @@ def lvactivate(vg_name, lv_name): config_args + \ ["%s/%s" % (vg_name, lv_name)] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - if rc: - raise LVMError("lvactivate failed for %s" % lv_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("lvactivate failed for %s: %s" % (lv_name, msg)) def lvdeactivate(vg_name, lv_name): args = ["lvchange", "-a", "n"] + \ config_args + \ ["%s/%s" % (vg_name, lv_name)] - rc = iutil.execWithRedirect("lvm", args, - stdout = "/dev/tty5", - stderr = "/dev/tty5", - searchPath=1) - - if rc: - raise LVMError("lvdeactivate failed for %s" % lv_name) + try: + lvm(args) + except LVMError as msg: + raise LVMError("lvdeactivate failed for %s: %s" % (lv_name, msg)) diff --git a/storage/devicelibs/mdraid.py b/storage/devicelibs/mdraid.py index b082c7b..73099c4 100644 --- a/storage/devicelibs/mdraid.py +++ b/storage/devicelibs/mdraid.py @@ -119,6 +119,21 @@ def get_raid_max_spares(raidlevel, nummembers): raise ValueError, "invalid raid level %d" % raidlevel +def mdadm(args): + rc = iutil.execWithRedirect("mdadm", args, + stdout = "/dev/tty5", + stderr = "/dev/tty5", + searchPath=1) + if not rc: + return + + try: + msg = open("/tmp/program.log").readlines()[-1].strip() + except Exception: + msg = "" + + raise MDRaidError(msg) + def mdcreate(device, level, disks, spares=0): argv = ["--create", device, "--run", "--level=%s" % level] raid_devs = len(disks) - spares @@ -127,27 +142,18 @@ def mdcreate(device, level, disks, spares=0): argv.append("--spare-devices=%d" % spares) argv.extend(disks) - rc = iutil.execWithRedirect("mdadm", - argv, - stderr = "/dev/tty5", - stdout = "/dev/tty5", - searchPath=1) - - if rc: - raise MDRaidError("mdcreate failed for %s" % device) - - # mdadm insists on starting the new array, so we have to stop it here - #self.mddeactivate(device) + try: + mdadm(argv) + except MDRaidError as msg: + raise MDRaidError("mdcreate failed for %s: %s" % (device, msg)) def mddestroy(device): - rc = iutil.execWithRedirect("mdadm", - ["--zero-superblock", device], - stderr = "/dev/tty5", - stdout = "/dev/tty5", - searchPath=1) + args = ["--zero-superblock", device] - if rc: - raise MDRaidError("mddestroy failed for %s" % device) + try: + mdadm(args) + except MDRaidError as msg: + raise MDRaidError("mddestroy failed for %s: %s" % (device, msg)) def mdadd(device, no_degraded=False): args = ["--incremental", "--quiet"] @@ -155,14 +161,10 @@ def mdadd(device, no_degraded=False): args.append("--no-degraded") args.append(device) - rc = iutil.execWithRedirect("mdadm", - args, - stderr = "/dev/tty5", - stdout = "/dev/tty5", - searchPath=1) - - if rc: - raise MDRaidError("mdadd failed for %s" % device) + try: + mdadm(args) + except MDRaidError as msg: + raise MDRaidError("mdadd failed for %s: %s" % (device, msg)) def mdactivate(device, members=[], super_minor=None, update_super_minor=False, uuid=None): @@ -181,29 +183,22 @@ def mdactivate(device, members=[], super_minor=None, update_super_minor=False, else: extra_args = [ ] - rc = iutil.execWithRedirect("mdadm", - ["--assemble", - device, - identifier, - "--run", - "--auto=md"] + extra_args + members, - stderr = "/dev/tty5", - stdout = "/dev/tty5", - searchPath=1) - - if rc: - raise MDRaidError("mdactivate failed for %s" % device) + args = ["--assemble", device, identifier, "--run", "--auto=md"] + args += extra_args + args += members + try: + mdadm(args) + except MDRaidError as msg: + raise MDRaidError("mdactivate failed for %s: %s" % (device, msg)) def mddeactivate(device): - rc = iutil.execWithRedirect("mdadm", - ["--stop", device], - stderr = "/dev/tty5", - stdout = "/dev/tty5", - searchPath=1) + args = ["--stop", device] - if rc: - raise MDRaidError("mddeactivate failed for %s" % device) + try: + mdadm(args) + except MDRaidError as msg: + raise MDRaidError("mddeactivate failed for %s: %s" % (device, msg)) def mdexamine(device): vars = iutil.execWithCapture("mdadm", -- 1.6.0.6

3 4

master branch, UI rewrite.
by Joel Granados 01 Oct '09

01 Oct '09

Hello list. I have created a new patch set that includes all the comments that were discussed in the previous UI rewrite thread. I would like to avoid posting all the patches once more to the list. With this in mind I have put them in http://jgranado.fedorapeople.org/anaconda/ui/patchset-20090930/ Most of them are the same patches but with very small changes added to them (mostly changes that were suggested). I squashed some patches together (as suggested) and added some additional stuff that was missing from my previous set. In general, patches 0026-* to 0032* are new. I also added 3 new videos showing the relevant features: http://jgranado.fedorapeople.org/anaconda/ui/videos/lv_create_workflow http://jgranado.fedorapeople.org/anaconda/ui/videos/edit_delete_buttons http://jgranado.fedorapeople.org/anaconda/ui/videos/message_in_canvas Things to highlight. 1. I removed the patch that made the grow part in doPartitioning optional. I instead created a patch that adds a function that is not implemented yet, but is there so we don't forget. 2. I removed the "Hide" thingy. 3. Created the 'create lv' button. With this new button one can create an LV from the VG screen or from the 'create' screen. 4. Modified the 'edit' and 'delete' buttons to activate only when they are relevant. 5. There is now a message that reads 'Please Select A Device' when no devices are selected. Further review is greatly appreciated. Regards. -- Joel Andres Granados Brno, Czech Republic, Red Hat.

2 5

[PATCH] Don't retry commiting partition table to disk
by Hans de Goede 01 Oct '09

01 Oct '09

Since the parted ebusy errors due to unnecessary udev event generation on the partition nodes bug has been nailed, we no longer need the retry loop around committing to disk. --- storage/formats/disklabel.py | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/storage/formats/disklabel.py b/storage/formats/disklabel.py index a387c56..192f1da 100644 --- a/storage/formats/disklabel.py +++ b/storage/formats/disklabel.py @@ -197,23 +197,12 @@ class DiskLabel(DeviceFormat): def commit(self): """ Commit the current partition table to disk and notify the OS. """ - # give committing 5 tries, failing that, raise an exception - attempt = 1 - maxTries = 5 - keepTrying = True - - while keepTrying and (attempt <= maxTries): - try: - self.partedDisk.commit() - keepTrying = False - except parted.DiskException as msg: - log.warning(msg) - attempt += 1 - else: - udev_settle() - - if keepTrying: - raise DeviceFormatError("cannot commit to disk after %d attempts" % (maxTries,), ) + try: + self.partedDisk.commit() + except parted.DiskException as msg: + raise DeviceFormatError(msg) + else: + udev_settle() def commitToDisk(self): """ Commit the current partition table to disk. """ -- 1.6.4.2

3 3

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 October 2009