Anaconda-devel March 2011

anaconda-devel@lists.fedoraproject.org

22 participants
107 discussions

[PATCH] Clean up display of free space in partitioning gui.
by David Lehman 16 Mar '11

16 Mar '11

Show free regions within extended partitions as such in the graphic as well as in the tree view. Take advantage of the fact that free space "partitions" within an extended have the PARTITION_LOGICAL flag set. Lastly, use the grain size of the kernel-supplied alignment as the minimum size of free regions that get displayed. Within the extended we double this because the way logical partitions' metadata areas are allocated leads to more conservative partition alignment. Resolves: rhbz#626025 --- pyanaconda/iw/partition_gui.py | 80 ++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 52 deletions(-) diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py index 4c9bba2..bb2c9fc 100644 --- a/pyanaconda/iw/partition_gui.py +++ b/pyanaconda/iw/partition_gui.py @@ -363,19 +363,13 @@ class DiskStripeGraph(StripeGraph): 'model': drive.model} stripe = Stripe(self.getCanvas(), drivetext, self.dcCB, obj = drive) - # Free Extended Calculation - # Free slice/partition in the extended partition "free space". If there - # is space between the last logical partition and the ending of the - # extended partition we create a "free space" in the extended part. # Create the slices. # These offsets are where the partition/slices end. 0<offset<1 - last_logical_offset = None - last_extended_offset = None - for part in drive.format.partedDisk.getFreeSpacePartitions() \ + [d for d in drive.format.partitions]: - if part.getSize(unit="MB") <= 1.0: + if part.getSize(unit="MB") <= 1.0 or \ + part.type & parted.PARTITION_METADATA: continue # Create the start and length for the slice. @@ -384,43 +378,37 @@ class DiskStripeGraph(StripeGraph): xlength = (Decimal(str(part.geometry.length)) / Decimal(str(drive.partedDevice.length))) - if part.type == parted.PARTITION_LOGICAL: - partstr = "%s\n%.0f MB" % (part.path, float(part.getSize())) - stype = Slice.SUBSLICE - unsel_col = self.part_type_colors["unsel_logical"] - sel_col = self.part_type_colors["sel_logical"] + if part.type & parted.PARTITION_LOGICAL: + if part.type & parted.PARTITION_FREESPACE: + name = _("Free") + unsel_col = self.part_type_colors["unsel_freespace"] + sel_col = self.part_type_colors["sel_freespace"] + else: + name = part.path + unsel_col = self.part_type_colors["unsel_logical"] + sel_col = self.part_type_colors["sel_logical"] - # Free Extended Calculation - if last_logical_offset == None: - last_logical_offset = xoffset + xlength - elif last_logical_offset < xoffset + xlength: - last_logical_offset = xoffset + xlength + partstr = "%s\n%.0f MB" % (name, float(part.getSize())) + stype = Slice.SUBSLICE - elif part.type == parted.PARTITION_FREESPACE: + elif part.type & parted.PARTITION_FREESPACE: partstr = "%s\n%.0f MB" % (_("Free"), float(part.getSize())) stype = Slice.SLICE unsel_col = self.part_type_colors["unsel_freespace"] sel_col = self.part_type_colors["sel_freespace"] - elif part.type == parted.PARTITION_EXTENDED: + elif part.type & parted.PARTITION_EXTENDED: partstr = "" stype = Slice.CONTAINERSLICE unsel_col = self.part_type_colors["unsel_extended"] sel_col = self.part_type_colors["sel_extended"] - # Free Extended Calculation - last_extended_offset = xoffset + xlength - - elif part.type == parted.PARTITION_NORMAL: + else: partstr = "%s\n%.0f MB" % (part.path, float(part.getSize())) stype = Slice.SLICE unsel_col = self.part_type_colors["unsel_normal"] sel_col = self.part_type_colors["sel_normal"] - else: - # We don't really want to draw anything in this case. - continue - # We need to use the self.storage objects not the partedDisk ones. # The free space has not storage object. if part.type != parted.PARTITION_FREESPACE: @@ -434,25 +422,6 @@ class DiskStripeGraph(StripeGraph): unsel_col = unsel_col, obj = o_part) stripe.addSlice(slice) - # Free Extended Calculation - if (last_logical_offset != None and last_extended_offset != None) \ - and last_logical_offset < last_extended_offset: - # We must create a "free extended" slice - stype = Slice.SUBSLICE - unsel_col = self.part_type_colors["unsel_freespace"] - sel_col = self.part_type_colors["sel_freespace"] - xoffset = last_logical_offset - xlength = last_extended_offset - last_logical_offset - # don't add a slice for free regions of <= 1MB - size = Decimal(str(drive.size)) * xlength - if size > 1: - slcstr = "%s\n%.0f MB" % (_("Free"), size) - - slice = Slice(stripe, slcstr, stype, xoffset, xlength, - dcCB = self.dcCB, cCB = self.cCB, sel_col=sel_col, - unsel_col=unsel_col) - stripe.addSlice(slice) - return stripe class LVMStripeGraph(StripeGraph): @@ -1045,10 +1014,17 @@ class PartitionWindow(InstallWindow): log.debug("can't find partition %s in device" " tree" % partName) - # 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: + # ignore any free space region that is less than the + # grain size of the disklabel alignment we are using + if part.type & parted.PARTITION_FREESPACE: + min_length = disk.format.alignment.grainSize + if part.type & parted.PARTITION_LOGICAL: + # ignored free regions in the extended can be up + # to twice the alignment grain size, to account + # for logical partition metadata + min_length *= 2 + + if part.geometry.length < min_length: part = part.nextPartition() continue @@ -1058,7 +1034,7 @@ class PartitionWindow(InstallWindow): "one extended partition per disk") extendedParent = self.tree.append(parent) iter = extendedParent - elif device and device.isLogical: + elif part.type & parted.PARTITION_LOGICAL: if not extendedParent: raise RuntimeError, ("crossed logical partition " "before extended") -- 1.7.3.5

2 1

rhel6-branch patches
by David Lehman 16 Mar '11

16 Mar '11

Both of these are rhel6-specific versions that minimize behavioral changes. I will be sending the master/fedora version of the free space patch shortly.

2 4

[PATCH rhel6-branch] Set context on files as well as directories (#685090).
by Chris Lumens 16 Mar '11

16 Mar '11

This fixes a problem introduced by 6627aefc2e4b7320cd367b5034ab5b8396109050. --- packages.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/packages.py b/packages.py index a866e0d..4e786be 100644 --- a/packages.py +++ b/packages.py @@ -243,9 +243,11 @@ def setFileCons(anaconda): glob.glob('/etc/dhcp/dhclient-*.conf') vgs = ["/dev/%s" % vg.name for vg in anaconda.id.storage.vgs] + for f in files + vgs: + isys.resetFileContext(os.path.normpath(f), anaconda.rootPath) # ugh, this is ugly - for d in ["/etc/sysconfig/network-scripts", "/var/cache/yum", "/var/lib/rpm", "/var/lib/yum", "/etc/lvm", "/dev/mapper", "/etc/iscsi", "/var/lib/iscsi", "/root", "/var/log", "/etc/modprobe.d", "/etc/sysconfig" ] + vgs: + for d in ["/etc/sysconfig/network-scripts", "/var/cache/yum", "/var/lib/rpm", "/var/lib/yum", "/etc/lvm", "/dev/mapper", "/etc/iscsi", "/var/lib/iscsi", "/root", "/var/log", "/etc/modprobe.d", "/etc/sysconfig" ]: if not os.path.isdir(anaconda.rootPath + d): continue -- 1.7.4.1

2 1

[PATCH master 1/3] Mount livecd filesystems under /mnt (#683682)
by Brian C. Lane 16 Mar '11

16 Mar '11

When mounting target filesystems for livecd fs mangling do it outside the new filesystem so that mountpoints don't leave a mess. --- pyanaconda/livecd.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pyanaconda/livecd.py b/pyanaconda/livecd.py index c1918a9..04e7c5c 100644 --- a/pyanaconda/livecd.py +++ b/pyanaconda/livecd.py @@ -244,7 +244,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): # mount all of the filesystems under /mnt so we can copy in content _setupFilesystems(anaconda.storage.mountpoints, - chroot=anaconda.rootPath + "/mnt") + chroot="/mnt") # And now let's do the real copies for tocopy in mountpoints: @@ -262,7 +262,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): continue copytree("%s/%s" % (anaconda.rootPath, tocopy), - "%s/mnt/%s" % (anaconda.rootPath, tocopy), + "/mnt/%s" % (tocopy,), True, True, flags.selinux) wait.refresh() shutil.rmtree("%s/%s" % (anaconda.rootPath, tocopy)) @@ -277,14 +277,12 @@ class LiveCDCopyBackend(backend.AnacondaBackend): continue try: - stats[tocopy]= os.stat("%s/mnt/%s" % (anaconda.rootPath, - tocopy)) + stats[tocopy]= os.stat("/mnt/%s" % (tocopy,)) except Exception as e: log.info("failed to get stat info for mountpoint %s: %s" % (tocopy, e)) - shutil.rmtree("%s/mnt/%s" % (anaconda.rootPath, - tocopy.split("/")[1])) + shutil.rmtree("/mnt/%s" % (tocopy.split("/")[1])) wait.refresh() # now mount all of the filesystems so that post-install writes end -- 1.7.4

3 4

[lorax 1/2] gconf/metacity: have only one workspace.
by Ales Kozumplik 16 Mar '11

16 Mar '11

Related: rhbz#683548 --- src/pylorax/installtree.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/pylorax/installtree.py b/src/pylorax/installtree.py index 868e029..b66f87c 100644 --- a/src/pylorax/installtree.py +++ b/src/pylorax/installtree.py @@ -409,6 +409,7 @@ class LoraxInstallTree(BaseLoraxClass): [("/apps/metacity/general/button_layout", "string", ":"), ("/apps/metacity/general/action_right_click_titlebar", "string", "none"), + ("/apps/metacity/general/num_workspaces", "int", "1"), ("/apps/metacity/window_keybindings/close", "string", "disabled"), ("/apps/metacity/global_keybindings/run_command_window_screenshot", "string", "disabled"), -- 1.7.3.3

3 4

[PATCH f15-branch, master] Fix order of opts and host when processing kickstart nfs lines.
by Chris Lumens 16 Mar '11

16 Mar '11

Related: rhbz#683953 --- loader/kickstart.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index 4a89a1e..3575ee4 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -947,7 +947,7 @@ static void setKickstartNfs(struct loaderData_s * loaderData, PyObject *handler) logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'", host, dir, PyString_AsString(optsObj)); checked_asprintf(&loaderData->instRepo, "nfs:%s:%s:%s", - host, PyString_AsString(optsObj), dir); + PyString_AsString(optsObj), host, dir); } else { logMessage(INFO, "results of nfs, host is %s, dir is %s", host, dir); checked_asprintf(&loaderData->instRepo, "nfs:%s:%s", host, dir); -- 1.7.4.1

2 1

[PATCH] Rework the upgrade swap suggestion (#684603).
by Chris Lumens 16 Mar '11

16 Mar '11

First, no longer mention the 2.4 kernel. That was only for people updating from RHL. Second, use the iutil swap suggestion instead of coming up with a different one. This means we'll suggest the same amount on upgrade that we would use on a fresh install. --- pyanaconda/iw/upgrade_swap_gui.py | 16 +++----------- pyanaconda/upgrade.py | 40 ++++++------------------------------ 2 files changed, 11 insertions(+), 45 deletions(-) diff --git a/pyanaconda/iw/upgrade_swap_gui.py b/pyanaconda/iw/upgrade_swap_gui.py index b57d071..ddb8735 100644 --- a/pyanaconda/iw/upgrade_swap_gui.py +++ b/pyanaconda/iw/upgrade_swap_gui.py @@ -89,18 +89,12 @@ class UpgradeSwapWindow (InstallWindow): box = gtk.VBox (False, 5) box.set_border_width (5) - label = gtk.Label (_("Recent kernels (2.4 or newer) need significantly more " - "swap than older kernels, up to twice " - "the amount of RAM on the system. " - "You currently have %dMB of swap configured, but " - "you may create additional swap space on one of " - "your file systems now.") - % (iutil.swapAmount() / 1024) + - _("\n\nThe installer has detected %s MB of RAM.\n") % - (iutil.memInstalled()/1024)) + label = gtk.Label(_("You currently have %dMB of swap configured, which " + "is less than the recommended miminum of %sMB. You " + "may optionally create more swap space on one of " + "your file systems now.") % (iutil.swapAmount()/1024, iutil.swapSuggestion()[0]/1024)) label.set_alignment (0.5, 0.0) -# label.set_size_request(400, 200) label.set_line_wrap (True) box.pack_start(label, False) @@ -115,7 +109,6 @@ class UpgradeSwapWindow (InstallWindow): self.swapbox = gtk.VBox(False, 5) box.pack_start(self.swapbox, False) - label = gui.MnemonicLabel (_("Select the _partition to put the swap file on:")) a = gtk.Alignment(0.2, 0.5) @@ -201,7 +194,6 @@ class UpgradeSwapWindow (InstallWindow): return rc def swapTooBig(self): - rc = self.intf.messageWindow(_("Warning"), _("There is not enough space on the device you " "selected for the swap partition."), diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py index b3560dd..51b25bf 100644 --- a/pyanaconda/upgrade.py +++ b/pyanaconda/upgrade.py @@ -165,32 +165,12 @@ def restoreTime(anaconda): # returns None if no more swap is needed def upgradeSwapSuggestion(anaconda): - # mem is in kb -- round it up to the nearest 4Mb - mem = iutil.memInstalled() - rem = mem % 16384 - if rem: - mem = mem + (16384 - rem) - mem = mem / 1024 + swap = iutil.swapAmount()/1024 + (suggestedMin, suggestedMax) = iutil.swapSuggestion(quiet=1) anaconda.dispatch.skipStep("addswap", 0) - - # don't do this if we have more then 250 MB - if mem > 250: - anaconda.dispatch.skipStep("addswap", 1) - return - - swap = iutil.swapAmount() / 1024 - - # if we have twice as much swap as ram and at least 192 megs - # total, we're safe - if (swap >= (mem * 1.5)) and (swap + mem >= 192): - anaconda.dispatch.skipStep("addswap", 1) - return - - # if our total is 512 megs or more, we should be safe - if (swap + mem >= 512): - anaconda.dispatch.skipStep("addswap", 1) - return + if suggestedMin <= swap: + anaconda.dispatch.skipStep("addswap", permanent=1) fsList = [] @@ -205,18 +185,12 @@ def upgradeSwapSuggestion(anaconda): info = (device, space) fsList.append(info) - suggestion = mem * 2 - swap - if (swap + mem + suggestion) < 192: - suggestion = 192 - (swap + mem) - if suggestion < 32: - suggestion = 32 - suggSize = 0 - suggMnt = None + suggDev = None for (device, size) in fsList: - if (size > suggSize) and (size > (suggestion + 100)): + if size > suggestedMin+100: suggDev = device - anaconda.upgradeSwapInfo = (fsList, suggestion, suggDev) + anaconda.upgradeSwapInfo = (fsList, suggestedMin, suggDev) # XXX handle going backwards def upgradeMountFilesystems(anaconda): -- 1.7.4.1

3 2

[PATCH master f15-branch] Log running version number as soon as possible
by Brian C. Lane 15 Mar '11

15 Mar '11

--- anaconda | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index f9d9048..6119d6d 100755 --- a/anaconda +++ b/anaconda @@ -147,11 +147,14 @@ def symlink_updates(dest_dir, update_dir): continue os.symlink(dest_path, update_path) -def parseOptions(argv = None): +def getAnacondaVersion(): # Using _isys here so we don't drag in the logging stuff, which is always # complicated. from pyanaconda import _isys - op = OptionParser(version="%prog " + _isys.getAnacondaVersion()) + return _isys.getAnacondaVersion() + +def parseOptions(argv = None): + op = OptionParser(version="%prog " + getAnacondaVersion()) # Interface op.add_option("-C", "--cmdline", dest="display_mode", action="store_const", const="c", @@ -694,6 +697,8 @@ if __name__ == "__main__": stdoutLog.error("anaconda must be run as root.") sys.exit(0) + log.info("%s %s" % (sys.argv[0], getAnacondaVersion())) + # pull this in to get product name and versioning from pyanaconda import product -- 1.7.4

2 3

[rhel6-branch] IB: add missing modules to the image.
by Ales Kozumplik 15 Mar '11

15 Mar '11

Those shoud be listed in kernel's modules.networking but are not (#683925). Related: rhbz#660686 --- scripts/mk-images | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index ef78b8c..850d802 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -107,7 +107,8 @@ LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-cry RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $SDMODS =scsi =net =drm" +INFINIBANDMODS="ib_qib mlx4_ib" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $INFINIBANDMODS $SDMODS =scsi =net =drm" . $(dirname $0)/buildinstall.functions -- 1.7.3.3

2 1

[rhel6-branch] Support for IPoIB.
by Ales Kozumplik 15 Mar '11

15 Mar '11

For now the support includes: - support for 20-byte MAC addresses - allowing detection of IB devices in devices.c - using libnl to detect the link layer type of a device This all ensures we write out correct information into the ifcfg files (which are then used by NM). This is an initial attempt, I am unable to fully test this now due to problems with missing IB support in NetworkManager. Related: rhbz#660686 --- isys/devices.c | 4 +++- isys/iface.c | 34 +++++++++++++++++++++++++++++++++- isys/iface.h | 5 +++++ loader/loader.c | 3 +++ loader/net.c | 29 +++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 2 deletions(-) diff --git a/isys/devices.c b/isys/devices.c index 2a77ce4..819b2fb 100644 --- a/isys/devices.c +++ b/isys/devices.c @@ -172,7 +172,9 @@ storagedone: return NULL; } - if (type != ARPHRD_ETHER && type != ARPHRD_SLIP) + if (type != ARPHRD_ETHER && + type != ARPHRD_INFINIBAND && + type != ARPHRD_SLIP) continue; new = calloc(1, sizeof(struct device)); diff --git a/isys/iface.c b/isys/iface.c index 05446ee..db3027f 100644 --- a/isys/iface.c +++ b/isys/iface.c @@ -275,7 +275,7 @@ char *iface_mac2device(char *mac) { * readable format (e.g., 00:11:52:12:D9:A0). Return NULL for no match. */ char *iface_mac2str(char *ifname) { - int buflen = 20; + int buflen = 64; char *buf = NULL; struct nl_handle *handle = NULL; struct nl_cache *cache = NULL; @@ -569,3 +569,35 @@ ifacemtu_error1: return ret; } + +/* + * Get the link layer type of the device. + */ +int iface_get_arptype(const char *ifname) +{ + int ret; + struct nl_cache *cache = NULL; + struct nl_handle *handle = NULL; + struct rtnl_link *link = NULL; + + if (ifname == NULL) { + return -1; + } + + if ((cache = _iface_get_link_cache(&handle)) == NULL) { + return -3; + } + + if ((link = rtnl_link_get_by_name(cache, ifname)) == NULL) { + ret = -4; + goto iface_get_arptype_error; + } + + ret = rtnl_link_get_arptype(link); + +iface_get_arptype_error: + nl_close(handle); + nl_handle_destroy(handle); + + return ret; +} diff --git a/isys/iface.h b/isys/iface.h index f7d073e..567f5ee 100644 --- a/isys/iface.h +++ b/isys/iface.h @@ -164,4 +164,9 @@ int iface_start_NetworkManager(void); */ int iface_set_interface_mtu(char *ifname, int mtu); +/* + * Get the link layer type of the device. + */ +int iface_get_arptype(const char *ifname); + #endif /* ISYSIFACE_H */ diff --git a/loader/loader.c b/loader/loader.c index 0154ce0..81e1d68 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2073,6 +2073,9 @@ int main(int argc, char ** argv) { mlLoadModuleSet("cramfs:squashfs:iscsi_tcp"); + /* Load all modules needed for IP over Infiniband */ + mlLoadModuleSet("ib_ipoib:mlx4_core:mlx4_en"); + loadScsiDhModules(); #if !defined(__s390__) && !defined(__s390x__) diff --git a/loader/net.c b/loader/net.c index 1531d4f..725c160 100644 --- a/loader/net.c +++ b/loader/net.c @@ -30,6 +30,7 @@ #include <errno.h> #include <resolv.h> #include <net/if.h> +#include <net/if_arp.h> #include <newt.h> #include <stdlib.h> #include <string.h> @@ -154,6 +155,31 @@ static void ipCallback(newtComponent co, void * dptr) { } } +/* + * Return a newly allocated string with the network device type. + * + * This can directly be written into the ifcfg script's TYPE= field. + */ +static char *netArpTypeStr(iface_t *iface) +{ + char *ret = NULL; + int arptype = iface_get_arptype(iface->device); + switch (arptype) { + case ARPHRD_ETHER: + ret = strdup("Ethernet"); + break; + case ARPHRD_INFINIBAND: + ret = strdup("Infiniband"); + break; + case ARPHRD_SLIP: + break; + default: + logMessage(ERROR, "Unknown network device type: %d", arptype); + break; + } + return ret; +} + static void setMethodSensitivity(void *dptr, int radio_button_count) { int i = 0; @@ -1295,6 +1321,9 @@ int writeEnabledNetInfo(iface_t *iface) { fprintf(fp, "HWADDR=%s\n", iface_mac2str(iface->device)); #endif fprintf(fp, "ONBOOT=yes\n"); + char *str_type = netArpTypeStr(iface); + if (str_type) fprintf(fp, "TYPE=%s\n", str_type); + free(str_type); if (!FL_NOIPV4(flags)) { if (iface->ipv4method == IPV4_IBFT_METHOD) { -- 1.7.3.3

2 1

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

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 March 2011