Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[PATCH] Better naming for LVM volume groups and logical volumes (#461682)
by David Cantrell 02 Dec '08

02 Dec '08

Try to name volume groups as vg_HOSTNAME and logical volumes as lv_MOUNTPOINT, if we can. Swap partitions will be lv_swapNN where NN is a unique number in the instance where more than one swap partition in use. The / partition will get the name lv_root. --- autopart.py | 23 +++++++++++++++-- lvm.py | 76 +++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 74 insertions(+), 25 deletions(-) diff --git a/autopart.py b/autopart.py index f335602..544c403 100644 --- a/autopart.py +++ b/autopart.py @@ -1463,7 +1463,7 @@ def doAutoPartition(anaconda): # FIXME: this is a hack so that autopartition'd vgs # can have a unique name if req.autoname == 1 and req.volumeGroupName == "lvm": - n = lvm.createSuggestedVGName(partitions) + n = lvm.createSuggestedVGName(partitions, anaconda.id.network) req.volumeGroupName = n if (isinstance(req, partRequests.LogicalVolumeRequestSpec)): @@ -1663,17 +1663,34 @@ def autoCreateLVMPartitionRequests(autoreq): grow = grow, format = format) else: + # try to incorporate the mount point in to the logical volume name + if mntpt is not None and mntpt != '': + if mntpt == '/': + lvtemplate = 'lv_root' + else: + tmp = string.strip(mntpt) + tmp = tmp.replace('/', '_') + + while not tmp.startswith('_'): + tmp = tmp[1:] + + lvtemplate = "lv_%s" % (tmp,) + else: + if ptype == fsset.fileSystemTypeGet("swap"): + lvtemplate = "lv_swap" + else: + lvtemplate = "LogVol" + newrequest = partRequests.LogicalVolumeRequestSpec(ptype, mountpoint = mntpt, size = minsize, maxSizeMB = maxsize, grow = grow, format = format, - lvname = "LogVol%02d" %(volnum,), + lvname = "%s" %(lvtemplate,), volgroup = "lvm") volnum += 1 - requests.append(newrequest) return requests diff --git a/lvm.py b/lvm.py index 70d5108..ed75fb8 100644 --- a/lvm.py +++ b/lvm.py @@ -515,45 +515,77 @@ def getMaxLVSize(pe): else: return (16*1024*1024) #Max is 16TiB -def createSuggestedVGName(partitions): +def createSuggestedVGName(partitions, network): """Given list of partition requests, come up with a reasonable VG name partitions - list of requests """ - i = 0 - while 1: - tmpname = "VolGroup%02d" % (i,) - if not partitions.isVolumeGroupNameInUse(tmpname): - break - i = i + 1 - if i>99: - tmpname = "" + # try to create a volume group name incorporating the hostname + if network.hostname is not None and network.hostname != '': + if network.hostname.find('.') != -1: + vgtemplate = "vg_%s" % (network.hostname.split('.')[0].lower(),) + else: + vgtemplate = "vg_%s" % (network.hostname.lower(),) + else: + vgtemplate = "VolGroup" + + if not partitions.isVolumeGroupNameInUse(vgtemplate): + return vgtemplate + else: + i = 0 + while 1: + tmpname = "%s%02d" % (vgtemplate, i,) + if not partitions.isVolumeGroupNameInUse(tmpname): + break + + i += 1 + if i > 99: + tmpname = "" + + return tmpname - return tmpname - def createSuggestedLVName(logreqs): """Given list of LV requests, come up with a reasonable LV name partitions - list of LV requests for this VG """ + + # try to incorporate the mount point in to the logical volume name + if lv.mountpoint is not None and lv.mountpoint != '': + if lv.mountpoint == '/': + lvtemplate = 'lv_root' + else: + tmp = string.strip(lv.mountpoint) + tmp = tmp.replace('/', '_') + + while not tmp.startswith('_'): + tmp = tmp[1:] + + lvtemplate = "lv_%s" % (tmp,) + else: + lvtemplate = "LogVol" + i = 0 lnames = [] for lv in logreqs: - lnames.append(lv.logicalVolumeName) - - while 1: - tmpname = "LogVol%02d" % (i,) - if (logreqs is None) or (tmpname not in lnames): - break + lnames.append(lv.logicalVolumeName) + + if (logreqs is None) or (lvtemplate not in lnames): + return lvtemplate + else: + while 1: + tmpname = "%s%02d" % (lvtemplate, i,) + if (logreqs is None) or (tmpname not in lnames): + break + + i += 1 + if i > 99: + tmpname = "" - i = i + 1 - if i>99: - tmpname = "" + return tmpname - return tmpname - def getVGUsedSpace(vgreq, requests, diskset): vgused = 0 for request in requests.requests: -- 1.6.0.3

3 2

[PATCH] In addSnap(), check snapshots for data key before continuing (#433824)
by David Cantrell 02 Dec '08

02 Dec '08

data may not exist in the snapshots hash. If it isn't there, return to caller. --- partitions.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/partitions.py b/partitions.py index a9b658e..74a9e11 100644 --- a/partitions.py +++ b/partitions.py @@ -1756,6 +1756,8 @@ class Partitions: lvm_parent_deletes = [] tmp = {} def addSnap(name, vg): + if not snapshots.has_key(name): + return snaps = snapshots[name] for snap, snapvg in snaps: addSnap(snap, snapvg) -- 1.6.0.3

2 1

[PATCH] Match textw/network_text.py strings to iw/network_gui.py (#470145)
by David Cantrell 02 Dec '08

02 Dec '08

Match up the strings and dialog windows in the text mode interface. --- textw/network_text.py | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-) diff --git a/textw/network_text.py b/textw/network_text.py index 0d9f4fa..0b90405 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -37,22 +37,10 @@ log = logging.getLogger("anaconda") class HostnameWindow: def __call__(self, screen, anaconda): - # XXX: currently string frozen for F10, but change the dialog - # title to just 'Hostname' after F10 is released - toplevel = GridFormHelp(screen, _("Hostname Configuration"), - "hostname", 1, 3) - - # XXX: currently string frozen for F10, but change this text - # to 'Please name this computer. The hostname identifies the - # computer on a network.' after F10 is released. This will - # have the text interface match the iw interface. + toplevel = GridFormHelp(screen, _("Hostname"), "hostname", 1, 3) text = TextboxReflowed(55, - _("If your system is part of a larger network " - "where hostnames are assigned by DHCP, " - "select automatically via DHCP. Otherwise, " - "select manually and enter a hostname for " - "your system. If you do not, your system " - "will be known as 'localhost.'")) + _("Please name this computer. The hostname " + "identifies the computer on a network.")) toplevel.add(text, 0, 0, (0, 0, 0, 1)) hostEntry = Entry(55) @@ -70,23 +58,25 @@ class HostnameWindow: screen.popWindow() return INSTALL_BACK - hname = string.strip(hostEntry.value()) - if len(hname) == 0: - ButtonChoiceWindow(screen, _("Invalid Hostname"), - _("You have not specified a hostname."), + hostname = string.strip(hostEntry.value()) + neterrors = network.sanityCheckHostname(hostname) + + if not hostname: + ButtonChoiceWindow(_("Error with Hostname"), + _("You must enter a valid hostname for this " + "computer."), buttons = [ _("OK") ]) continue - neterrors = network.sanityCheckHostname(hname) if neterrors is not None: - ButtonChoiceWindow(screen, _("Invalid Hostname"), - _("The hostname \"%s\" is not valid " - "for the following reason:\n\n%s") - %(hname, neterrors), - buttons = [ _("OK") ]) + ButtonChoiceWindow(_("Error with Hostname"), + _("The hostname \"%s\" is not valid for the " + "following reason:\n\n%s") + % (hostname, herrors,), + buttons = [ _("OK") ]) continue - anaconda.id.network.hostname = hname + anaconda.id.network.hostname = hostname break screen.popWindow() -- 1.6.0.3

2 1

[PATCH] Say we are unable to configure the network interface (#467960)
by David Cantrell 02 Dec '08

02 Dec '08

In stage 2 when you get the 'Enable network interface' dialog, if you select an interface that is not able to connect to a network, we just wait and then take the user back to the Enable network interface dialog. Before going back to the dialog, tell the user we were unable to configure the selected interface. --- iw/netconfig_dialog.py | 24 +++++++++++++++++------- textw/netconfig_text.py | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py index 5eac64d..6a8bdc7 100644 --- a/iw/netconfig_dialog.py +++ b/iw/netconfig_dialog.py @@ -188,10 +188,23 @@ class NetworkConfigurator: d.run() d.destroy() + def _handleNetworkError(self, field): + d = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, + gtk.BUTTONS_OK, + _("An error occurred trying to bring up the " + "%s network interface.") % (field,)) + d.set_title(_("Error Configuring Network")) + d.set_position(gtk.WIN_POS_CENTER) + gui.addFrame(d) + d.run() + d.destroy() + def _cancel(self, *args): self.rc = gtk.RESPONSE_CANCEL def _ok(self, *args): + self.rc = gtk.RESPONSE_OK + haveNet = False combo = self.xml.get_widget("interfaceCombo") active = combo.get_active_iter() val = combo.get_model().get_value(active, 1) @@ -205,9 +218,8 @@ class NetworkConfigurator: w = gui.WaitWindow(_("Dynamic IP"), _("Sending request for IP information " "for %s...") % (netdev.get('DEVICE'),)) - self.network.bringUp() + haveNet = self.network.bringUp() w.pop() - self.rc = gtk.RESPONSE_OK else: netdev.set(('BOOTPROTO', 'static')) ipv4addr = self.xml.get_widget("ipv4Address").get_text() @@ -271,7 +283,7 @@ class NetworkConfigurator: return False try: - self.network.bringUp() + haveNet = self.network.bringUp() except Exception, e: import logging log = logging.getLogger("anaconda") @@ -279,10 +291,8 @@ class NetworkConfigurator: self._handleIPError(_("Error configuring network device:"), e) return False - if self.rc != gtk.RESPONSE_OK: - gui.MessageWindow(_("Error"), - _("Error configuring network device"), - type = "ok", custom_icon="error") + if not haveNet: + self._handleNetworkError(netdev.get('DEVICE')) return False return True diff --git a/textw/netconfig_text.py b/textw/netconfig_text.py index 433f5d8..6a92782 100644 --- a/textw/netconfig_text.py +++ b/textw/netconfig_text.py @@ -266,6 +266,8 @@ class NetworkConfiguratorText: w.pop() if result: break + else: + self.anaconda.intf.messageWindow(_("Error"), _("Error configuring network device"), _("Error configuring network device %s") % netdev.get('DEVICE')) self.screen.popWindow() return INSTALL_OK -- 1.6.0.3

2 1

[PATCH] Make complete text mention updates (#244431)
by Jeremy Katz 01 Dec '08

01 Dec '08

Mention that updates are available and sync up text for completion between text mode and GUI --- iw/congrats_gui.py | 17 ++++++----------- textw/complete_text.py | 16 ++++++---------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 66a4540..ea2e435 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -66,17 +66,12 @@ class CongratulationWindow (InstallWindow): a.set_size_request(200, -1) hbox.pack_start (a, False, False, 36) - bootstr = "" - if iutil.isS390() or os.path.exists("/dev/live-osimg"): - floppystr = _("Please reboot the system to use the installed " - "system.\n\n") - else: - floppystr = _("Press the \"Reboot\" button to reboot your system." - "\n\n") - - - txt = _("Congratulations, the installation is complete.\n\n" - "%s%s") %(floppystr, bootstr) + txt = _("Congratulations, your %s installation is complete.\n\n" + "Please reboot the system to use the installed system. " + "Note that updates may be available to ensure the proper " + "functioning of your system and installation of these " + "updates is recommended after initially booting your " + "system.") %(productName,) label = gui.WrappingLabel(txt) label.set_size_request(250, -1) diff --git a/textw/complete_text.py b/textw/complete_text.py index c6ab30a..9b1871f 100644 --- a/textw/complete_text.py +++ b/textw/complete_text.py @@ -29,20 +29,16 @@ class FinishedWindow: def __call__ (self, screen, anaconda): bootstr = "" - floppystr = _("Press <Enter> to end the installation process.\n\n") bottomstr = _("<Enter> to exit") screen.pushHelpLine (string.center(bottomstr, screen.width)) - txt = _("Congratulations, your %s installation is " - "complete.\n\n" - "%s%s") %(productName, floppystr, bootstr) - foo = _("For information on errata (updates and bug fixes), visit " - "http://www.redhat.com/errata/.\n\n" - "Information on using your " - "system is available in the %s manuals at " - "http://www.redhat.com/docs/.") %(productName,) - + txt = _("Congratulations, your %s installation is complete.\n\n" + "Please reboot the system to use the installed system. " + "Note that updates may be available to ensure the proper " + "functioning of your system and installation of these " + "updates is recommended after initially booting your " + "system.") %(productName,) rc = ButtonChoiceWindow (screen, _("Complete"), txt, [ _("Reboot") ], help = "finished", width=60) -- 1.6.0.4

3 3

Unified instalaltion media for ia32 and x86_64 (Intel compatible)
by Milan Keršláger 01 Dec '08

01 Dec '08

Hi, I would be glad if there will be only one installation media (something as we have now for x86_64). The user then will pick pure 32 or 64 or mixed 32+64 bit environment installation. This may save a lot of bandwithw and make 32->64 transition more easy and smooth for average user. Milan Kerslager -- Milan Kerslager http://www.pslib.cz/ke/ http://www.nti.tul.cz/wiki/Milan.Kerslager

3 2

[PATCH] Use modules.* files for finding modules of a type rather than modinfo
by Jeremy Katz 01 Dec '08

01 Dec '08

Use the modules.* files for finding modules of a type rather than the modinfo and then pull in drm modules using it rather than having to explicitly list them. (#446126) --- scripts/mk-images | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index 3b480cb..a405df7 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -117,8 +117,7 @@ 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" -DRMMODS="drm i810 i830 i915 mga nouveau r128 radeon savage sis tdfx via" -INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $DRMMODS $SDMODS =scsi =net" +INITRDMODS="$USBMODS $FIREWIREMODS $IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS $CRYPTOMODS $COMMONMODS $PCMCIASOCKMODS $SDMODS =scsi =net =drm" . $(dirname $0)/buildinstall.functions @@ -261,7 +260,16 @@ expandModuleSet() { char=$(echo $name | cut -c1) if [ $char = '=' ]; then NAME=$(echo $name | cut -c2-) - SET="$SET $($MODLIST --modinfo-file $MODINFO $NAME)" + if [ "$NAME" = "ata" ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block |egrep '(ata|ahci)' |sed -e 's/.ko//')" + elif [ "$NAME" = "scsi" ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.block) |sed -e 's/.ko//')" + else + # Ignore if group list does not exist + if [ -e $MBD_DIR/lib/modules/$kernel/modules.$NAME ]; then + SET="$SET $(cat $MBD_DIR/lib/modules/$kernel/modules.$NAME |sed -e 's/.ko//')" + fi + fi else SET="$SET $name" fi -- 1.6.0.4

2 1

[PATCH] Make text for autopartitioning types clearer (#441350)
by Jeremy Katz 01 Dec '08

01 Dec '08

We used "default" a lot in the text. Change based on notting's suggestion and make the intro text a little clearer to match --- iw/autopart_type.py | 8 ++++---- textw/partition_text.py | 12 ++++-------- ui/autopart.glade | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index 33efa5f..f166eab 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -415,10 +415,10 @@ class PartitionTypeWindow(InstallWindow): store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT) self.combo.set_model(store) - opts = ((_("Remove all partitions on selected drives and create default layout"), CLEARPART_TYPE_ALL), - (_("Remove Linux partitions on selected drives and create default layout"), CLEARPART_TYPE_LINUX), - (_("Resize existing partition and create default layout in free space"), -2), - (_("Use free space on selected drives and create default layout"), CLEARPART_TYPE_NONE), + opts = ((_("Use entire drive"), CLEARPART_TYPE_ALL), + (_("Replace existing Linux system"), CLEARPART_TYPE_LINUX), + (_("Shrink current system"), -2), + (_("Use free space"), CLEARPART_TYPE_NONE), (_("Create custom layout"), -1)) for (txt, val) in opts: iter = store.append(None) diff --git a/textw/partition_text.py b/textw/partition_text.py index 83638d0..1944ee1 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1508,16 +1508,12 @@ class PartitionTypeWindow: while 1: g = GridFormHelp(screen, _("Partitioning Type"), "autopart", 1, 6) - txt = TextboxReflowed(65, _("Installation requires partitioning " - "of your hard drive. The default " - "layout is reasonable for most " - "users. You can either choose " - "to use this or create your own.")) + txt = TextboxReflowed(65, _("Installation requires partitioning of your hard drive. The default layout is suitable for most users. Select what space to use and which drives to use as the install target. You can also choose to create your own custom layout.")) g.add(txt, 0, 0, (0, 0, 0, 0)) - opts = ((_("Remove all partitions on selected drives and create default layout"), CLEARPART_TYPE_ALL), - (_("Remove Linux partitions on selected drives and create default layout"), CLEARPART_TYPE_LINUX), - (_("Use free space on selected drives and create default layout"), CLEARPART_TYPE_NONE), + opts = ((_("Use entire drive"), CLEARPART_TYPE_ALL), + (_("Replace existing Linux system"), CLEARPART_TYPE_LINUX), + (_("Use free space"), CLEARPART_TYPE_NONE), (_("Create custom layout"), -1)) typebox = Listbox(height = len(opts), scroll = 0) for (txt, val) in opts: diff --git a/ui/autopart.glade b/ui/autopart.glade index 9378cb6..199c359 100644 --- a/ui/autopart.glade +++ b/ui/autopart.glade @@ -30,7 +30,7 @@ <child> <widget class="GtkLabel" id="mainlabel"> <property name="visible">True</property> - <property name="label" translatable="yes">Installation requires partitioning of your hard drive. By default, a partitioning layout is chosen which is reasonable for most users. You can either choose to use this or create your own.</property> + <property name="label" translatable="yes">Installation requires partitioning of your hard drive. The default layout is suitable for most users. Select what space to use and which drives to use as the install target. You can also choose to create your own custom layout.</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> -- 1.6.0.4

2 1

[PATCH] Fix up syntax error
by Jeremy Katz 01 Dec '08

01 Dec '08

This one is pretty straight-forward and just fixes up a syntax error on master --- image.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/image.py b/image.py index 5b6273b..25d9fd0 100644 --- a/image.py +++ b/image.py @@ -243,7 +243,7 @@ def presentRequiredMediaMessage(anaconda): "following %s %s discs:\n\n%s\nPlease have these ready " "before proceeding with the installation. If you need to " "abort the installation and exit please select " - "\"Reboot\".") % (product.productName, product.productVersion, reqcdstr) + "\"Reboot\".") % (product.productName, product.productVersion, reqcdstr), type="custom", custom_icon="warning", custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")]) -- 1.6.0.4

2 1

[PATCH] traceback looking for existing roots (rawhide #473498)
by Dave Lehman 01 Dec '08

01 Dec '08

I've attached a simple patch that will fix the traceback, but I admit I am a little confused how this came to be an issue. Reporter says he/she has encrypted PV, which presumably is what triggers the traceback. The thing is that we try to skip such partitions -- the only way this can happen is if the partition is not active (whatever the hell that means) or it is a PV in spite of having some other partition type. I guess there isn't anything we can do in either case? Anyway, the patch to just fix the traceback is trivial: diff --git a/partedUtils.py b/partedUtils.py index f7b9f67..4be0486 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -873,6 +873,7 @@ class DiskSet: continue elif part.fs_type or crypto: theDev = node + fstype = None if part.fs_type: fstype = part.fs_type.name Dave

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel December 2008