Anaconda-devel September 2011

anaconda-devel@lists.fedoraproject.org

24 participants
81 discussions

Start a nNew thread

new version of vg reserved space patch for anaconda
by David Lehman 13 Sep '11

13 Sep '11

Only change is moved error handling out into pykickstart.

2 2

[PATCH f16-branch] Start NM in loader on s390 until we have systemd init here too (#733680)
by Radek Vykydal 13 Sep '11

13 Sep '11

This is exactly how we used to do it before systemd took over starting NM for anaconda which was fixed in f16 alpha with commit 4acfadedb038744e6b47af74fe584188f82e44aa (bug 727951). So this patch updates the change so that efforts of http://fedoraproject.org/wiki/Architectures/s390x are not blocked before we achieve http://fedoraproject.org/wiki/Anaconda/Features/RemoveLinuxrcS390. It is safe, I'm going to propose it as F16Beta NTH. --- loader/loader.c | 6 ++++++ pyanaconda/isys/iface.c | 38 ++++++++++++++++++++++++++++++++++++++ pyanaconda/isys/iface.h | 5 +++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 2c5eb51..b3048cb 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2177,10 +2177,16 @@ int main(int argc, char ** argv) { } #endif +#if defined(__s390__) || defined(__s390x__) + /* Start NetworkManager until we have systemd init on s390 too */ + if (iface_start_NetworkManager()) + logMessage(INFO, "failed to start NetworkManager"); +#else /* Restart NetworkManager now so that it uses our inital ifcfg config */ logMessage(INFO, "restarting NetworkManager"); if (iface_restart_NetworkManager()) logMessage(ERROR, "failed to restart NetworkManager"); +#endif if (!FL_CMDLINE(flags)) startNewt(); diff --git a/pyanaconda/isys/iface.c b/pyanaconda/isys/iface.c index 8ef4708..7d11600 100644 --- a/pyanaconda/isys/iface.c +++ b/pyanaconda/isys/iface.c @@ -539,6 +539,44 @@ int iface_restart_NetworkManager(void) { } /* + * Start NetworkManager -- requires that you have already written out the + * control files in /etc/sysconfig for the interface. + * This is needed on s390 until we have systemd init doing it as for other archs. + */ +int iface_start_NetworkManager(void) { + pid_t pid; + + if (is_nm_running()) + return 0; /* already running */ + + /* Start NetworkManager */ + pid = fork(); + if (pid == 0) { + if (setpgrp() == -1) { + exit(1); + } + + if (_iface_redirect_io("/dev/null", STDIN_FILENO, O_RDONLY) || + _iface_redirect_io(OUTPUT_TERMINAL, STDOUT_FILENO, O_WRONLY) || + _iface_redirect_io(OUTPUT_TERMINAL, STDERR_FILENO, O_WRONLY)) { + exit(2); + } + + if (execl(NETWORKMANAGER, NETWORKMANAGER, + "--pid-file=/var/run/NetworkManager/NetworkManager.pid", + NULL) == -1) { + exit(3); + } + } else if (pid == -1) { + return 1; + } else { + return wait_for_nm(); + } + + return 0; +} + +/* * Set the MTU on the specified device. */ int iface_set_interface_mtu(char *ifname, int mtu) { diff --git a/pyanaconda/isys/iface.h b/pyanaconda/isys/iface.h index a386865..77e66ed 100644 --- a/pyanaconda/isys/iface.h +++ b/pyanaconda/isys/iface.h @@ -156,6 +156,11 @@ gboolean is_nm_connected(void); gboolean is_iface_activated(char * ifname); /* + * Start NetworkManager + */ +int iface_start_NetworkManager(void); + +/* * Restart NetworkManager */ int iface_restart_NetworkManager(void); -- 1.7.4

2 1

[rhel6-branch 1/3] fcoe: load bnx2fc if relevant.
by Ales Kozumplik 13 Sep '11

13 Sep '11

Related: rhbz#641420 --- iutil.py | 6 ++++++ storage/fcoe.py | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/iutil.py b/iutil.py index ff1ef14..80eecc6 100644 --- a/iutil.py +++ b/iutil.py @@ -939,3 +939,9 @@ def find_program_in_path(prog, raise_on_error=False): if raise_on_error: raise RuntimeError("Unable to locate a needed executable: '%s'" % prog) return None + +def lsmod(): + """ Returns list of names of all loaded modules. """ + with open("/proc/modules") as f: + lines = f.readlines() + return [l.split()[0] for l in lines] diff --git a/storage/fcoe.py b/storage/fcoe.py index 8c5d921..4260dbf 100644 --- a/storage/fcoe.py +++ b/storage/fcoe.py @@ -36,6 +36,10 @@ def has_fcoe(): iutil.execWithRedirect("modprobe", [ "fcoe" ], stdout = "/dev/tty5", stderr="/dev/tty5") _fcoe_module_loaded = True + if "bnx2x" in iutil.lsmod(): + log.info("fcoe: loading bnx2fc") + iutil.execWithRedirect("modprobe", [ "bnx2fc" ], + stdout = "/dev/tty5", stderr="/dev/tty5") return os.access("/sys/module/fcoe", os.X_OK) -- 1.7.6

3 4

[lorax] Log how we run mkisofs.
by Ales Kozumplik 13 Sep '11

13 Sep '11

It's very useful to know when trying to rebuild the iso manually. --- src/pylorax/images.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pylorax/images.py b/src/pylorax/images.py index 75d38e0..23b6059 100644 --- a/src/pylorax/images.py +++ b/src/pylorax/images.py @@ -344,6 +344,7 @@ class PPC(object): "-magic", joinpaths(self.installtree.root, MAGIC), "-no-desktop", "-allow-multidot", "-graft-points", isopathdir] + logger.debug("calling mkisofs: %s" % cmd) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) p.wait() @@ -565,6 +566,7 @@ class X86(object): "images={0}".format(joinpaths(self.outputroot, IMAGESDIR))] + \ efigraft + logger.debug("calling mkisofs: %s" % cmd) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) p.wait() @@ -780,6 +782,7 @@ class SPARC(object): "-o", bootiso_fpath, "-graft-points", "boot=%s" % joinpaths(self.outputroot, SPARCDIR)] + logger.debug("calling mkisofs: %s" % cmd) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -- 1.7.6

2 1

screenfont for armv7l
by Jiri Kastner 12 Sep '11

12 Sep '11

hi, i created screenfont required for building anaconda on arm (armv7l kernel). can you add it, please to data/fonts? i did not tested it yet, as i only succesfully built anaconda, but missing requirements for installation are not yet built. thanks best regards

3 3

[rhel5-branch] infiniband: some drivers imply other drivers (#660684).
by Ales Kozumplik 12 Sep '11

12 Sep '11

mlx4_core implies mlx4_en and mlx4_ib. cxgb3 implies iw_cxgb3. This should be done by modprobe but is not, see '/etc/init.d/openibd' for more details. Also see ff80a995ae88dd3eaf967d571d26319edd6ca049. --- loader2/loader.c | 9 ++------- loader2/modules.c | 20 ++++++++++++++++++++ loader2/modules.h | 2 ++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/loader2/loader.c b/loader2/loader.c index cb91bee..84e9088 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1733,13 +1733,8 @@ int main(int argc, char ** argv) { busProbe(modInfo, modLoaded, modDeps, 0); } - /* - * BUG#514971: If the mlx4_core is loaded load the mlx4_en too, since we do not use the modprobe rules - */ - if(mlModuleInList("mlx4_core", modLoaded)){ - logMessage(INFO, "mlx4_core module detected, trying to load the Ethernet part of it (mlx4_en)"); - mlLoadModuleSet("mlx4_en", modLoaded, modDeps, modInfo); - } + /* do what the modprobe rules would otherwise have done do for us */ + mlCustomLoads(modLoaded, modDeps, modInfo); /* If we got new devices from the DDs, they need their /dev/node to be created here */ createPartitionNodes(); diff --git a/loader2/modules.c b/loader2/modules.c index cb34dff..e15f07d 100644 --- a/loader2/modules.c +++ b/loader2/modules.c @@ -1123,6 +1123,26 @@ void loadKickstartModule(struct loaderData_s * loaderData, int argc, loaderData->modInfo, args); } +/* + * On an installed system there are files in /etc/modprobe.d. Those can do + * various tricky things when modules are being inserted through modprobe. We do + * not call modprobe in the RHEL5 loader so we need to workaround, thus this + * function. + */ +void mlCustomLoads(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo) +{ + if (mlModuleInList("mlx4_core", modLoaded)) { + logMessage(INFO, "modules: mlx4_core present, loading mlx4_en and mlx4_ib"); + mlLoadModuleSet("mlx4_en", modLoaded, modDeps, modInfo); + mlLoadModuleSet("mlx4_ib", modLoaded, modDeps, modInfo); + } + if (mlModuleInList("cxgb3", modLoaded)) { + logMessage(INFO, "modules: cxgb3 present, loading iw_cxgb3"); + mlLoadModuleSet("iw_cxgb3", modLoaded, modDeps, modInfo); + } +} + void mlWriteBlacklist() { int fd; int i; diff --git a/loader2/modules.h b/loader2/modules.h index a12a235..eba8ea0 100644 --- a/loader2/modules.h +++ b/loader2/modules.h @@ -43,5 +43,7 @@ void writeScsiDisks(moduleList list); int removeLoadedModule(const char * modName, moduleList modLoaded); char * getModuleLocation(int version); +void mlCustomLoads(moduleList modLoaded, moduleDeps modDeps, + moduleInfoSet modInfo); void mlWriteBlacklist(); #endif -- 1.7.6

2 1

[f16-branch] nfsiso: handle mismatching .iso architecture gracefully.
by Ales Kozumplik 12 Sep '11

12 Sep '11

Related: rhbz#731266 --- pyanaconda/image.py | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pyanaconda/image.py b/pyanaconda/image.py index a2b1e49..7e64dbb 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -70,6 +70,8 @@ def findFirstIsoImage(path, messageWindow): log.debug("discArch = %s" % discArch) if discArch != arch: + log.warning("findFirstIsoImage: architectures mismatch: %s, %s" % + (discArch, arch)) isys.umount("/mnt/install/cdimage", removeDir=False) continue @@ -162,30 +164,32 @@ def mountDirectory(methodstr, messageWindow): continue def mountImage(isodir, tree, messageWindow): + def complain(): + ans = messageWindow(_("Missing ISO 9660 Image"), + _("The installer has tried to mount the " + "installation image, but cannot find it on " + "the hard drive.\n\n" + "Please copy this image to the " + "drive and click Retry. Click Exit " + "to abort the installation."), + type="custom", + custom_icon="warning", + custom_buttons=[_("_Exit"), _("_Retry")]) + if ans == 0: + sys.exit(0) + if os.path.ismount(tree): raise SystemError, "trying to mount already-mounted iso image!" - - image = findFirstIsoImage(isodir, messageWindow) - while True: + image = findFirstIsoImage(isodir, messageWindow) + if image is None: + complain() + continue try: isys.mount(image, tree, fstype = 'iso9660', readOnly = True) break except SystemError: - ans = messageWindow(_("Missing ISO 9660 Image"), - _("The installer has tried to mount the " - "installation image, but cannot find it on " - "the hard drive.\n\n" - "Please copy this image to the " - "drive and click Retry. Click Exit " - "to abort the installation."), - type="custom", - custom_icon="warning", - custom_buttons=[_("_Exit"), _("_Retry")]) - if ans == 0: - sys.exit(0) - elif ans == 1: - image = findFirstIsoImage(isodir, messageWindow) + complain() # Find an attached CD/DVD drive with media in it that contains packages, # and return that device name. -- 1.7.6

2 1

[pykickstart] new version of vg reserved space patch
by David Lehman 12 Sep '11

12 Sep '11

- Changed class names ('FC16' -> 'F16') - Moved error checking into pykickstart from anaconda

2 2

[rhel6-branch] More partition dialogs focusing after error (#679810)
by Martin Gracik 12 Sep '11

12 Sep '11

On partitioning errors the dialogs loose focus, after the treeview is refreshed. Before calling the present() function we need to clear the gtk pending events, otherwise the treeview steels the focus away. --- iw/partition_gui.py | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 6e4e7bf..8a0739e 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -1650,19 +1650,20 @@ class PartitionWindow(InstallWindow): # FIXME: this needs to handle exceptions self.storage.devicetree.registerAction(action) - if self.refresh(justRedraw=True): + if self.refresh(justRedraw=True): actions.reverse() for action in actions: self.storage.devicetree.cancelAction(action) if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to RAID edit failed") - continue - else: - break - raideditor.destroy() + gui.processEvents() + raideditor.dialog.present() + else: + break + raideditor.destroy() def editPartition(self, device, isNew = False, restrictfs = None): # p_d_g -> partition_dialog_gui @@ -1697,11 +1698,14 @@ class PartitionWindow(InstallWindow): # this worked before and doesn't now... raise RuntimeError, ("Returning partitions to state " "prior to edit failed") + + gui.processEvents() + parteditor.dialog.present() else: - break + break - parteditor.destroy() - return 1 + parteditor.destroy() + return 1 def editLVMVolumeGroup(self, device, isNew = False): # l_d_g -> lvm_dialog_gui @@ -1715,7 +1719,7 @@ class PartitionWindow(InstallWindow): # FIXME: handle exceptions self.storage.devicetree.registerAction(action) - if self.refresh(justRedraw=True): + if self.refresh(justRedraw=True): actions.reverse() for action in actions: self.storage.devicetree.cancelAction(action) @@ -1723,11 +1727,13 @@ class PartitionWindow(InstallWindow): if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to edit failed") - continue - else: - break - vgeditor.destroy() + gui.processEvents() + vgeditor.dialog.present() + else: + break + + vgeditor.destroy() def editLVMLogicalVolume (self, lv = None, vg = None): """Will be consistent with the state of things and use this funciton @@ -1785,7 +1791,9 @@ class PartitionWindow(InstallWindow): if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to edit failed") - continue + + gui.processEvents() + vgeditor.dialog.present() else: break -- 1.7.3.2

2 1

[rhel6-branch] More partition dialogs focusing after error (#679810)
by Martin Gracik 12 Sep '11

12 Sep '11

On partitioning errors the dialogs loose focus, after the treeview is refreshed. Before calling the present() function we need to clear the gtk pending events, otherwise the treeview steels the focus away. --- iw/partition_gui.py | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 6e4e7bf..3094bce 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -1650,19 +1650,21 @@ class PartitionWindow(InstallWindow): # FIXME: this needs to handle exceptions self.storage.devicetree.registerAction(action) - if self.refresh(justRedraw=True): + if self.refresh(justRedraw=True): actions.reverse() for action in actions: self.storage.devicetree.cancelAction(action) if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to RAID edit failed") - continue - else: - break - raideditor.destroy() + while gtk.events_pending(): + gtk.main_iteration() + raideditor.dialog.present() + else: + break + raideditor.destroy() def editPartition(self, device, isNew = False, restrictfs = None): # p_d_g -> partition_dialog_gui @@ -1697,11 +1699,15 @@ class PartitionWindow(InstallWindow): # this worked before and doesn't now... raise RuntimeError, ("Returning partitions to state " "prior to edit failed") + + while gtk.events_pending(): + gtk.main_iteration() + parteditor.dialog.present() else: - break + break - parteditor.destroy() - return 1 + parteditor.destroy() + return 1 def editLVMVolumeGroup(self, device, isNew = False): # l_d_g -> lvm_dialog_gui @@ -1715,7 +1721,7 @@ class PartitionWindow(InstallWindow): # FIXME: handle exceptions self.storage.devicetree.registerAction(action) - if self.refresh(justRedraw=True): + if self.refresh(justRedraw=True): actions.reverse() for action in actions: self.storage.devicetree.cancelAction(action) @@ -1723,11 +1729,14 @@ class PartitionWindow(InstallWindow): if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to edit failed") - continue - else: - break - vgeditor.destroy() + while gtk.events_pending(): + gtk.main_iteration() + vgeditor.dialog.present() + else: + break + + vgeditor.destroy() def editLVMLogicalVolume (self, lv = None, vg = None): """Will be consistent with the state of things and use this funciton @@ -1785,7 +1794,10 @@ class PartitionWindow(InstallWindow): if self.refresh(): raise RuntimeError, ("Returning partitions to state " "prior to edit failed") - continue + + while gtk.events_pending(): + gtk.main_iteration() + vgeditor.dialog.present() else: break -- 1.7.3.2

1 0

← Newer
1
2
3
4
5
6
7
8
9
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 September 2011