Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[PATCH] Remove XXX comment in net.c about GATEWAY
by David Cantrell 07 Dec '08

07 Dec '08

In NetworkManager-world, we want the GATEWAY to be store per device rather than for the entire system, so what ifcfg-fedora is reading is the correct thing to do. --- loader/net.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/loader/net.c b/loader/net.c index 9c6c2f5..69f5779 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1257,10 +1257,6 @@ int writeEnabledNetInfo(iface_t *iface) { fprintf(fp, "BROADCAST=%s\n", buf); } - /* XXX: this should not be here, but ifcfg-fedora - * in NM does not currently read the global - * /etc/sysconfig/network file. - */ if (iface_have_in_addr(&iface->gateway)) { if (inet_ntop(AF_INET, &iface->gateway, buf, INET_ADDRSTRLEN) == NULL) { -- 1.6.0.3

2 1

[PATCH] Remove readLine() function from loader/loadermisc.c
by David Cantrell 07 Dec '08

07 Dec '08

Nothing is using this function anymore. --- loader/loadermisc.c | 11 ----------- loader/loadermisc.h | 1 - 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/loader/loadermisc.c b/loader/loadermisc.c index c0fd71e..a156007 100644 --- a/loader/loadermisc.c +++ b/loader/loadermisc.c @@ -86,17 +86,6 @@ int copyFile(char * source, char * dest) { return rc; } -char * readLine(FILE * f) { - char buf[1024], *ret; - - ret = fgets(buf, sizeof(buf), f); - - /* chop */ - buf[strlen(buf) - 1] = '\0'; - - return strdup(buf); -} - /* FIXME: when we only depend on glibc, we could use strvercmp instead */ /* compare alpha and numeric segments of two versions */ /* return 1: a is newer than b */ diff --git a/loader/loadermisc.h b/loader/loadermisc.h index c7e2b52..23ebf4a 100644 --- a/loader/loadermisc.h +++ b/loader/loadermisc.h @@ -27,7 +27,6 @@ int copyFile(char * source, char * dest); int copyFileFd(int infd, char * dest, progressCB pbcb, struct progressCBdata *data, long long total); -char * readLine(FILE * f); int simpleStringCmp(const void * a, const void * b); int totalMemory(void); -- 1.6.0.3

2 1

[PATCH] Preserve network config files for upgrade and kickstart installs.
by David Cantrell 05 Dec '08

05 Dec '08

The suggestion for this patch came from OLPC (or someone with an @laptop.org email address). The user was doing a kickstart install and adding a local yum repo that provided an RPM of site-specific configuration files, including ifcfg-DEVICE files. This package would get installed just fine, but then anaconda drives over the configuration files after package installation. If doing a kickstart install or an upgrade install, preserve any network configurations that we want to write over in anaconda. --- network.py | 176 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 98 insertions(+), 78 deletions(-) diff --git a/network.py b/network.py index 45dc408..4fb70c7 100644 --- a/network.py +++ b/network.py @@ -516,6 +516,11 @@ class Network: return False def write(self, instPath='', anaconda=None): + preserve = False + if anaconda is not None: + if (anaconda.id.ksdata is not None) or anaconde.id.getUpgrade(): + preserve = True + if len(self.netdevices.values()) == 0: return @@ -523,12 +528,18 @@ class Network: netscripts = "%s/network-scripts" % (sysconfig,) destnetwork = "%s/network" % (sysconfig,) - if not os.path.isdir(netscripts): + if not os.path.isdir(netscripts) and not preserve: iutil.mkdirChain(netscripts) # /etc/sysconfig/network-scripts/ifcfg-* for dev in self.netdevices.values(): device = dev.get('DEVICE') + + if preserve: + cfgfile = "%s/ifcfg-%s" % (netscripts, device,) + if os.path.isfile(cfgfile): + continue + bootproto = dev.get('BOOTPROTO').lower() ipv6addr = dev.get('IPV6ADDR').lower() ipv6prefix = dev.get('IPV6PREFIX').lower() @@ -600,6 +611,11 @@ class Network: # XXX: is this necessary with NetworkManager? # handle the keys* files if we have those if dev.get("KEY"): + if preserve: + cfgfile = "%s/keys-%s" % (netscripts, device,) + if os.path.isfile(cfgfile): + continue + newkey = "%s/keys-%s.new" % (netscripts, device,) f = open(newkey, "w") f.write("KEY=%s\n" % (dev.get('KEY'),)) @@ -610,78 +626,80 @@ class Network: shutil.move(newkey, destkey) # /etc/sysconfig/network - newnetwork = "%s.new" % (destnetwork,) + if not preserve or not os.path.isfile(destnetwork): + newnetwork = "%s.new" % (destnetwork,) - f = open(newnetwork, "w") - f.write("NETWORKING=yes\n") - f.write("HOSTNAME=") + f = open(newnetwork, "w") + f.write("NETWORKING=yes\n") + f.write("HOSTNAME=") - # use instclass hostname if set(kickstart) to override - if self.hostname: - f.write(self.hostname + "\n") - else: - f.write("localhost.localdomain\n") + # use instclass hostname if set(kickstart) to override + if self.hostname: + f.write(self.hostname + "\n") + else: + f.write("localhost.localdomain\n") - if dev.get('GATEWAY'): - f.write("GATEWAY=%s\n" % (dev.get('GATEWAY'),)) + if dev.get('GATEWAY'): + f.write("GATEWAY=%s\n" % (dev.get('GATEWAY'),)) - if dev.get('IPV6_DEFAULTGW'): - f.write("IPV6_DEFAULTGW=%s\n" % (dev.get('IPV6_DEFAULTGW'),)) + if dev.get('IPV6_DEFAULTGW'): + f.write("IPV6_DEFAULTGW=%s\n" % (dev.get('IPV6_DEFAULTGW'),)) - f.close() - shutil.move(newnetwork, destnetwork) + f.close() + shutil.move(newnetwork, destnetwork) # /etc/hosts - f = open(instPath + "/etc/hosts", "w") - - log.info("self.hostname = %s", self.hostname) - - # IP address - ip = self.lookupHostname() - if ip in [ "127.0.0.1", "::1" ]: - ip = None - - # fqdn and hostname - if "." in self.hostname: - fqdn = self.hostname - hostname = self.hostname.split('.', 1)[0] - else: - fqdn = socket.getfqdn(self.hostname) - hostname = self.hostname - - if fqdn in [ "localhost.localdomain", "localhost", - "localhost6.localdomain6", "localhost6", hostname ] \ - or "." not in fqdn: - fqdn = None - - # domainname - if fqdn: - domainname = fqdn.split('.', 1)[1] - if domainname in [ "localdomain", "localdomain6" ]: - domainname = None - else: - domainname = None - - localline = "localhost.localdomain localhost" - if not ip or not fqdn: - # There is no ip or no fqdn, tie it to 127.0.0.1. + if not preserve or not os.path.isfile(instPath + "/etc/hosts"): + f = open(instPath + "/etc/hosts", "w") + + log.info("self.hostname = %s", self.hostname) + + # IP address + ip = self.lookupHostname() + if ip in [ "127.0.0.1", "::1" ]: + ip = None + + # fqdn and hostname + if "." in self.hostname: + fqdn = self.hostname + hostname = self.hostname.split('.', 1)[0] + else: + fqdn = socket.getfqdn(self.hostname) + hostname = self.hostname + + if fqdn in [ "localhost.localdomain", "localhost", + "localhost6.localdomain6", "localhost6", hostname ] \ + or "." not in fqdn: + fqdn = None + + # domainname if fqdn: - # add fqdn to 127.0.0.1 - localline += " " + fqdn - if hostname and hostname != "localhost": - # add short hostname to 127.0.0.1 - localline += " " + hostname - - f.write("# Do not remove the following line, or various programs\n") - f.write("# that require network functionality will fail.\n") - f.write("127.0.0.1\t\t" + localline + "\n") - f.write("::1\t\tlocalhost6.localdomain6 localhost6\n") + domainname = fqdn.split('.', 1)[1] + if domainname in [ "localdomain", "localdomain6" ]: + domainname = None + else: + domainname = None - if ip and fqdn: - # Add an extra entry for ip, fqdn and hostname - f.write("%s\t\t%s %s\n" % (ip, fqdn, hostname)) + localline = "localhost.localdomain localhost" + if not ip or not fqdn: + # There is no ip or no fqdn, tie it to 127.0.0.1. + if fqdn: + # add fqdn to 127.0.0.1 + localline += " " + fqdn + if hostname and hostname != "localhost": + # add short hostname to 127.0.0.1 + localline += " " + hostname + + f.write("# Do not remove the following line, or various programs\n") + f.write("# that require network functionality will fail.\n") + f.write("127.0.0.1\t\t" + localline + "\n") + f.write("::1\t\tlocalhost6.localdomain6 localhost6\n") + + if ip and fqdn: + # Add an extra entry for ip, fqdn and hostname + f.write("%s\t\t%s %s\n" % (ip, fqdn, hostname)) - f.close() + f.close() # If the hostname was not looked up, but typed in by the user, # domain might not be computed, so do it now. @@ -690,30 +708,32 @@ class Network: self.domains = [domainname] # /etc/resolv.conf - if os.path.isfile('/etc/resolv.conf') and instPath != '': - destresolv = "%s/etc/resolv.conf" % (instPath,) - shutil.copy('/etc/resolv.conf', destresolv) - elif (self.domains != ['localdomain'] and self.domains) or \ - self.hasNameServers(dev.info): - resolv = "%s/etc/resolv.conf" % (instPath,) + if not preserve or not os.path.isfile(instPath + '/etc/resolv.conf'): + if os.path.isfile('/etc/resolv.conf') and instPath != '': + destresolv = "%s/etc/resolv.conf" % (instPath,) + shutil.copy('/etc/resolv.conf', destresolv) + elif (self.domains != ['localdomain'] and self.domains) or \ + self.hasNameServers(dev.info): + resolv = "%s/etc/resolv.conf" % (instPath,) - f = open(resolv, "w") + f = open(resolv, "w") - if self.domains != ['localdomain'] and self.domains: - f.write("search %s\n" % (string.joinfields(self.domains, ' '),)) + if self.domains != ['localdomain'] and self.domains: + f.write("search %s\n" % (string.joinfields(self.domains, ' '),)) - for key in dev.info.keys(): - if key.upper().startswith('DNS'): - f.write("nameserver %s\n" % (dev.get(key),)) + for key in dev.info.keys(): + if key.upper().startswith('DNS'): + f.write("nameserver %s\n" % (dev.get(key),)) - f.close() + f.close() # /etc/udev/rules.d/70-persistent-net.rules - if not instPath == '': + rules = instPath + "/etc/udev/rules.d/70-persistent-net.rules" + if (not instPath) and (not preserve or not os.path.isfile(rules)): if not os.path.isdir("%s/etc/udev/rules.d" %(instPath,)): iutil.mkdirChain("%s/etc/udev/rules.d" %(instPath,)) - f = open(instPath + "/etc/udev/rules.d/70-persistent-net.rules", "w") + f = open(rules, "w") f.write(""" # This file was automatically generated by the /lib/udev/write_net_rules # program run by the persistent-net-generator.rules rules file. -- 1.6.0.3

3 3

[PATCH] pdb hack to have autocompletion and anaconda reference
by Radek Vykydal 05 Dec '08

05 Dec '08

Hi, this is hack for more comfortable anaconda debugging with pdb. What it does: - Adds commands to enable/disable rlcompleter completion in pdb (cmplon, cmploff). - Allows to bring objects from anaconda into local namespace of pdb frame (anaconda object is used in example;). Objects added to namespace are printed with cmplns command. (see docstring of the pdb_completion) I missed these things in my anaconda debugging, if you do too, it might be useful, thoug it's perhaps too raw and specialized to add to rawhide. First patch is the hackfunction, the second one is example of use - it adds the features to pdb sessions invoked by clicking Debug in gui. I borrowed here: http://code.activestate.com/recipes/498182/ Any feedback is welcome... Radek

2 2

[PATCH] add tajik support (455963)
by Chris Lumens 05 Dec '08

05 Dec '08

Ugh, it's been a while since I added language support. Did I do all this right? - Chris diff --git a/src/keyboard_models.py b/src/keyboard_models.py index fe7cbf1..1075e76 100644 --- a/src/keyboard_models.py +++ b/src/keyboard_models.py @@ -231,6 +231,9 @@ class KeyboardModels: 'slovene' : [N_('keyboard|Slovenian'), 'si', 'pc105', '', ''], # Translators: the word before the bar is just context and # doesn't need to be translated. Only after will be translated. + 'tj' : [N_('keyboard|Tajik'), 'tj', 'pc105', '', ''], + # Translators: the word before the bar is just context and + # doesn't need to be translated. Only after will be translated. 'tml-inscript' : [N_('keyboard|Tamil (Inscript)'), 'us,in', 'pc105', 'tam', # Translators: the word before the bar is just context and # doesn't need to be translated. Only after will be translated. diff --git a/lang-table b/lang-table index 73fbe25..96b5cf4 100644 --- a/lang-table +++ b/lang-table @@ -49,6 +49,7 @@ Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Euro Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm +Tajik tg none tg_TG.UTF-8 tj Asia/Dushanbe Tamil ta none ta_IN.UTF-8 us Asia/Calcutta Telugu te none te_IN.UTF-8 us Asia/Calcutta Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul

2 2

[PATCH] Avoid tracebacks when filling in static network config fields (#474275)
by David Cantrell 05 Dec '08

05 Dec '08

If the user changes to static network configuration, we may or may not have values already that we can populate the fields with. If we do, take them. Otherwise, leave the field blank and keep going. --- iw/netconfig_dialog.py | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py index 6a8bdc7..4818171 100644 --- a/iw/netconfig_dialog.py +++ b/iw/netconfig_dialog.py @@ -74,10 +74,29 @@ class NetworkConfigurator: self.xml.get_widget("dhcpCheckbutton").set_active(False) # FIXME: need to set ipv6 here too once we have that - if netdev.get('IPADDR'): self.xml.get_widget("ipv4Address").set_text(netdev.get('IPADDR')) - if netdev.get('NETMASK'): self.xml.get_widget("ipv4Netmask").set_text(netdev.get('NETMASK')) - if self.network.gateway: self.xml.get_widget("gatewayEntry").set_text(self.network.gateway) - if self.network.primaryNS: self.xml.get_widget("nameserverEntry").set_text(self.network.primaryNS) + try: + if netdev.get('IPADDR'): + self.xml.get_widget("ipv4Address").set_text(netdev.get('IPADDR')) + except: + pass + + try: + if netdev.get('NETMASK'): + self.xml.get_widget("ipv4Netmask").set_text(netdev.get('NETMASK')) + except: + pass + + try: + if self.network.gateway: + self.xml.get_widget("gatewayEntry").set_text(self.network.gateway) + except: + pass + + try: + if self.network.primaryNS: + self.xml.get_widget("nameserverEntry").set_text(self.network.primaryNS) + except: + pass def _ipv4Toggled(self, cb): if self.xml.get_widget("dhcpCheckbutton").get_active(): -- 1.6.0.3

2 1

[PATCH] Send unique vendor class identifier unless user specifies one.
by David Cantrell 05 Dec '08

05 Dec '08

Restores functionality we had before the NM changeover. This was originally requested by gurulabs.com. Instead of sending just 'anaconda' as the vendor class identifier, send something like: anaconda-Linux 2.6.27.5-117.fc10.i686 i686 Of course, if we fail to collect that information, fall back on 'anaconda'. Guru Labs wanted this functionality for PXE booting as it allowed them to more easily control per-client/per-release settings from the DHCP server. My fault for not adding this back when the NM changeover happened. --- loader/net.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/loader/net.c b/loader/net.c index 62dc236..9c6c2f5 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1156,6 +1156,7 @@ int writeEnabledNetInfo(iface_t *iface) { char buf[INET6_ADDRSTRLEN+1]; char *ofile = NULL; char *nfile = NULL; + struct utsname kv; memset(&buf, '\0', sizeof(buf)); @@ -1163,29 +1164,38 @@ int writeEnabledNetInfo(iface_t *iface) { return 16; } - /* write vendor class if we have that */ - if (iface->vendorclass != NULL) { - if (asprintf(&ofile, "/etc/dhclient-%s.conf", iface->device) == -1) { - return 17; + /* write vendor class */ + if (iface->vendorclass == NULL) { + if (uname(&kv) == -1) { + iface->vendorclass = "anaconda"; + } else { + if (asprintf(&iface->vendorclass, "anaconda-%s %s %s", + kv.sysname, kv.release, kv.machine)) { + return 20; + } } + } - if ((fp = fopen(ofile, "w")) == NULL) { - free(ofile); - return 18; - } + if (asprintf(&ofile, "/etc/dhclient-%s.conf", iface->device) == -1) { + return 17; + } - fprintf(fp, "send vendor-class-identifier \"%s\";\n", - iface->vendorclass); + if ((fp = fopen(ofile, "w")) == NULL) { + free(ofile); + return 18; + } - if (fclose(fp) == EOF) { - free(ofile); - return 19; - } + fprintf(fp, "send vendor-class-identifier \"%s\";\n", + iface->vendorclass); - if (ofile) { - free(ofile); - ofile = NULL; - } + if (fclose(fp) == EOF) { + free(ofile); + return 19; + } + + if (ofile) { + free(ofile); + ofile = NULL; } /* write out new ifcfg-DEVICE file */ -- 1.6.0.3

2 1

[PATCH] ignore all missing packages
by Chris Lumens 05 Dec '08

05 Dec '08

Peter got sick of hitting "Continue" a million times to skip missing packages on his kickstart install. We have a %packages option to automatically skip them, but how about a button in the UI to do the same thing? - Chris diff --git a/kickstart.py b/kickstart.py index ef9488b..4d70d51 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1088,6 +1088,7 @@ def runTracebackScripts(anaconda): def selectPackages(anaconda): ksdata = anaconda.id.ksdata + ignoreAll = False # If no %packages header was seen, use the installclass's default group # selections. This can also be explicitly specified with %packages @@ -1098,7 +1099,7 @@ def selectPackages(anaconda): for pkg in ksdata.packages.packageList: num = anaconda.backend.selectPackage(pkg) - if ksdata.packages.handleMissing == KS_MISSING_IGNORE: + if ksdata.packages.handleMissing == KS_MISSING_IGNORE or ignoreAll: continue if num > 0: continue @@ -1110,11 +1111,12 @@ def selectPackages(anaconda): "abort your installation?") %(pkg,), type="custom", custom_buttons=[_("_Abort"), + _("_Ignore All"), _("_Continue")]) if rc == 0: sys.exit(1) - else: - pass + elif rc == 1: + ignoreAll = True anaconda.backend.selectGroup("Core") @@ -1136,7 +1138,7 @@ def selectPackages(anaconda): try: anaconda.backend.selectGroup(grp.name, (default, optional)) except NoSuchGroup, e: - if ksdata.packages.handleMissing == KS_MISSING_IGNORE: + if ksdata.packages.handleMissing == KS_MISSING_IGNORE or ignoreAll: pass else: rc = anaconda.intf.messageWindow(_("Missing Group"), @@ -1148,11 +1150,12 @@ def selectPackages(anaconda): %(grp.name,), type="custom", custom_buttons=[_("_Abort"), + _("_Ignore All"), _("_Continue")]) if rc == 0: sys.exit(1) - else: - pass + elif rc == 1: + ignoreAll = True map(anaconda.backend.deselectPackage, ksdata.packages.excludedList)

3 2

[PATCH] Add isys.traceback(), which generates a traceback with no exception.
by pjones 04 Dec '08

04 Dec '08

Chris asked for this to help with his traceback handling fixups. It generates a traceback object at the current location, but doesn't raise an exception. --- isys/isys.c | 39 +++++++++++++++++++++++++++++++++++++++ isys/isys.py | 18 ++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/isys/isys.c b/isys/isys.c index b3466ab..3b17b6f 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -132,6 +132,7 @@ static PyObject * doGetBlkidData(PyObject * s, PyObject * args); static PyObject * doGetDeviceByToken(PyObject *s, PyObject *args); static PyObject * doIsCapsLockEnabled(PyObject * s, PyObject * args); static PyObject * doGetLinkStatus(PyObject * s, PyObject * args); +static PyObject * doTraceback(PyObject *self, PyObject *args, PyObject *kwds); static PyMethodDef isysModuleMethods[] = { { "ejectcdrom", (PyCFunction) doEjectCdrom, METH_VARARGS, NULL }, @@ -179,6 +180,7 @@ static PyMethodDef isysModuleMethods[] = { { "getdevicebytoken", (PyCFunction) doGetDeviceByToken, METH_VARARGS, NULL }, { "isCapsLockEnabled", (PyCFunction) doIsCapsLockEnabled, METH_VARARGS, NULL }, { "getLinkStatus", (PyCFunction) doGetLinkStatus, METH_VARARGS, NULL }, + { "traceback", (PyCFunction) doTraceback, METH_VARARGS|METH_KEYWORDS, NULL }, { NULL, NULL, 0, NULL } } ; @@ -932,4 +934,41 @@ static PyObject * doGetLinkStatus(PyObject * s, PyObject * args) { return PyBool_FromLong(0); } +#include "frameobject.h" + +static PyObject * +doTraceback(PyObject *self, PyObject *args, PyObject *kwds) +{ + char *kwlist[] = {"frame", "previous", NULL}; + PyFrameObject *frame = NULL; + PyThreadState *tstate; + PyTracebackObject *intb = NULL; + PyTracebackObject *oldtb = NULL; + PyTracebackObject *tb; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:traceback", + kwlist, &frame, &intb)) + return NULL; + + tstate = PyThreadState_GET(); + oldtb = (PyTracebackObject *)tstate->curexc_traceback; + + /* this has side effects we have to undo afterwards. */ + if (PyTraceBack_Here(frame) < 0) + return NULL; + + tb = (PyTracebackObject *)tstate->curexc_traceback; + + /* PyTraceBack_Here makes the new traceback be the "current" + * traceback, which isn't really desired */ + tstate->curexc_traceback = (PyObject *)oldtb; + + /* PyTraceBack_Here adds the "current" traceback as this traceback's + * "next" traceback, which we really don't want. */ + Py_XINCREF(intb); + tb->tb_next = intb; + + return (PyObject *)tb; +} + /* vim:set shiftwidth=4 softtabstop=4: */ diff --git a/isys/isys.py b/isys/isys.py index 05e0806..db2aa4e 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -946,6 +946,24 @@ def getMacAddress(dev): device_macaddr = device_props_iface.Get(NM_MANAGER_IFACE, "HwAddress") return device_macaddr.upper() +def traceback(skipframes=0): + frames = [] + n = skipframes + 1 + while True: + try: + frames.append(sys._getframe(n)) + n += 1 + except ValueError: + break + + tb = None + for frame in frames: + if tb is None: + tb = _isys.traceback(frame) + else: + tb = _isys.traceback(frame, tb) + return tb + # Determine if a network device is a wireless device. def isWireless(dev): if dev == '' or dev is None: -- 1.6.0.1

2 1

[PATCH] have anaconda write anacdump.txt on demand
by Chris Lumens 04 Dec '08

04 Dec '08

I'm working on automatic data collection for bug reports. Part of this involves writing a little command line tool so we can tell users "Hey switch to tty2 and run this command to get everything we need", instead of having to walk them through it. I thought it'd be nice if we could generate an anacdump.txt on demand, to help debug where anaconda's stuck but hasn't crashed. The attached patch causes anaconda to write /tmp/anacdump.txt when SIGUSR2 is received. It requires the stuff Peter just mailed. I'm thinking it is probably better to do this via dbus, but that involves making anaconda a dbus-aware thing (whatever that involves) and seems like a battle for another day. - Chris diff --git a/anaconda b/anaconda index 2731c43..34628a0 100755 --- a/anaconda +++ b/anaconda @@ -502,6 +502,12 @@ class Anaconda: # *sigh* we still need to be able to write this out self.xdriver = None + def dumpState(self): + from exception import AnacondaExceptionDump + # Skip the frames for isys.traceback, dumpState, and the signal handler. + exn = AnacondaExceptionDump(None, None, isys.traceback(2)) + exn.write(anaconda) + def writeXdriver(self, instPath="/"): # this should go away at some point, but until it does, we # need to keep it around. it could go into instdata but this @@ -588,7 +594,7 @@ if __name__ == "__main__": # this handles setting up updates for pypackages to minimize the set needed setupPythonUpdates() - import signal, traceback, string, isys, iutil, time + import signal, string, isys, iutil, time from exception import handleException import dispatch import warnings @@ -611,6 +617,9 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGSEGV, isys.handleSegv) + # add our own additional signal handlers + signal.signal(signal.SIGUSR2, lambda signum, frame: anaconda.dumpState()) + setupEnvironment() # we need to do this really early so we make sure its done before rpm diff --git a/exception.py b/exception.py index b146315..4cc5983 100644 --- a/exception.py +++ b/exception.py @@ -63,7 +63,10 @@ class AnacondaExceptionDump: lst.reverse() lst.insert(0, "anaconda %s exception report\n" % os.getenv("ANACONDAVERSION")) lst.insert(1, 'Traceback (most recent call first):\n') - lst.extend(traceback.format_exception_only(self.type, self.value)) + + if self.type is not None and self.value is not None: + lst.extend(traceback.format_exception_only(self.type, self.value)) + return joinfields(lst, "") # Create a string representation of a class and write it to fd. This

4 4

← 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 December 2008