Anaconda-devel June 2010

anaconda-devel@lists.stg.fedoraproject.org

21 participants
115 discussions

[rhel6-branch & master] patches
by David Cantrell 20 Jul '10

20 Jul '10

1) Make sure dhclient*conf goes to /etc/dhcp 2) Reduce the rd_DASD parameter to exclude default values. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

3 7

Enhanced debugging of anaconda
by Martin Sivak 02 Jul '10

02 Jul '10

Hi, after Ales enabled the core dumps, I went a bit further and moved the coredump stuff to init, so we can get core files also when loader sigsegvs. Moreover, when in this mode (which I called Development mode) init will also spawn a shell to make it possible to get all the logs and core files and transfer them to another machine. (mount, ls and cp are present in initrd) With this patch, you can enable this behaviour by passing the 'devel' argument on the kernel boot prompt. Both shell and coredumps are disabled when not in this devel mode so it won't disrupt automatic tests. What do you think? -- Martin Sivak msivak(a)redhat.com Anaconda / BRQ

8 14

Re: Branch 'rhel6-branch' - isys/isys.py network.py vnc.py
by Chris Lumens 30 Jun '10

30 Jun '10

> @@ -509,8 +510,11 @@ def isWireless(dev): > else: > return False > > -# Get the IP address for a network device. > -def getIPAddress(dev): > +# Get IP addresses for a network device. > +# Returns list of ipv4 and ipv6 addresses. > +# With version=4 returns only ipv4 addresses, > +# with version=6 returns only ipv6 addresses. > +def getIPAddresses(dev, version=None): > if dev == '' or dev is None: > return None > What I was thinking here is that version should default to 4, since that's the thing we'll most typically want and having an essentially required parameter default to None doesn't make any sense to me. > + if not version == 6: > + ip4_config_path = device_props_iface.Get(NM_DEVICE_IFACE, 'Ip4Config') > + if ip4_config_path != '/': > + ip4_config_obj = bus.get_object(NM_SERVICE, ip4_config_path) > + ip4_config_props = dbus.Interface(ip4_config_obj, DBUS_PROPS_IFACE) > + > + # addresses (3-element list: ipaddr, netmask, gateway) > + addrs = ip4_config_props.Get(NM_IP4CONFIG_IFACE, "Addresses") > + for addr in addrs: > + try: > + tmp = struct.pack('I', addr[0]) > + ipaddr = socket.inet_ntop(socket.AF_INET, tmp) > + addresses.append(ipaddr) > + except ValueError as e: > + log.debug("Exception caught trying to convert IP address %s: %s" % > + (addr, e)) > + > + if not version == 4: > + ip6_config_path = device_props_iface.Get(NM_DEVICE_IFACE, 'Ip6Config') > + if ip6_config_path != '/': > + ip6_config_obj = bus.get_object(NM_SERVICE, ip6_config_path) > + ip6_config_props = dbus.Interface(ip6_config_obj, DBUS_PROPS_IFACE) > + > + addrs = ip6_config_props.Get(NM_IP6CONFIG_IFACE, "Addresses") > + for addr in addrs: > + try: > + addrstr = "".join(str(byte) for byte in addr[0]) > + ipaddr = socket.inet_ntop(socket.AF_INET6, addrstr) > + # XXX - should we prefer Global or Site-Local types? > + # does NM prefer them? > + addresses.append(ipaddr) > + except ValueError as e: > + log.debug("Exception caught trying to convert IP address %s: %s" % > + (addr, e)) > + > + return addresses I find the negation thing here unnecessarily confusing. So if I pass version=47 to getIPAddresses, I'll get everything. If I pass version=True, I'll get everything. Same for version="cornbread" and version=("left", "right"). Just converting this to "if version == 4:" and "if version == 6:" means you'll get exactly what you want should you pass the correct parameter. - Chris

3 2

[PATCH] Pass size of structure not a size of ointer to calloc (#592227)
by Martin Sivak 30 Jun '10

30 Jun '10

--- loader/hdinstall.c | 2 +- loader/method.c | 8 ++++---- loader/nfsinstall.c | 2 +- loader/urlinstall.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/loader/hdinstall.c b/loader/hdinstall.c index 979ccf0..1b28ab1 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -386,7 +386,7 @@ void setKickstartHD(struct loaderData_s * loaderData, int argc, } loaderData->method = METHOD_HD; - loaderData->stage2Data = calloc(sizeof(struct hdInstallData *), 1); + loaderData->stage2Data = calloc(sizeof(struct hdInstallData), 1); if (partition) ((struct hdInstallData *)loaderData->stage2Data)->partition = partition; if (dir) diff --git a/loader/method.c b/loader/method.c index 219fd06..9bb47d0 100644 --- a/loader/method.c +++ b/loader/method.c @@ -510,7 +510,7 @@ void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { if (!strncmp(arg, "nfs:", 4)) { ld->method = METHOD_NFS; - ld->stage2Data = calloc(sizeof(struct nfsInstallData *), 1); + ld->stage2Data = calloc(sizeof(struct nfsInstallData), 1); parseNfsHostPathOpts(arg + 4, &(((struct nfsInstallData *)ld->stage2Data)->host), @@ -518,7 +518,7 @@ void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { &(((struct nfsInstallData *)ld->stage2Data)->mountOpts)); } else if (!strncmp(arg, "nfsiso:", 7)) { ld->method = METHOD_NFS; - ld->stage2Data = calloc(sizeof(struct nfsInstallData *), 1); + ld->stage2Data = calloc(sizeof(struct nfsInstallData), 1); parseNfsHostPathOpts(arg + 7, &(((struct nfsInstallData *)ld->stage2Data)->host), @@ -527,14 +527,14 @@ void setStage2LocFromCmdline(char * arg, struct loaderData_s * ld) { } else if (!strncmp(arg, "ftp:", 4) || !strncmp(arg, "http", 4)) { ld->method = METHOD_URL; - ld->stage2Data = calloc(sizeof(struct urlInstallData *), 1); + ld->stage2Data = calloc(sizeof(urlInstallData), 1); ((urlInstallData *)ld->stage2Data)->url = strdup(arg); } else if (!strncmp(arg, "cdrom:", 6)) { ld->method = METHOD_CDROM; } else if (!strncmp(arg, "harddrive:", 10) || !strncmp(arg, "hd:", 3)) { ld->method = METHOD_HD; - ld->stage2Data = calloc(sizeof(struct hdInstallData *), 1); + ld->stage2Data = calloc(sizeof(struct hdInstallData), 1); ((struct hdInstallData *)ld->stage2Data)->partition = strdup(c); if ((c = strtok(NULL, ":"))) ((struct hdInstallData *)ld->stage2Data)->directory = strdup(c); diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index 09a2109..21e029d 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -406,7 +406,7 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc, logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'", host, dir, mountOpts); } else { - loaderData->stage2Data = calloc(sizeof(struct nfsInstallData *), 1); + loaderData->stage2Data = calloc(sizeof(struct nfsInstallData), 1); ((struct nfsInstallData *)loaderData->stage2Data)->host = host; ((struct nfsInstallData *)loaderData->stage2Data)->directory = dir; ((struct nfsInstallData *)loaderData->stage2Data)->mountOpts = mountOpts; diff --git a/loader/urlinstall.c b/loader/urlinstall.c index 53d73b7..962ad4e 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -396,7 +396,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, if (!substr || (substr && *(substr+4) != '\0')) { loaderData->instRepo = strdup(url); } else { - if ((loaderData->stage2Data = calloc(sizeof(urlInstallData *), 1)) == NULL) + if ((loaderData->stage2Data = calloc(sizeof(urlInstallData), 1)) == NULL) return; ((urlInstallData *)loaderData->stage2Data)->url = url; -- 1.6.6.1

2 1

[PATCH] Translate MAC addresses to devices in the second stage, too.
by Chris Lumens 30 Jun '10

30 Jun '10

Related: rhbz#185522 --- kickstart.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kickstart.py b/kickstart.py index 503480e..2ef9738 100644 --- a/kickstart.py +++ b/kickstart.py @@ -565,9 +565,20 @@ class NetworkData(commands.network.F8_NetworkData): else: device = self.device - try: + # If we were given a network device name, grab the device object. + # If we were given a MAC address, resolve that to a device name + # and then grab the device object. Otherwise, errors. + dev = None + + if devices.has_key(device): dev = devices[device] - except KeyError: + else: + for d in devices: + if d.get("HWADDR") == device: + dev = d + break + + if not dev: raise KickstartValueError, formatErrorMsg(self.lineno, msg="The provided network interface %s does not exist" % device) dev.set (("bootproto", self.bootProto)) -- 1.7.0.1

2 1

[PATCH rhel6-branch] Fix prototype of getIPAddresses (#605659)
by Radek Vykydal 30 Jun '10

30 Jun '10

Return only ipv4 addresses (by default) or ipv6 addresses, never both. --- isys/isys.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/isys/isys.py b/isys/isys.py index 55c7165..449ba5c 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -511,10 +511,9 @@ def isWireless(dev): return False # Get IP addresses for a network device. -# Returns list of ipv4 and ipv6 addresses. -# With version=4 returns only ipv4 addresses, -# with version=6 returns only ipv6 addresses. -def getIPAddresses(dev, version=None): +# Returns list of ipv4 or ipv6 addresses, depending +# on version parameter. ipv4 is default. +def getIPAddresses(dev, version=4): if dev == '' or dev is None: return None @@ -526,7 +525,7 @@ def getIPAddresses(dev, version=None): addresses = [] - if not version == 6: + if version == 4: ip4_config_path = device_props_iface.Get(NM_DEVICE_IFACE, 'Ip4Config') if ip4_config_path != '/': ip4_config_obj = bus.get_object(NM_SERVICE, ip4_config_path) @@ -542,8 +541,7 @@ def getIPAddresses(dev, version=None): except ValueError as e: log.debug("Exception caught trying to convert IP address %s: %s" % (addr, e)) - - if not version == 4: + elif version == 6: ip6_config_path = device_props_iface.Get(NM_DEVICE_IFACE, 'Ip6Config') if ip6_config_path != '/': ip6_config_obj = bus.get_object(NM_SERVICE, ip6_config_path) @@ -560,6 +558,8 @@ def getIPAddresses(dev, version=None): except ValueError as e: log.debug("Exception caught trying to convert IP address %s: %s" % (addr, e)) + else: + raise ValueError, "invalid IP version %d" % version return addresses -- 1.6.0.6

3 2

Bug in dasd.py ?
by Hans de Goede 30 Jun '10

30 Jun '10

Hi, I just noticed the following in dasd.py: if status in ["unformatted"] and device not in exclusiveDisks: This seems wrong, as exclusiveDisks is not a list of disks to filter, but the opposite it is a list of disks which we are allowed to touch, so the proper test would be: if status in ["unformatted"] and (not exclusiveDisks or device in exclusiveDisks): Note that this code likely currently still works properly as DASD().startup() gets called for the first time from the filter UI when building the disk list and at this time exclusiveDisks is empty. I do find this strange though, what is the use of having an exclusiveDisks parameter to DASD().startup() to allow filtering out dasd's from dasd formatting if we call DASD().startup() before the user has been able to select which disks to filter out (and thus to populate exclusiveDisks). Regards, Hans

3 3

[PATCH] anaconda's lvm vgreduce invocation is not filtering out disks (609479)
by Hans de Goede 30 Jun '10

30 Jun '10

--- pyanaconda/storage/devicelibs/lvm.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pyanaconda/storage/devicelibs/lvm.py b/pyanaconda/storage/devicelibs/lvm.py index 5ff6c70..52fdf40 100644 --- a/pyanaconda/storage/devicelibs/lvm.py +++ b/pyanaconda/storage/devicelibs/lvm.py @@ -283,6 +283,7 @@ def vgreduce(vg_name, pv_list, rm=False): the --removemissing option. """ args = ["vgreduce"] + args.extend(config_args) if rm: args.extend(["--removemissing", vg_name]) else: -- 1.7.0.1

2 1

[PATCH] anaconda: Disable X server regenerations (#609245)
by Adam Jackson 30 Jun '10

30 Jun '10

Otherwise, we lose arbitrary amounts of X server state, since we're not waiting for metacity before carrying on; and any driver bugs that cause crashes on regeneration will cause graphical install to fail entirely. This varies slightly from the usual policy of doing what the installed system would do, but I'm willing to turn a blind eye. The more correct fix would be waiting for one of the properties metacity creates to exist on the root window. This is harder than you think. Signed-off-by: Adam Jackson <ajax(a)redhat.com> --- anaconda | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/anaconda b/anaconda index c01260e..0fe26e8 100755 --- a/anaconda +++ b/anaconda @@ -36,6 +36,7 @@ from tempfile import mkstemp # keep up with process ID of the window manager if we start it wm_pid = None +xserver_pid = None # Make sure messages sent through python's warnings module get logged. def AnacondaShowWarning(message, category, filename, lineno, file=sys.stderr, line=None): @@ -120,6 +121,7 @@ def set_x_resolution(runres): def doShutdownX11Actions(): global wm_pid + global xserver_pid if wm_pid is not None: try: @@ -128,6 +130,13 @@ def doShutdownX11Actions(): except: pass + if xserver_pid is not None: + try: + os.kill(xserver_pid, 15) + os.waitpid(xserver_pid, 0) + except: + pass + def setupPythonUpdates(): from distutils.sysconfig import get_python_lib @@ -533,7 +542,6 @@ if __name__ == "__main__": graphical_failed = 0 vncS = vnc.VncServer() # The vnc Server object. vncS.anaconda = anaconda - xserver_pid = None (opts, args) = parseOptions() @@ -783,7 +791,8 @@ if __name__ == "__main__": proc = subprocess.Popen(["Xorg", "-br", "-logfile", "/tmp/X.log", ":1", "vt6", "-s", "1440", "-ac", - "-nolisten", "tcp", "-dpi", "96"], + "-nolisten", "tcp", "-dpi", "96", + "-noreset"], close_fds=True, stdout=xout, stderr=xout, preexec_fn=preexec_fn) -- 1.7.0.1

3 3

[master] ui: _Create mnemonics in Create Storage dialog.
by Ales Kozumplik 30 Jun '10

30 Jun '10

--- data/ui/create-storage.glade | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/data/ui/create-storage.glade b/data/ui/create-storage.glade index 98db7d7..79dd45d 100644 --- a/data/ui/create-storage.glade +++ b/data/ui/create-storage.glade @@ -354,11 +354,12 @@ </child> <child> <widget class="GtkButton" id="storage_create_button_create"> - <property name="label" translatable="yes">Create</property> + <property name="label" translatable="yes">C_reate</property> <property name="response_id">1</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> </widget> <packing> <property name="expand">False</property> -- 1.7.0.1

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel June 2010