Anaconda-devel July 2009

anaconda-devel@lists.fedoraproject.org

29 participants
100 discussions

[PATCH] Do not offer going back when ugrade root for ks upgrade is not found (#499321)
by Radek Vykydal 30 Jul '09

30 Jul '09

Going back results in traceback which seems not right. Bug 499321 (preupgrade backtrace) has lots of tracebacks with various causes of upgrade root not found - I distincted two groups.: 1) dmraid not detected in f10 (=> installation on 2 disks) while detected in f11 (=> root not found). 2) root considered as non-upgradable (/etc/redhat-release changed by user). Such a broad bug is rather difficult to handle. OTOH we wouldn't get the tracebacks so easy if we just ended with error message (as with the patch). --- upgrade.py | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/upgrade.py b/upgrade.py index c94cc3a..48edff0 100644 --- a/upgrade.py +++ b/upgrade.py @@ -188,18 +188,26 @@ def upgradeMountFilesystems(anaconda): except IndexError as e: # The upgrade root is search earlier but we give the message here. log.debug("No upgrade root was found.") - rc = anaconda.intf.messageWindow(_("Upgrade root not found"), + if anaconda.isKickstart and anaconda.id.ksdata.upgrade.upgrade: + anaconda.intf.messageWindow(_("Upgrade root not found"), _("The root for the previously installed system was not " - "found. You can exit installer or backtrack to choose " - "installation instead of upgrade."), - type="custom", - custom_buttons = [ _("_Back"), - _("_Exit installer") ], - custom_icon="question") - if rc == 0: - return DISPATCH_BACK - elif rc == 1: + "found."), type="custom", + custom_icon="info", + custom_buttons=[_("Exit installer")]) sys.exit(0) + else: + rc = anaconda.intf.messageWindow(_("Upgrade root not found"), + _("The root for the previously installed system was not " + "found. You can exit installer or backtrack to choose " + "installation instead of upgrade."), + type="custom", + custom_buttons = [ _("_Back"), + _("_Exit installer") ], + custom_icon="question") + if rc == 0: + return DISPATCH_BACK + elif rc == 1: + sys.exit(0) checkLinks = ( '/etc', '/var', '/var/lib', '/var/lib/rpm', '/boot', '/tmp', '/var/tmp', '/root', -- 1.6.0.6

2 1

Remove PACKAGES and PACKAGESRESCUE from upd-instroot
by David Cantrell 30 Jul '09

30 Jul '09

Based on notting's comment about removing the lib packages from PACKAGES, I thought we should be able to let upd-instroot do 'yum install anaconda' and get the tree we need. So I looked at what yum install anaconda would pull in at first, then moved remaining things that are listed in KEEPFILE* lists to Requires: tags in the spec file. This can also make life easier for lorax, as we could rely on 'yum install anaconda' to set up our tree more or less with the files we need. The first patch in this set is removing the package names that are pulled in when depsolving anaconda, as well as moving the font packages to their own list. The second patch is where I go and destroy the PACKAGES lists entirely. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

5 6

[PATCH] Make upgradeany boot option work again (#513227)
by Radek Vykydal 30 Jul '09

30 Jul '09

--- iw/examine_gui.py | 3 ++- rescue.py | 2 +- upgrade.py | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 3a62e06..20af0c7 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -93,7 +93,8 @@ class UpgradeExamineWindow (InstallWindow): # we might get here after storage reset that obsoleted # root device objects we had found if not self.anaconda.id.rootParts: - self.anaconda.id.rootParts = upgrade.findExistingRoots(self.anaconda) + self.anaconda.id.rootParts = upgrade.findExistingRoots(self.anaconda, + upgradeany=flags.cmdline.has_key("upgradeany")) upgrade.setUpgradeRoot(self.anaconda) self.parts = self.anaconda.id.rootParts diff --git a/rescue.py b/rescue.py index 11da108..fe2d181 100644 --- a/rescue.py +++ b/rescue.py @@ -297,7 +297,7 @@ def runRescue(anaconda, instClass): import storage storage.storageInitialize(anaconda) - disks = upgrade.findExistingRoots(anaconda, upgradeany = 1) + disks = upgrade.findExistingRoots(anaconda, upgradeany=True) if not disks: root = None diff --git a/upgrade.py b/upgrade.py index c8b6757..43400b3 100644 --- a/upgrade.py +++ b/upgrade.py @@ -76,7 +76,8 @@ def findRootParts(anaconda): if anaconda.dir == DISPATCH_BACK: return if anaconda.id.rootParts is None: - anaconda.id.rootParts = findExistingRoots(anaconda) + anaconda.id.rootParts = findExistingRoots(anaconda, + upgradeany=flags.cmdline.has_key("upgradeany")) setUpgradeRoot(anaconda) @@ -88,10 +89,10 @@ def findRootParts(anaconda): anaconda.dispatch.skipStep("findinstall", skip = 1) anaconda.dispatch.skipStep("installtype", skip = 0) -def findExistingRoots(anaconda, upgradeany = 0): +def findExistingRoots(anaconda, upgradeany=False): if not flags.setupFilesystems: (prod, ver) = getReleaseString (anaconda.rootPath) - if flags.cmdline.has_key("upgradeany") or upgradeany == 1 or anaconda.id.instClass.productUpgradable(prod, ver): + if flags.cmdline.has_key("upgradeany") or upgradeany or anaconda.id.instClass.productUpgradable(prod, ver): return [(anaconda.rootPath, "")] return [] -- 1.6.0.6

2 2

[PATCH] Rework shutDown() to better accomidate "nokill" better.
by Peter Jones 29 Jul '09

29 Jul '09

Rework shutDown() so that we don't do unmounts until we're going to reboot or power off the machine. Also some minor cleanups like taking out all the negative-phrasing of "noKill" in the code itself. --- loader/init.c | 27 ++++++++-------- loader/init.h | 28 +++++++++++++++++ loader/shutdown.c | 87 ++++++++++++++++++++++++++++++++++------------------- 3 files changed, 97 insertions(+), 45 deletions(-) create mode 100644 loader/init.h diff --git a/loader/init.c b/loader/init.c index 1c275d8..ff0f62e 100644 --- a/loader/init.c +++ b/loader/init.c @@ -53,6 +53,7 @@ #include <termios.h> #include <libgen.h> +#include "init.h" #include "copy.h" #include "devt.h" #include "devices.h" @@ -110,10 +111,8 @@ char * env[] = { */ int testing=0; -void unmountFilesystems(void); -void disableSwap(void); -void shutDown(int noKill, int doReboot, int doPowerOff); -static int getNoKill(void); +void shutDown(int doKill, reboot_action rebootAction); +static int getKillPolicy(void); struct termios ts; static void printstr(char * string) { @@ -396,22 +395,22 @@ static void termReset(void) { /* reboot handler */ static void sigintHandler(int signum) { termReset(); - shutDown(getNoKill(), 1, 0); + shutDown(getKillPolicy(), REBOOT); } /* halt handler */ static void sigUsr1Handler(int signum) { termReset(); - shutDown(getNoKill(), 0, 0); + shutDown(getKillPolicy(), HALT); } /* poweroff handler */ static void sigUsr2Handler(int signum) { termReset(); - shutDown(getNoKill(), 0, 1); + shutDown(getKillPolicy(), POWEROFF); } -static int getNoKill(void) { +static int getKillPolicy(void) { int fd; int len; char buf[1024]; @@ -421,9 +420,9 @@ static int getNoKill(void) { len = read(fd, buf, sizeof(buf) - 1); close(fd); if ((len > 0) && strstr(buf, "nokill")) - return 1; + return 0; } - return 0; + return 1; } static int getInitPid(void) { @@ -453,7 +452,7 @@ int main(int argc, char **argv) { int doShutdown =0; int isSerial = 0; char * console = NULL; - int noKill = 0; + int doKill = 1; char * argvc[15]; char ** argvp = argvc; char twelve = 12; @@ -541,7 +540,7 @@ int main(int argc, char **argv) { } } - noKill = getNoKill(); + doKill = getKillPolicy(); #if !defined(__s390__) && !defined(__s390x__) static struct termios orig_cmode; @@ -749,7 +748,7 @@ int main(int argc, char **argv) { printf("running %s\n", argvc[0]); execve(argvc[0], argvc, env); - shutDown(1, 0, 0); + shutDown(1, HALT); } /* signal handlers for halt/poweroff */ @@ -797,7 +796,7 @@ int main(int argc, char **argv) { if (testing) exit(0); - shutDown(noKill, doReboot, 0); + shutDown(doKill, doReboot?REBOOT:HALT); return 0; } diff --git a/loader/init.h b/loader/init.h new file mode 100644 index 0000000..733bc8e --- /dev/null +++ b/loader/init.h @@ -0,0 +1,28 @@ +/* + * init.h + * + * Copyright (C) 2009 Red Hat, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty 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, see <http://www.gnu.org/licenses/>. + */ +#ifndef INIT_H +#define INIT_H + +typedef enum { + REBOOT, + POWEROFF, + HALT +} reboot_action; + +#endif /* INIT_H */ diff --git a/loader/shutdown.c b/loader/shutdown.c index 044d021..54fd9a5 100644 --- a/loader/shutdown.c +++ b/loader/shutdown.c @@ -30,6 +30,8 @@ #include <sys/types.h> #include <unistd.h> +#include "init.h" + #ifdef AS_SHUTDOWN int testing = 0; #else @@ -39,25 +41,11 @@ extern int testing; void disableSwap(void); void unmountFilesystems(void); -static void rebootHandler(int signum) { - printf("rebooting system\n"); -#if USE_MINILIBC - reboot(0xfee1dead, 672274793, 0x1234567); -#else - reboot(RB_AUTOBOOT); -#endif -} - -void shutDown(int noKill, int doReboot, int doPowerOff) { - sync(); sync(); +static void performTerminations(int doKill) { + if (testing || !doKill) + return; - printf("disabling swap...\n"); - disableSwap(); - - printf("unmounting filesystems...\n"); - unmountFilesystems(); - - if (!testing && !noKill) { + sync(); printf("sending termination signals..."); kill(-1, 15); sleep(2); @@ -67,25 +55,60 @@ void shutDown(int noKill, int doReboot, int doPowerOff) { kill(-1, 9); sleep(2); printf("done\n"); - } +} - if (doReboot) { - printf("rebooting system\n"); - sleep(2); +static void performUnmounts(int doKill) { + if (testing || !doKill) + return; + + printf("disabling swap...\n"); + disableSwap(); + + printf("unmounting filesystems...\n"); + unmountFilesystems(); +} + +static void performReboot(reboot_action rebootAction) { + if (rebootAction == POWEROFF) { + printf("powering off system\n"); + sleep(2); + reboot(RB_POWER_OFF); + } else if (rebootAction == REBOOT) { + printf("rebooting system\n"); + sleep(2); #if USE_MINILIBC - reboot(0xfee1dead, 672274793, 0x1234567); + reboot(0xfee1dead, 672274793, 0x1234567); #else - reboot(RB_AUTOBOOT); + reboot(RB_AUTOBOOT); #endif - } else if (doPowerOff) { - printf("powering off system\n"); - reboot(RB_POWER_OFF); - } else { + } +} + +static int shouldReboot = 0; + +static void rebootHandler(int signum) { + shouldReboot = 1; +} + +void shutDown(int doKill, reboot_action rebootAction) { + if (rebootAction == POWEROFF || rebootAction == REBOOT) { + performUnmounts(doKill); + performTerminations(doKill); + if (!doKill) + performReboot(rebootAction); + } + printf("you may safely reboot your system\n"); - signal(SIGINT, rebootHandler); - while (1) sleep(60); - } + signal(SIGINT, rebootHandler); + while (1) { + sleep(1); + if (shouldReboot) { + performUnmounts(1); + performTerminations(1); + performReboot(REBOOT); + } + } exit(0); @@ -122,3 +145,5 @@ int main(int argc, char ** argv) { return 0; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 ts=4: */ -- 1.6.4

2 1

[PATCH 1/5] Put mkdir into /sbin on the initrd, too.
by Chris Lumens 29 Jul '09

29 Jul '09

--- scripts/mk-images | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/mk-images b/scripts/mk-images index f746a29..8879d5d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -728,6 +728,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/bin/mkdir $MBD_DIR /sbin/mkdir instbin $IMGPATH /usr/bin/readlink $MBD_DIR /sbin/readlink instbin $IMGPATH /usr/bin/rm $MBD_DIR /sbin/rm instbin $IMGPATH /usr/bin/rmdir $MBD_DIR /sbin/rmdir -- 1.6.1.3

2 8

[PATCH] Update device.map when upgrading (#513393)
by Radek Vykydal 29 Jul '09

29 Jul '09

The bug concerns update of grub when device names changed between install and upgrade. I am in doubts - are we supposed to handle such a case? How much of corner is the case? Isn't bootloader reinstall (safer) answer in such cases? --- booty/x86.py | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/booty/x86.py b/booty/x86.py index 3890e69..f90cb86 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -417,6 +417,31 @@ class x86BootloaderInfo(efiBootloaderInfo): return config + def updateDeviceMap(self, instRoot): + if os.access(instRoot + "/boot/grub/device.map", os.R_OK): + f = open(instRoot + "/boot/grub/device.map", "r") + updatedlines = [] + update = False + for line in f: + line = line.strip() + if line.startswith('(hd'): + (grubdisk, path) = line.split()[:2] + i = int(grubdisk.lstrip('(hd ').rstrip(') ')) + actual_path = self.storage.devicetree.getDeviceByName(self.drivelist[i]).path + if path != actual_path: + line = "%s %s" % (grubdisk, actual_path) + update = True + updatedlines.append(line) + f.close() + + if update: + os.rename(instRoot + "/boot/grub/device.map", + instRoot + "/boot/grub/device.map.rpmsave") + f = open(instRoot + "/boot/grub/device.map", "w+") + upd_comment = "# file updated by anaconda\n" + f.write(upd_comment + '\n'.join(updatedlines) + '\n') + f.close() + # this is a hackish function that depends on the way anaconda writes # out the grub.conf with a #boot= comment # XXX this falls into the category of self.doUpgradeOnly @@ -450,6 +475,9 @@ class x86BootloaderInfo(efiBootloaderInfo): # migrate info to /etc/sysconfig/grub self.writeSysconfig(instRoot, theDev) + # update device.map + self.updateDeviceMap(instRoot) + # more suckage. grub-install can't work without a valid /etc/mtab # so we have to do shenanigans to get updated grub installed... # steal some more code above -- 1.6.0.6

2 1

[PATCH] Fix CDLABEL substitution in syslinux.cfg for x86 boot.iso
by Jeremy Katz 29 Jul '09

29 Jul '09

--- scripts/mk-images.x86 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 2d94e06..f62a80d 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -116,7 +116,7 @@ makeBootImages() { mv $MBD_BOOTTREE/syslinux.cfg $MBD_BOOTTREE/isolinux.cfg # set up the label for finding stage2 with a hybrid iso - sed -i 's/initrd=initrd.img/initrd=initrd.img stage2=hd:LABEL=$CDLABEL/' $MBD_BOOTTREE/isolinux.cfg + sed -i "s/initrd=initrd.img/initrd=initrd.img stage2=hd:LABEL=$CDLABEL/" $MBD_BOOTTREE/isolinux.cfg # copy in memtest if present if [ -f $IMGPATH/usr/lib/anaconda-runtime/boot/memtest* ]; then -- 1.6.1

2 1

[PATCH] use python-meh for exception reporting
by Chris Lumens 28 Jul '09

28 Jul '09

The following series of patches changes anaconda over to using the new python-meh for exception handling. I have tested this, though something is bound to go wrong once we get all the packaging done and into a release. Before this can be pushed, the new python-meh package needs to make it in, though that's supposed to be in the works. Doing this will allow me to later get rid of rhpl.exception. I think there's a bug and patch filed against all components that use it now. At least, I know I've cleaned up my code. - Chris

2 13

[PATCH 1/2] Use keyboard bits from system-config-keyboard now
by Jeremy Katz 28 Jul '09

28 Jul '09

system-config-keyboard has the keyboard bits now, so let's use those rather than the ones from rhpl --- anaconda | 2 +- anaconda.spec.in | 2 +- instdata.py | 2 +- scripts/getkeymaps | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anaconda b/anaconda index aef0c95..03dbe5c 100755 --- a/anaconda +++ b/anaconda @@ -774,7 +774,7 @@ if __name__ == "__main__": import instdata - import rhpl.keyboard as keyboard + import system_config_keyboard.keyboard as keyboard log.info("anaconda called with cmdline = %s" %(sys.argv,)) log.info("Display mode = %s" %(opts.display_mode,)) diff --git a/anaconda.spec.in b/anaconda.spec.in index 81adcd6..964e495 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -115,7 +115,7 @@ Requires: mdadm Requires: lvm2 Requires: util-linux-ng >= 2.15.1 %ifnarch s390 s390x ppc64 -Requires: system-config-keyboard +Requires: system-config-keyboard >= 1.3.0 %endif Requires: hal, dbus-python Requires: cracklib-python diff --git a/instdata.py b/instdata.py index 488616b..6700528 100644 --- a/instdata.py +++ b/instdata.py @@ -40,7 +40,7 @@ import shlex from flags import * from constants import * from simpleconfig import SimpleConfigFile -import rhpl.keyboard as keyboard +import system_config_keyboard.keyboard as keyboard from pykickstart.version import versionToString, DEVEL diff --git a/scripts/getkeymaps b/scripts/getkeymaps index 2e003a7..8436900 100755 --- a/scripts/getkeymaps +++ b/scripts/getkeymaps @@ -51,7 +51,7 @@ else PATTERN=i386 fi -MAPS=$(python -c "import rhpl.keyboard_models ; rhpl.keyboard_models.get_supported_models()") +MAPS=$(python -c "import system_config_keyboard.keyboard_models ; system_config_keyboard.keyboard_models.get_supported_models()") for map in $MAPS ; do eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*.gz" | while read n; do -- 1.6.1

3 8

[PATCH] Just pull in all python modules for stage2
by Jeremy Katz 28 Jul '09

28 Jul '09

in stage2. Rather than trying to pick out python module deps, let's just include everything. If it's a huge size hit, we'll blacklist big things we don't need --- scripts/upd-instroot | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 5d01a83..8b97d74 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -457,28 +457,6 @@ usr/$LIBDIR/hal usr/$LIBDIR/libuser/* usr/$LIBDIR/pango usr/$LIBDIR/python?.? -usr/$LIBDIR/python?.?/email -usr/$LIBDIR/python?.?/site-packages/*.pth -usr/$LIBDIR/python?.?/site-packages/*selinux* -usr/$LIBDIR/python?.?/site-packages/*sqlite* -usr/$LIBDIR/python?.?/site-packages/_cracklibmodule.so -usr/$LIBDIR/python?.?/site-packages/_dbus* -usr/$LIBDIR/python?.?/site-packages/bdevid.so -usr/$LIBDIR/python?.?/site-packages/block -usr/$LIBDIR/python?.?/site-packages/cElementTree.so -usr/$LIBDIR/python?.?/site-packages/cairo -usr/$LIBDIR/python?.?/site-packages/firstboot -usr/$LIBDIR/python?.?/site-packages/gtk* -usr/$LIBDIR/python?.?/site-packages/gtk*/gtk -usr/$LIBDIR/python?.?/site-packages/ixf86configmodule.so -usr/$LIBDIR/python?.?/site-packages/libiscsimodule.so -usr/$LIBDIR/python?.?/site-packages/libusermodule.so -usr/$LIBDIR/python?.?/site-packages/_pedmodule.so -usr/$LIBDIR/python?.?/site-packages/parted/ -usr/$LIBDIR/python?.?/site-packages/rhpl -usr/$LIBDIR/python?.?/site-packages/rpmmodule.so -usr/$LIBDIR/python?.?/site-packages/xf86config.py -usr/$LIBDIR/python?.?/xml/etree/ usr/$LIBDIR/rpm/rpmpopt usr/$LIBDIR/libiscsi.so* usr/$LIBDIR/libsqlite3.so* @@ -540,18 +518,7 @@ usr/lib/anaconda/storage/devicelibs usr/lib/anaconda/storage/formats usr/lib/kernel-wrapper usr/lib/locale -usr/lib/python?.?/site-packages/bugzilla* -usr/lib/python?.?/site-packages/cracklib.py* -usr/lib/python?.?/site-packages/decorator.py* -usr/lib/python?.?/site-packages/dbus -usr/lib/python?.?/site-packages/dbus_bindings.py* -usr/lib/python?.?/site-packages/elementtree -usr/lib/python?.?/site-packages/iniparse -usr/lib/python?.?/site-packages/pykickstart -usr/lib/python?.?/site-packages/repomd -usr/lib/python?.?/site-packages/rpmUtils -usr/lib/python?.?/site-packages/urlgrabber -usr/lib/python?.?/site-packages/yum +usr/lib/python?.? usr/lib/rpm/macros usr/lib/rpm/rpmpopt usr/lib/rpm/rpmrc -- 1.6.1

2 1

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel July 2009