Anaconda-devel February 2011

anaconda-devel@lists.fedoraproject.org

21 participants
82 discussions

reworking the dispatcher, part one
by Ales Kozumplik 21 Feb '11

21 Feb '11

Hi, First part of the dispatcher overhaul [1] aims to get it into a shape more suitable for multithreaded UI experiments, that is moving the control of changing the steps into a single place in dispatch.py. I am fairly happy with how the dispatch() method looks now but 1) it can be even simpler once it doesn't have to return back to gtk.main() all the time. 2) comments are welcome. The only change visible to the user with this is that the direct steps that happen before the first screen step are no longer on black background. This is easiest to spot with a GUI kickstart install that has a control window all the time. I tested: - walking through the GUI and ext installs - going back and forward several steps in GUI/text - doing a complete kickstart installation in GUI - doing a complete kickstart installation in cmdline Ales [1] https://fedoraproject.org/wiki/Anaconda/Features/Rework_dispatch

2 8

[PATCH][f15, master] Do all dm handling inside addUdevDMDevice. (#672030)
by David Lehman 21 Feb '11

21 Feb '11

The by-uuid lookup was returning a loop device since it has the same contents as the dm device, which led to us not ever adding live-osimg-min to the device tree for live installs. Since UUIDs are not necessarily device-specific (as evidenced by the case of fs UUID on loop device and same fs UUID on dm device representing the contents of said loop device) we can't rely on them for dm device lookups unless we differentiate between device UUIDs and formatting UUIDs. --- pyanaconda/storage/devicetree.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py index c74a23c..a57e5e1 100644 --- a/pyanaconda/storage/devicetree.py +++ b/pyanaconda/storage/devicetree.py @@ -954,13 +954,7 @@ class DeviceTree(object): device = self.addUdevLVDevice(info) elif udev_device_is_dm(info): log.debug("%s is a device-mapper device" % name) - # try to look up the device - if uuid: - # try to find the device by uuid - device = self.getDeviceByUuid(uuid) - - if device is None: - device = self.addUdevDMDevice(info) + device = self.addUdevDMDevice(info) elif udev_device_is_md(info): log.debug("%s is an md device" % name) if uuid: -- 1.7.3.4

2 1

[picked from rhel6-branch] VNC does not support runtime SecurityTypes changes (#670832)
by Martin Gracik 18 Feb '11

18 Feb '11

New XVNC does not support changing of SecurityTypes when it is already running with vncconfig. So we have to solve all the password stuff first, and then run the XVNC with either None or VncAuth. --- pyanaconda/vnc.py | 65 ++++++++++++++++++++++------------------------------- 1 files changed, 27 insertions(+), 38 deletions(-) diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py index 887df9f..47e42eb 100644 --- a/pyanaconda/vnc.py +++ b/pyanaconda/vnc.py @@ -29,6 +29,7 @@ import isys import product import socket import subprocess +import iutil import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -76,24 +77,19 @@ class VncServer: self.password="" def setVNCPassword(self): - """Change the vnc server password. Output to file. """ + """Set the vnc server password. Output to file. """ - if len(self.password) == 0: - self.setVNCParam("SecurityTypes", "None") - self.setVNCParam("rfbauth","0") - return + r, w = os.pipe() + os.write(w, "%s\n" % self.password) - # If there is a password the SecurityTypes = VncAuth for all connections. - self.setVNCParam("SecurityTypes", "VncAuth") - self.setVNCParam("rfbauth",self.pw_file) + # the -f option makes sure vncpasswd does not ask for the password again + rc = iutil.execWithRedirect("vncpasswd", ["-f"], + stdin=r, stdout=self.pw_file) - # password input combination. - pwinput = "%s\n%s\n" % (self.password, self.password) - vnccommand = [self.root+"/usr/bin/vncpasswd", self.pw_file] - vncpswdo = subprocess.Popen(vnccommand, stdin=subprocess.PIPE, stdout=subprocess.PIPE)# We pipe the output - # so the user does not see it. - (out, err) = vncpswdo.communicate(input=pwinput) - return vncpswdo.returncode + os.close(r) + os.close(w) + + return rc def initialize(self): """Here is were all the relative vars get initialized. """ @@ -144,16 +140,6 @@ class VncServer: % {'productName': product.productName, 'productVersion': product.productVersion} - def setVNCParam(self, param, value): - """Set a parameter in the Xvnc server. - - Possible values for param and value. param=(values) - SecurityTypes=(VncAuth,None) - """ - vncconfigcommand = [self.root+"/usr/bin/vncconfig", "-display", ":%s"%self.display , "-set" , "%s=%s" %(param, value)] - vncconfo = subprocess.Popen(vncconfigcommand)# we dont want output - return vncconfo.returncode - def openlogfile(self): try: fd = os.open(self.log_file, os.O_RDWR | os.O_CREAT) @@ -211,13 +197,25 @@ class VncServer: # Lets call it from here for now. self.initialize() - # Lets start the xvnc regardless of vncconnecthost and password. - # We can change the configuration on the fly later. - xvnccommand = [ self.root + "/usr/bin/Xvnc", ":%s" % self.display, "-nevershared", + if self.password and len(self.password) < 6: + self.changeVNCPasswdWindow() + + if not self.password: + SecurityTypes = "None" + rfbauth = "0" + else: + SecurityTypes = "VncAuth" + rfbauth = self.pw_file + # Create the password file. + rc = self.setVNCPassword() + + # Lets start the xvnc. + xvnccommand = [ "Xvnc", ":%s" % self.display, "-nevershared", "-depth", "16", "-br", "IdleTimeout=0", "-auth", "/dev/null", "-once", "DisconnectClients=false", "desktop=%s" % (self.desktop,), - "SecurityTypes=None"] + "SecurityTypes=%s" % SecurityTypes, "rfbauth=%s" % rfbauth ] + try: xvncp = subprocess.Popen(xvnccommand, stdout=self.openlogfile(), stderr=subprocess.STDOUT) except OSError: @@ -233,15 +231,6 @@ class VncServer: else: self.log.info(_("The VNC server is now running.")) - # Lets look at the password stuff - if self.password == "": - pass - elif len(self.password) < 6: - self.changeVNCPasswdWindow() - - # Create the password file. - self.setVNCPassword() - # Lets tell the user what we are going to do. if self.vncconnecthost != "": self.log.warning(_("\n\nYou chose to connect to a listening vncviewer. \n" -- 1.7.3.2

2 1

[rhel6-branch] Support cciss devices in get_sysfs_path_by_name().
by Ales Kozumplik 18 Feb '11

18 Feb '11

The method assumed sysfs paths of cciss partitions are e.g. "/sys/class/block/c0d1p1" when in fact they are e.g. "/sys/class/block/cciss!c0d0p1" (in a manner very inconsistent with other devices). Resolves: rhbz#677689 --- iutil.py | 15 +++++++++++++-- storage/formats/__init__.py | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/iutil.py b/iutil.py index 3a2f7de..ae62c7c 100644 --- a/iutil.py +++ b/iutil.py @@ -780,12 +780,23 @@ def notify_kernel(path, action="change"): f.write("%s\n" % action) f.close() -def get_sysfs_path_by_name(dev_name, class_name="block"): - dev_name = os.path.basename(dev_name) +def get_sysfs_path_by_name(dev_node, class_name="block"): + """ Return sysfs path for a given device. + + For a device node (e.g. /dev/vda2) get the respective sysfs path + (e.g. /sys/class/block/vda2). This also has to work for device nodes + that are in a subdirectory of /dev like '/dev/cciss/c0d0p1'. + """ + dev_name = os.path.basename(dev_node) + if dev_node.startswith("/dev/"): + dev_name = dev_node[5:].replace("/", "!") sysfs_class_dir = "/sys/class/%s" % class_name dev_path = os.path.join(sysfs_class_dir, dev_name) if os.path.exists(dev_path): return dev_path + else: + raise RuntimeError("get_sysfs_path_by_name: Could not find sysfs path " + "for '%s' (it is not at '%s')" % (dev_node, dev_path)) def numeric_type(num): """ Verify that a value is given as a numeric data type. diff --git a/storage/formats/__init__.py b/storage/formats/__init__.py index 9094785..f4eee3a 100644 --- a/storage/formats/__init__.py +++ b/storage/formats/__init__.py @@ -246,8 +246,8 @@ class DeviceFormat(object): except Exception, e: log.warning("failed to get dm node for %s" % self.device) return - elif self.device: - name = os.path.basename(self.device) + else: + name = self.device path = get_sysfs_path_by_name(name) try: -- 1.7.3.3

3 2

[PATCH f15-alpha, etc.] The default kickstart UI is graphical, specify other if you want it (#678095).
by Chris Lumens 18 Feb '11

18 Feb '11

This should fix all problems described in the above bug. All the decisions about suggesting VNC are handled within anaconda proper. --- loader/kickstart.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index 6df3040..06804f8 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -509,7 +509,7 @@ static void setUpdates(struct loaderData_s * loaderData, PyObject *handler) { static void setDisplayMode(struct loaderData_s * loaderData, PyObject *handler) { PyObject *textObj = getObject(constantsMod, "DISPLAY_MODE_TEXT", 0); - PyObject *graphicalObj = getObject(constantsMod, "DISPLAY_MODE_GRAPHICAL", 0); + PyObject *cmdlineObj = getObject(constantsMod, "DISPLAY_MODE_CMDLINE", 0); PyObject *settingObj = getattr(handler, "displaymode", "displayMode"); if (!settingObj) @@ -518,17 +518,17 @@ static void setDisplayMode(struct loaderData_s * loaderData, PyObject *handler) if (settingObj == textObj) { logMessage(INFO, "kickstart forcing text mode"); flags |= LOADER_FLAGS_TEXT; - } else if (settingObj == graphicalObj) { - logMessage(INFO, "kickstart forcing graphical mode"); - flags |= LOADER_FLAGS_GRAPHICAL; - } else { + } else if (settingObj == cmdlineObj) { logMessage(INFO, "kickstart forcing cmdline mode"); flags |= LOADER_FLAGS_CMDLINE; + } else { + logMessage(INFO, "kickstart forcing graphical mode"); + flags |= LOADER_FLAGS_GRAPHICAL; } cleanup: Py_XDECREF(textObj); - Py_XDECREF(graphicalObj); + Py_XDECREF(cmdlineObj); Py_XDECREF(settingObj); } -- 1.7.1.1

3 3

[rhel6-branch] Be better at handling killed metacity.
by Ales Kozumplik 18 Feb '11

18 Feb '11

Resolves: rhbz#677605 --- anaconda | 37 ++++++++++++++++--------------------- iutil.py | 14 ++++++++++---- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/anaconda b/anaconda index 1e32373..945b7e8 100755 --- a/anaconda +++ b/anaconda @@ -45,20 +45,20 @@ def AnacondaShowWarning(message, category, filename, lineno, file=sys.stderr, li def startMetacityWM(): childpid = os.fork() if not childpid: - cmd = '/usr/bin/metacity' - if not os.access(cmd, os.X_OK): - log.error("Unable to find the window manager binary.") + # after this point the method should never return (or throw an exception + # outside) + try: + args = ['--display', ':1', + '--sm-disable'] + iutil.execWithRedirect('metacity', args, + stdout='/dev/null', stderr='/dev/null') + except BaseException as e: + # catch all possible exceptions + log.error("Problems running the window manager: %s" % str(e)) sys.exit(1) - args = ['--display', ':1', - '--sm-disable'] - rc = iutil.execWithRedirect(cmd, args, - stdout='/dev/null', stderr='/dev/null') - if rc: - log.error("Error running window manager.") - sys.exit (rc) - else: - log.info("The window manager has terminated.") - sys.exit(0) + + log.info("The window manager has terminated.") + sys.exit(0) return childpid def startAuditDaemon(): @@ -75,18 +75,13 @@ def startAuditDaemon(): # function to handle X startup special issues for anaconda def doStartupX11Actions(): - global wm_pid + global wm_pid # pid of the anaconda fork where the window manager is running setupGraphicalLinks() # now start up the window manager - try: - wm_pid = startMetacityWM() - log.info("Started window manager, pid %s." % (wm_pid,)) - - except: - wm_pid = None - log.error("Unable to start the window manager.") + wm_pid = startMetacityWM() + log.info("Starting window manager, pid %s." % (wm_pid,)) if wm_pid is not None: import xutils diff --git a/iutil.py b/iutil.py index ae62c7c..f6f359f 100644 --- a/iutil.py +++ b/iutil.py @@ -42,16 +42,22 @@ program_log = logging.getLogger("program") #Python reimplementation of the shell tee process, so we can #feed the pipe output into two places at the same time class tee(threading.Thread): - def __init__(self, inputdesc, outputdesc, logmethod): + def __init__(self, inputdesc, outputdesc, logmethod, command): threading.Thread.__init__(self) self.inputdesc = os.fdopen(inputdesc, "r") self.outputdesc = outputdesc self.logmethod = logmethod self.running = True + self.command = command def run(self): while self.running: - data = self.inputdesc.readline() + try: + data = self.inputdesc.readline() + except IOError: + self.logmethod("Can't read from pipe during a call to %s. " + "(program terminated suddenly?)" % self.command) + break if data == "": self.running = False else: @@ -119,8 +125,8 @@ def execWithRedirect(command, argv, stdin = None, stdout = None, try: #prepare tee proceses - proc_std = tee(pstdout, stdout, program_log.info) - proc_err = tee(perrout, stderr, program_log.error) + proc_std = tee(pstdout, stdout, program_log.info, command) + proc_err = tee(perrout, stderr, program_log.error, command) #start monitoring the outputs proc_std.start() -- 1.7.3.3

2 1

Misc. patches
by David Lehman 18 Feb '11

18 Feb '11

Patch 3 is also for f15-branch and rhel6-branch. The others are only for master.

2 4

[master] Remove storage/miscutils.py, it is not used.
by Ales Kozumplik 18 Feb '11

18 Feb '11

Is probably something left over from storage rewrite. We are better off without it since some of its methods clash with iutil.py methods. --- pyanaconda/storage/miscutils.py | 57 --------------------------------------- 1 files changed, 0 insertions(+), 57 deletions(-) delete mode 100644 pyanaconda/storage/miscutils.py diff --git a/pyanaconda/storage/miscutils.py b/pyanaconda/storage/miscutils.py deleted file mode 100644 index e577497..0000000 --- a/pyanaconda/storage/miscutils.py +++ /dev/null @@ -1,57 +0,0 @@ -# iutil.py stubs -import os - -import logging -log = logging.getLogger("storage") - -def notify_kernel(path, action="change"): - """ Signal the kernel that the specified device has changed. """ - log.debug("notifying kernel of '%s' event on device %s" % (action, path)) - path = os.path.join(path, "uevent") - if not path.startswith("/sys/") or not os.access(path, os.W_OK): - log.debug("sysfs path '%s' invalid" % path) - raise ValueError("invalid sysfs path") - - f = open(path, "a") - f.write("%s\n" % action) - f.close() - -def get_sysfs_path_by_name(dev_name, class_name="block"): - dev_name = os.path.basename(dev_name) - sysfs_class_dir = "/sys/class/%s" % class_name - dev_path = os.path.join(sysfs_class_dir, dev_name) - if os.path.exists(dev_path): - return dev_path - -import inspect -def log_method_call(d, *args, **kwargs): - classname = d.__class__.__name__ - methodname = inspect.stack()[1][3] - fmt = "%s.%s:" - fmt_args = [classname, methodname] - for arg in args: - fmt += " %s ;" - fmt_args.append(arg) - - for k, v in kwargs.items(): - fmt += " %s: %s ;" - fmt_args.extend([k, v]) - - log.debug(fmt % tuple(fmt_args)) - -def numeric_type(num): - """ Verify that a value is given as a numeric data type. - - Return the number if the type is sensible or raise ValueError - if not. - """ - if num is None: - num = 0 - elif not (isinstance(num, int) or \ - isinstance(num, long) or \ - isinstance(num, float)): - raise ValueError("value (%s) must be either a number or None" % num) - - return num - - -- 1.7.3.3

2 1

[PATCH] Clean up vg name generator and default to "vg_image" in image installs.
by David Lehman 17 Feb '11

17 Feb '11

--- pyanaconda/storage/__init__.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 0309f28..ddac09c 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -936,19 +936,15 @@ class Storage(object): def createSuggestedVGName(self, hostname=None): """ Return a reasonable, unused VG name. """ # try to create a volume group name incorporating the hostname - vgnames = [vg.name for vg in self.vgs] - if hostname is not None and hostname != '': - if hostname == 'localhost' or hostname == 'localhost.localdomain': - vgtemplate = "VolGroup" - elif hostname.find('.') != -1: - template = "vg_%s" % (hostname.split('.')[0].lower(),) - vgtemplate = safeLvmName(template) - else: - template = "vg_%s" % (hostname.lower(),) - vgtemplate = safeLvmName(template) + if hostname not in (None, "", 'localhost', 'localhost.localdomain'): + template = "vg_%s" % (hostname.split('.')[0].lower(),) + vgtemplate = safeLvmName(template) + elif flags.imageInstall: + vgtemplate = "vg_image" else: vgtemplate = "VolGroup" + vgnames = [vg.name for vg in self.vgs] if vgtemplate not in vgnames and \ vgtemplate not in lvm.lvm_vg_blacklist: return vgtemplate -- 1.7.3.4

2 1

[lorax] Use xz when compressing the initrd
by Martin Gracik 17 Feb '11

17 Feb '11

This makes the image a lot smaller. --- lorax.spec | 1 + src/pylorax/installtree.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lorax.spec b/lorax.spec index 7704f17..7da6643 100644 --- a/lorax.spec +++ b/lorax.spec @@ -26,6 +26,7 @@ Requires: util-linux-ng Requires: dosfstools Requires: genisoimage Requires: parted +Requires: pyliblzma %description Lorax is a tool for creating the anaconda install images. diff --git a/src/pylorax/installtree.py b/src/pylorax/installtree.py index 9883bba..d0a045d 100644 --- a/src/pylorax/installtree.py +++ b/src/pylorax/installtree.py @@ -26,6 +26,7 @@ import sys import os import shutil import gzip +import lzma import re import glob import time @@ -506,7 +507,7 @@ class LoraxInstallTree(BaseLoraxClass): dst = joinpaths(self.root, "sbin") shutil.copy2(src, dst) - def compress(self, initrd, kernel): + def compress(self, initrd, kernel, type="xz"): chdir = lambda: os.chdir(self.root) start = time.time() @@ -521,9 +522,13 @@ class LoraxInstallTree(BaseLoraxClass): stdin=find.stdout, stdout=subprocess.PIPE, preexec_fn=chdir) - gzipped = gzip.open(initrd.fpath, "wb") - gzipped.write(cpio.stdout.read()) - gzipped.close() + if type == "gzip": + compressed = gzip.open(initrd.fpath, "wb") + elif type == "xz": + compressed = lzma.LZMAFile(initrd.fpath, "w", options={"level":9}) + + compressed.write(cpio.stdout.read()) + compressed.close() # move modules out of the tree again shutil.move(joinpaths(self.root, "modules", kernel.version), -- 1.7.3.2

3 2

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