Anaconda-devel November 2010

anaconda-devel@lists.fedoraproject.org

27 participants
57 discussions

[PATCH] Remove writeRpmPlatform, adjust callers. (#651132, #650490)
by Bill Nottingham 11 Nov '10

11 Nov '10

The system configuration should be correct for whatever architecture we're installing; anaconda is the wrong place to set this policy. Signed-off-by: Bill Nottingham <notting(a)redhat.com> --- anaconda | 4 ---- pyanaconda/backend.py | 1 - pyanaconda/iutil.py | 46 ---------------------------------------------- pyanaconda/livecd.py | 3 --- pyanaconda/yuminstall.py | 4 ---- 5 files changed, 0 insertions(+), 58 deletions(-) diff --git a/anaconda b/anaconda index d3c65a2..6c37f12 100755 --- a/anaconda +++ b/anaconda @@ -534,10 +534,6 @@ if __name__ == "__main__": # add our own additional signal handlers signal.signal(signal.SIGHUP, startDebugger) - # we need to do this really early so we make sure its done before rpm - # is imported - iutil.writeRpmPlatform() - graphical_failed = 0 vncS = vnc.VncServer() # The vnc Server object. vncS.anaconda = anaconda diff --git a/pyanaconda/backend.py b/pyanaconda/backend.py index e874987..6d8ea1c 100644 --- a/pyanaconda/backend.py +++ b/pyanaconda/backend.py @@ -202,7 +202,6 @@ def doBackendSetup(anaconda): if anaconda.upgrade: anaconda.backend.checkSupportedUpgrade(anaconda) - iutil.writeRpmPlatform(anaconda.rootPath) def doPostSelection(anaconda): return anaconda.backend.doPostSelection(anaconda) diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index 1c5bb5b..72f314b 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -701,52 +701,6 @@ def isEfi(): return efi -## Generate the /etc/rpm/macros file. -# @param root The root of the filesystem to create the files in. -def writeRpmPlatform(root="/"): - import rpmUtils.arch - - if os.access("%s/etc/rpm/platform" %(root,), os.R_OK): - return - if not os.access("%s/etc/rpm" %(root,), os.X_OK): - os.mkdir("%s/etc/rpm" %(root,)) - - myarch = rpmUtils.arch.canonArch - - # now allow an override with rpmarch=i586 on the command line (#101971) - if flags.targetarch != None: - myarch = flags.targetarch - - # now make the current install believe it, too - rpmUtils.arch.canonArch = myarch - - # FIXME: writing /etc/rpm/macros feels wrong somehow - # temporary workaround for #92285 - if not (myarch.startswith("ppc64") or - myarch in ("s390x", "sparc64", "x86_64", "ia64")): - return - if os.access("%s/etc/rpm/macros" %(root,), os.R_OK): - if myarch.startswith("ppc64") or myarch == "sparc64": - f = open("%s/etc/rpm/macros" %(root,), 'r+') - lines = f.readlines() - addPrefer = True - for line in lines: - if line.startswith("%_prefer_color"): - addPrefer = False - if addPrefer: - f.write("%_prefer_color 1\n") - f.close() - return - else: - return - - f = open("%s/etc/rpm/macros" %(root,), 'w+') - f.write("%_transaction_color 3\n") - if myarch.startswith("ppc64") or myarch == "sparc64": - f.write("%_prefer_color 1\n") - - f.close() - # Architecture checking functions def isX86(bits=None): diff --git a/pyanaconda/livecd.py b/pyanaconda/livecd.py index 9df91b4..0f6dc3e 100644 --- a/pyanaconda/livecd.py +++ b/pyanaconda/livecd.py @@ -394,9 +394,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend): self._doFilesystemMangling(anaconda) - # setup /etc/rpm/ for the post-install environment - iutil.writeRpmPlatform(anaconda.rootPath) - storage.writeEscrowPackets(anaconda) packages.rpmSetupGraphicalSystem(anaconda) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index f811ac6..743c23d 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -1202,7 +1202,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon # FIXME: make sure that the rpmdb doesn't have stale locks :/ iutil.resetRpmDb(anaconda.rootPath) - iutil.writeRpmPlatform() self.ayum = AnacondaYum(anaconda) self.ayum.setup() @@ -1575,9 +1574,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon self.initLog(anaconda.rootPath) - # setup /etc/rpm/ for the post-install environment - iutil.writeRpmPlatform(anaconda.rootPath) - try: # FIXME: making the /var/lib/rpm symlink here is a hack to # workaround db->close() errors from rpm -- 1.7.3.2

2 1

[PATCH] Don't write /etc/rpm/macros. (#650490)
by Bill Nottingham 11 Nov '10

11 Nov '10

In particular, ppc is not the default over ppc64 these days. (Those willing to support sparc on this branch can patch it back in.) Signed-off-by: Bill Nottingham <notting(a)redhat.com> --- iutil.py | 43 +------------------------------------------ 1 files changed, 1 insertions(+), 42 deletions(-) diff --git a/iutil.py b/iutil.py index 0b74e08..67d4bfa 100644 --- a/iutil.py +++ b/iutil.py @@ -689,48 +689,7 @@ def isEfi(): ## Generate the /etc/rpm/macros file. # @param root The root of the filesystem to create the files in. def writeRpmPlatform(root="/"): - import rpmUtils.arch - - if os.access("%s/etc/rpm/platform" %(root,), os.R_OK): - return - if not os.access("%s/etc/rpm" %(root,), os.X_OK): - os.mkdir("%s/etc/rpm" %(root,)) - - myarch = rpmUtils.arch.canonArch - - # now allow an override with rpmarch=i586 on the command line (#101971) - if flags.targetarch != None: - myarch = flags.targetarch - - # now make the current install believe it, too - rpmUtils.arch.canonArch = myarch - - # FIXME: writing /etc/rpm/macros feels wrong somehow - # temporary workaround for #92285 - if not (myarch.startswith("ppc64") or - myarch in ("s390x", "sparc64", "x86_64", "ia64")): - return - if os.access("%s/etc/rpm/macros" %(root,), os.R_OK): - if myarch.startswith("ppc64") or myarch == "sparc64": - f = open("%s/etc/rpm/macros" %(root,), 'r+') - lines = f.readlines() - addPrefer = True - for line in lines: - if line.startswith("%_prefer_color"): - addPrefer = False - if addPrefer: - f.write("%_prefer_color 1\n") - f.close() - return - else: - return - - f = open("%s/etc/rpm/macros" %(root,), 'w+') - f.write("%_transaction_color 3\n") - if myarch.startswith("ppc64") or myarch == "sparc64": - f.write("%_prefer_color 1\n") - - f.close() + return # Architecture checking functions -- 1.7.3.2

3 9

[PATCH] pylint patches
by Chris Lumens 11 Nov '10

11 Nov '10

With this set of patches, anaconda passes pylint cleanly. It's probably worth revisiting each of these false positives and making sure they are still valid. - Chris

2 7

[PATCH] unit test fixes
by Chris Lumens 11 Nov '10

11 Nov '10

The following tests cause the unit tests to work again, for the most part. The stuff in tests/storage_test/devicelibs_test is is really rough shape, though. The crypto test just sits there spinning its wheels indefinitely and the others fail for a variety of reasons. I wonder how much of them are still valid at all, really. There's a storage_test/storagetestcase.py and a storage_test/devicelibs_test/baseclass.py. Those have got to overlap to some degree. Does anyone know what the status of these are? My intention is to add this to checkbot so we get unit test results nightly. That should also help the tests themselves not break so frequently. - Chris

4 7

[PATCH 1/2] Guess user name from full name (#517269)
by Martin Gracik 11 Nov '10

11 Nov '10

--- modules/create_user.py | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/modules/create_user.py b/modules/create_user.py index ba37b2b..ee77072 100644 --- a/modules/create_user.py +++ b/modules/create_user.py @@ -221,8 +221,13 @@ class moduleClass(Module): label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) - self.usernameEntry = gtk.Entry() self.fullnameEntry = gtk.Entry() + self.usernameEntry = gtk.Entry() + + self.guessUserName = True + self.fullnameEntry.connect("changed", self.fullnameEntry_changed) + self.usernameEntry.connect("changed", self.usernameEntry_changed) + self.passwordEntry = gtk.Entry() self.passwordEntry.set_visibility(False) self.passwordEntry.set_property("primary-icon-stock", @@ -240,19 +245,20 @@ class moduleClass(Module): table = gtk.Table(2, 4) table.set_row_spacings(6) table.set_col_spacings(6) - label = gtk.Label(_("_Username:")) + + label = gtk.Label(_("Full Nam_e:")) label.set_use_underline(True) - label.set_mnemonic_widget(self.usernameEntry) + label.set_mnemonic_widget(self.fullnameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 0, 1, gtk.FILL) - table.attach(self.usernameEntry, 1, 2, 0, 1, gtk.SHRINK, gtk.FILL, 5) + table.attach(self.fullnameEntry, 1, 2, 0, 1, gtk.SHRINK, gtk.FILL, 5) - label = gtk.Label(_("Full Nam_e:")) + label = gtk.Label(_("_Username:")) label.set_use_underline(True) - label.set_mnemonic_widget(self.fullnameEntry) + label.set_mnemonic_widget(self.usernameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 1, 2, gtk.FILL) - table.attach(self.fullnameEntry, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5) + table.attach(self.usernameEntry, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5) label = gtk.Label(_("_Password:")) label.set_use_underline(True) @@ -306,7 +312,7 @@ class moduleClass(Module): self.vbox.pack_start(scuHBox, False, False) def focus(self): - self.usernameEntry.grab_focus() + self.fullnameEntry.grab_focus() def initializeUI(self): pass @@ -357,6 +363,26 @@ class moduleClass(Module): dlg.destroy() return None + def fullnameEntry_changed(self, fn_entry): + if not self.guessUserName: + return + + name = fn_entry.get_text() + try: + user = name.split()[0] + except IndexError: + user = "" + else: + user = user.encode("ascii", "ascii_transliterate") + user = user.lower() + + self.usernameEntry.handler_block_by_func(self.usernameEntry_changed) + self.usernameEntry.set_text(user) + self.usernameEntry.handler_unblock_by_func(self.usernameEntry_changed) + + def usernameEntry_changed(self, un_entry): + self.guessUserName = not bool(un_entry.get_text()) + def passwordEntry_changed(self, entry): pw = entry.get_text() if not pw: -- 1.7.1.1

2 4

[rhel5-branch] three s390 patches
by David Cantrell 10 Nov '10

10 Nov '10

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

2 6

[RFC] Anaconda Maintenance Releases
by Brian C. Lane 10 Nov '10

10 Nov '10

A problem that we are running into more often with the livecd and spins projects is that after a release things can break due to anaconda being frozen and the packages it depends on moving on. eg. NetworkManager or udev changes something, and since Anaconda isn't updated after the release it breaks for people trying to spin new, updated media. rhbz#624028 is one example of this. I expect it to become more of a problem as we move forward. What would you think about a change to the Anaconda release cycle that would be very limited in scope: Designate someone as the maintenance manager for previous releases. They would field bugs related to Anaconda and changes in dependent packages. The goal would be to make the minimum amount of change needed to maintain creation of the official media using the base+updates repos and the official kickstart files. We would only support Anaconda in currently supported Fedora releases, which is currently f12, f13, f14 with f12 support being dropped next month IIRC. Hopefully the changes would amount to cherry-picking fixes/changes from a newer release or from master and applying it. Given the popularity of LiveCD's and Spins I think this is a reasonable change to how things are being done right now. And I volunteer myself as the Anaconda maintenance manager. I have created a wiki page here: https://fedoraproject.org/wiki/Anaconda/Maintenance -- Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

2 3

[master] cpio code removal take II
by David Cantrell 10 Nov '10

10 Nov '10

Here are the latest revisions of the cpio removal patches, plus an additional patch that changes configure.ac to not force -O2 in the CFLAGS. I've incorporated the changes people suggested and addressed issues people raised with the previous patchset. I have tested this patchset with F-14 and it works. I did not test it with driver disks though. msivak, you mentioned the filtering ability from last time. We can add that in if we need it later, but I figured since we were not using any filtering on extraction, we didn't need it. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 12

[firstboot] Do not show tabs in date and time module
by Martin Gracik 10 Nov '10

10 Nov '10

system-config-date no longer has separate notebook tabs for datetime and ntp, so we only want to show one tab, the datetime tab. --- modules/date.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/date.py b/modules/date.py index b4c2536..2ce83d9 100644 --- a/modules/date.py +++ b/modules/date.py @@ -64,7 +64,7 @@ class moduleClass(Module): label.set_size_request(500, -1) self.vbox.pack_start(label, False, True, padding=20) - self.scd = scdMainWindow(firstboot=True, showPages=["datetime", "ntp"]) + self.scd = scdMainWindow(firstboot=True, showPages=["datetime"]) self.vbox.pack_start(self.scd.firstboot_widget(), False, False) def initializeUI(self): -- 1.7.1.1

2 1

[PATCH rhel5] Document noeject (#647232)
by Brian C. Lane 10 Nov '10

10 Nov '10

Resolves: rhbz#647232 --- docs/command-line.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/command-line.txt b/docs/command-line.txt index 75c1dc1..65ec700 100644 --- a/docs/command-line.txt +++ b/docs/command-line.txt @@ -181,3 +181,7 @@ ipv6=<method> IPv6 configuration method to use, either 'auto' for automatic neighbor discovery or 'dhcp' for DHCPv6. noipv6 Disable IPv6 networking during installation. + +noeject Do not eject install media under any circumstances, including + media test and shutdown. + -- 1.7.3.2

2 1

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 November 2010