Anaconda-devel May 2010

anaconda-devel@lists.fedoraproject.org

25 participants
180 discussions

2 patches on ReviewBoard
by David Cantrell 03 May '10

03 May '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Yesterday I posted some patches for review on ReviewBoard. Since the email notices are not currently set up, I'm sending this out. Thanks, - -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvbPT0ACgkQ5hsjjIy1VkmrDwCg4AsEWn1Wdf8rDJ90hNNfHL3Q G3sAoPlK4cbbq4XQN+i6dfZB0hafMwnd =0Trr -----END PGP SIGNATURE-----

4 6

[PATCH rhel6-branch] Make the rule for 70-anaconda.rules in updates.img be generic.
by Peter Jones 03 May '10

03 May '10

This makes it possible to replace any udev *.rules file in an updates image. --- anaconda | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/anaconda b/anaconda index 20ae4a0..2486164 100755 --- a/anaconda +++ b/anaconda @@ -147,10 +147,12 @@ def setupPythonUpdates(): f), "/tmp/updates/%s/%s" %(pypkg, f)) - if os.access("/tmp/updates/70-anaconda.rules", os.R_OK): - import shutil - shutil.copyfile("/tmp/updates/70-anaconda.rules", - "/etc/udev/rules.d/70-anaconda.rules") + + import glob + import shutil + for rule in glob.glob("/tmp/updates/*.rules"): + target = "/etc/udev/rules.d/" + rule.split('/')[-1] + shutil.copyfile(rule, target) def parseOptions(): def resolution_cb (option, opt_str, value, parser): -- 1.7.0.1

2 1

[PATCH] Default the global grub timeout to 5 for serial
by Jesse Keating 03 May '10

03 May '10

Just setting the terminal timeout doesn't seem to be enough. This sets the global time out if serial is in use. Resolves #568106 --- booty/x86.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/booty/x86.py b/booty/x86.py index 14bd641..89d6393 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -278,9 +278,10 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write('default=%s\n' % (default)) - f.write('timeout=%d\n' % (self.timeout or 0)) if self.serial == 1: + # Set the global timeout in serial case + f.write('timeout=%d\n' % (self.timeout or 5)) # grub the 0-based number of the serial console device unit = self.serialDevice[-1] @@ -299,6 +300,8 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write("serial --unit=%s --speed=%s\n" %(unit, speed)) f.write("terminal --timeout=%s serial console\n" % (self.timeout or 5)) else: + # Default to 0 timeout in the non-serial case + f.write('timeout=%d\n' % (self.timeout or 0)) # we only want splashimage if they're not using a serial console if os.access("%s/boot/grub/splash.xpm.gz" %(instRoot,), os.R_OK): f.write('splashimage=%s%sgrub/splash.xpm.gz\n' -- 1.7.0.1

3 2

[firstboot] Fixed the eula module to show Red Hat license (#563734)
by Martin Gracik 03 May '10

03 May '10

--- modules/eula.py | 79 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 59 insertions(+), 20 deletions(-) diff --git a/modules/eula.py b/modules/eula.py index 2b60799..09fe2e8 100644 --- a/modules/eula.py +++ b/modules/eula.py @@ -18,6 +18,8 @@ # with the express permission of Red Hat, Inc. # import gtk +import os +import glob from firstboot.config import * from firstboot.constants import * @@ -37,30 +39,67 @@ class moduleClass(Module): self.icon = "workstation.png" def apply(self, interface, testing=False): - return RESULT_SUCCESS + if self.okButton.get_active() == True: + return RESULT_SUCCESS + else: + dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_QUESTION, gtk.BUTTONS_NONE, + (_("Do you want to reread or reconsider the Licence Agreement? " + "If not, please shut down the computer and remove this " + "product from your system. "))) + + dlg.set_position(gtk.WIN_POS_CENTER) + dlg.set_modal(True) + + continueButton = dlg.add_button(_("_Reread license"), 0) + shutdownButton = dlg.add_button(_("_Shut down"), 1) + continueButton.grab_focus() + + rc = dlg.run() + dlg.destroy() + + if rc == 0: + return RESULT_FAILURE + elif rc == 1: + os.system("/sbin/halt") + return RESULT_FAILURE def createScreen(self): self.vbox = gtk.VBox(spacing=10) - label = gtk.Label(_("""Thank you for installing Fedora. Fedora is a \ -compilation of software packages, each under its own license. The \ -compilation is made available under the GNU General Public License version \ -2. There are no restrictions on using, copying, or modifying this code. \ -However, there are restrictions and obligations that apply to the \ -redistribution of the code, either in its original or a modified form. \ -Among other things, those restrictions/obligations pertain to the \ -licensing of the redistribution, trademark rights, and export control.\n\n\ -If you would like to understand what those restrictions are, please \ -visit http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement.""")) - label.set_line_wrap(True) - label.set_alignment(0.0, 0.0) - label.set_size_request(500, -1) - self.vbox.pack_start(label, expand=False, fill=False) - - label = gtk.Label(_("Understood, please proceed.")) - label.set_alignment(0.0, 0.1) - - self.vbox.pack_start(label) + internalVBox = gtk.VBox() + internalVBox.set_border_width(10) + internalVBox.set_spacing(5) + + textBuffer = gtk.TextBuffer() + textView = gtk.TextView() + textView.set_editable(False) + textSW = gtk.ScrolledWindow() + textSW.set_shadow_type(gtk.SHADOW_IN) + textSW.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + textSW.add(textView) + + try: + path = glob.glob("/usr/share/doc/redhat-release*/EULA")[0] + except IndexError: + lines = "No license file\n" + else: + lines = open(path).readlines() + + iter = textBuffer.get_iter_at_offset(0) + + for line in lines: + textBuffer.insert(iter, line) + textView.set_buffer(textBuffer) + + self.okButton = gtk.RadioButton(None, (_("_Yes, I agree to the License Agreement"))) + self.noButton = gtk.RadioButton(self.okButton, (_("N_o, I do not agree"))) + self.okButton.set_active(True) + + internalVBox.pack_start(textSW, True) + internalVBox.pack_start(self.okButton, False) + internalVBox.pack_start(self.noButton, False) + + self.vbox.pack_start(internalVBox, True, 5) def initializeUI(self): pass -- 1.6.6.1

2 1

[PATCH F13Blocker] Don't add recovery partitions to the grub boot menu (#534066)
by Hans de Goede 03 May '10

03 May '10

--- booty/bootloaderInfo.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 610195f..0b50f7f 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -281,14 +281,16 @@ class BootImages: type = part.format.type - if type in dosFilesystems and not foundDos and doesDualBoot(): + if type in dosFilesystems and not foundDos and doesDualBoot() and \ + not part.getFlag(parted.PARTITION_DIAG): try: bootable = checkForBootBlock(part.path) retval.append((part, type)) foundDos = True except: pass - elif type in ["ntfs", "hpfs"] and not foundDos and doesDualBoot(): + elif type in ["ntfs", "hpfs"] and not foundDos and \ + doesDualBoot() and not part.getFlag(parted.PARTITION_DIAG): retval.append((part, type)) # maybe questionable, but the first ntfs or fat is likely to # be the correct one to boot with XP using ntfs -- 1.7.0.1

3 2

[rhel6-branch] Add nfs options to kickstart if we use nfsiso (#585136)
by Martin Gracik 03 May '10

03 May '10

This fixes not having the nfs options in kickstart file if we use iso image on nfs. --- instdata.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/instdata.py b/instdata.py index 4195394..c226cd4 100644 --- a/instdata.py +++ b/instdata.py @@ -229,12 +229,12 @@ class InstallData: (part, dir) = string.split(m[3:], ":") f.write("harddrive --partition=%s --dir=%s\n" % (part, dir)) - elif m.startswith("nfs:"): + elif m.startswith("nfs:") or m.startswith("nfsiso:"): if m.count(":") == 3: - (server, opts, dir) = string.split(m[4:], ":") + (method, server, opts, dir) = m.split(":") f.write("nfs --server=%s --opts=%s --dir=%s" % (server, opts, dir)) else: - (server, dir) = string.split(m[4:], ":") + (method, server, dir) = m.split(":") f.write("nfs --server=%s --dir=%s\n" % (server, dir)) elif m.startswith("ftp://") or m.startswith("http"): f.write("url --url=%s\n" % urllib.unquote(m)) -- 1.6.6.1

2 1

[PATCH rhel6-branch 1/3] Add a method that fetches and returns the .treeinfo file.
by Chris Lumens 03 May '10

03 May '10

--- yuminstall.py | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 858fe0a..05a3b69 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -589,6 +589,18 @@ class AnacondaYum(YumSorter): return repo + def _getTreeinfo(self): + if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): + return "%s/.treeinfo" % self.anaconda.methodstr + else: + try: + ug = URLGrabber() + ug.urlgrab("%s/.treeinfo" % self.anaconda.methodstr, + "/tmp/.treeinfo", copy_local=1) + return "/tmp/.treeinfo" + except: + return None + # We need to make sure $releasever gets set up before .repo files are # read. Since there's no redhat-release package in /mnt/sysimage (and # won't be for quite a while), we need to do our own substutition. @@ -596,15 +608,12 @@ class AnacondaYum(YumSorter): from ConfigParser import ConfigParser c = ConfigParser() - try: - if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): - ConfigParser.read(c, "%s/.treeinfo" % self.anaconda.methodstr) - else: - ug = URLGrabber() - ug.urlgrab("%s/.treeinfo" % self.anaconda.methodstr, - "/tmp/.treeinfo", copy_local=1) - ConfigParser.read(c, "/tmp/.treeinfo") + treeinfo = self._getTreeinfo() + if not treeinfo: + return productVersion + ConfigParser.read(c, treeinfo) + try: return c.get("general", "version") except: return productVersion -- 1.7.0.1

3 12

[PATCH rhel6-branch 1/3] Copy install.img and remount no matter how many discs (#577196)
by Peter Jones 03 May '10

03 May '10

It seems we have unmount/reboot problems when using only one disc when we don't copy the install.img. So always do that. --- backend.py | 3 +-- yuminstall.py | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/backend.py b/backend.py index 4a91186..3744e88 100644 --- a/backend.py +++ b/backend.py @@ -156,8 +156,7 @@ class AnacondaBackend: if self._loopbackFile and os.path.exists(self._loopbackFile): return - # If we've booted off the first CD (so, not the boot.iso or DVD) then - # copy the install.img to the filesystem and switch loopback devices + # Copy the install.img to the filesystem and switch loopback devices # to there. Otherwise we won't be able to unmount and swap media. free = anaconda.id.storage.fsFreeSpace self._loopbackFile = "%s%s/rhinstall-install.img" % (anaconda.rootPath, diff --git a/yuminstall.py b/yuminstall.py index 858fe0a..a9b0d52 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -888,11 +888,10 @@ class AnacondaYum(YumSorter): mkeys = self.tsInfo.reqmedia.keys() mkeys.sort(mediasort) - if len(mkeys) > 1: - stage2img = "%s/images/install.img" % self.tree - if self.anaconda.backend.mountInstallImage(self.anaconda, stage2img): - self.anaconda.id.storage.umountFilesystems() - return DISPATCH_BACK + stage2img = "%s/images/install.img" % self.tree + if self.anaconda.backend.mountInstallImage(self.anaconda, stage2img): + self.anaconda.storage.umountFilesystems() + return DISPATCH_BACK for i in mkeys: self.tsInfo.curmedia = i -- 1.7.0.1

2 3

double module loads
by Ales Kozumplik 03 May '10

03 May '10

Hi Chris, list, I think the whole 'pyanaconda' change had one side effect we didn't expect: modules can be imported and initialized twice now. The sys.path now contains both: site-packages site-packages/pyanaconda The first one is the default and allows us to do things like from pyanaconda import Anaconda which we almost never do. The second one allows us to do the classical short: import kickstart The problem is when you do import module and later: from pyanaconda import module For python, the two modules seem to be a different module and so it loads them twice (and adds them as two separate entries into sys.modules, once as 'module', then as 'pyanaconda.module'). The module init code that we expect to be executed exactly once is then executed twice. I found out about this thing by noticing that all the logging output is doubled after certain execution point (due to handlers being added twice). Another complication is with updates: if a module is first imported from your update directory but later from site-packages/pyanaconda, it actually runs a different code--->total chaos. I spend the morning looking at this and here's what we could do: 1) Replace all imports to be from pyanaconda. instead of: import kickstart one would write: from pyanaconda import kickstart Big and tedious change. 2) have import hooks that make sure everything is imported only once. Attempt to load an already imported module will produce a mere entry/reference copy in sys.modules. I prefer this solution, it allows us to gradually migrate to (1) and then get rid of it. 3) Remove all the offending from pyanaconda import .. lines and only use the old import style. This means the problem is going to bite us later (or it's going to bite someone who imports anaconda modules and then us). Ales

3 3

[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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel May 2010