Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[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 | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/isys/isys.c b/isys/isys.c index b3466ab..3c28ffd 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_KWARGS, NULL }, { NULL, NULL, 0, NULL } } ; @@ -932,4 +934,38 @@ 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", NULL}; + PyFrameObject *frame = NULL; + PyThreadState *tstate; + PyTracebackObject *oldtb; + PyTracebackObject *tb; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:traceback", + kwlist, &frame)) + 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. */ + tb->tb_next = NULL; + return (PyObject *)tb; +} + /* vim:set shiftwidth=4 softtabstop=4: */ -- 1.6.0.1

2 1

[PATCH] Use scsi_wait_scan on scsi devices instead of stabilized (#470628)
by pjones 04 Dec '08

04 Dec '08

Get rid of wait_for_scsi entirely, and make anything with a scsi modalias cause us to use the scsi_wait_scan kernel module. --- mkinitrd | 29 +++-------------------------- 1 files changed, 3 insertions(+), 26 deletions(-) diff --git a/mkinitrd b/mkinitrd index 39ed66f..0492998 100755 --- a/mkinitrd +++ b/mkinitrd @@ -66,7 +66,7 @@ ncryptoparts=0 ncryptolvs=0 ncryptoraids=0 root="" -wait_for_scsi="no" +scsi_wait_scan="no" NET_LIST="" LD_SO_CONF=/etc/ld.so.conf @@ -138,7 +138,6 @@ resolve_device_name() { echo nash-resolveDevice "$1" | /sbin/nash --forcequiet } -scsi_wait_scan="no" findmodule() { modlist=MODULES subcmd="findmodule" @@ -358,8 +357,8 @@ findstoragedriverinsys () { deps= if [ -f modalias ]; then MODALIAS=$(cat modalias) - if [ "${modalias::7}" == "scsi:t-" ]; then - wait_for_scsi=yes + if [ "${MODALIAS::7}" == "scsi:t-" ]; then + scsi_wait_scan=yes fi moduledep $MODALIAS unset MODALIAS @@ -1507,31 +1506,9 @@ emitmodules() { EOF done fi - # some of these aren't modules any more, but that - # generally makes them so much more likely to win - # the race that we haven't seen cases where it matters - # yet. Nevertheless: - # XXX PJFIX: we need a better mechanism here. - if [ 1 -eq 0 \ - -o "ahci" == "$module" \ - -o "ata_piix" == "$module" \ - -o "ibmvscsic" == "$module" \ - -o "BusLogic" == "$module" \ - -o "mptbase" == "$module" \ - -o "pata_" == "${module::5}" \ - -o "qla" == "${module::3}" \ - -o "sata_" == "${module::5}" \ - ]; then - wait_for_scsi="yes" - fi done - if [ "$wait_for_scsi" == "yes" ]; then - emit "echo Waiting for driver initialization." - emit "stabilized --hash --interval 250 /proc/scsi/scsi" - fi unset usb_mounted unset found_hcd_module - unset wait_for_scsi } if [ $ncryptodevs -ne 0 ]; then -- 1.6.0.1

2 1

[PATCH] Use scsi_wait_scan on scsi devices instead of stabilized (#470628)
by pjones 03 Dec '08

03 Dec '08

Get rid of wait_for_scsi entirely, and make anything with a scsi modalias cause us to use the scsi_wait_scan kernel module. --- mkinitrd | 27 ++------------------------- 1 files changed, 2 insertions(+), 25 deletions(-) diff --git a/mkinitrd b/mkinitrd index 39ed66f..8c599ce 100755 --- a/mkinitrd +++ b/mkinitrd @@ -66,7 +66,7 @@ ncryptoparts=0 ncryptolvs=0 ncryptoraids=0 root="" -wait_for_scsi="no" +scsi_wait_scan="no" NET_LIST="" LD_SO_CONF=/etc/ld.so.conf @@ -138,7 +138,6 @@ resolve_device_name() { echo nash-resolveDevice "$1" | /sbin/nash --forcequiet } -scsi_wait_scan="no" findmodule() { modlist=MODULES subcmd="findmodule" @@ -359,7 +358,7 @@ findstoragedriverinsys () { if [ -f modalias ]; then MODALIAS=$(cat modalias) if [ "${modalias::7}" == "scsi:t-" ]; then - wait_for_scsi=yes + scsi_wait_scan=yes fi moduledep $MODALIAS unset MODALIAS @@ -1507,31 +1506,9 @@ emitmodules() { EOF done fi - # some of these aren't modules any more, but that - # generally makes them so much more likely to win - # the race that we haven't seen cases where it matters - # yet. Nevertheless: - # XXX PJFIX: we need a better mechanism here. - if [ 1 -eq 0 \ - -o "ahci" == "$module" \ - -o "ata_piix" == "$module" \ - -o "ibmvscsic" == "$module" \ - -o "BusLogic" == "$module" \ - -o "mptbase" == "$module" \ - -o "pata_" == "${module::5}" \ - -o "qla" == "${module::3}" \ - -o "sata_" == "${module::5}" \ - ]; then - wait_for_scsi="yes" - fi done - if [ "$wait_for_scsi" == "yes" ]; then - emit "echo Waiting for driver initialization." - emit "stabilized --hash --interval 250 /proc/scsi/scsi" - fi unset usb_mounted unset found_hcd_module - unset wait_for_scsi } if [ $ncryptodevs -ne 0 ]; then -- 1.6.0.1

2 1

[PATCH] include libwrap from new location.
by Joel Granados Moreno 03 Dec '08

03 Dec '08

Hi list. We previously included libwrap in the initrd image. We did this by looking for it in /usr/lib{,64}. but its new location is /lib{,64}. I have already tested manually puting the libwrap stuff into the initrd image and it seems to work. I see no other place where this might be going wrong. the related bug is 473955. Review greatly appreciated. Regards.

2 2

[PATCH] Use libnl and dhclient in nash for network configuration.
by David Cantrell 03 Dec '08

03 Dec '08

This patch modifies nash to use dhclient when the 'network' command requests dhcp. Instead of firing off dhclient-script, nash reads the leases file directly and extracts the information. The nashSetupInterface() function is then called (which is also the case for manual network configuration) to configure the interface. nashSetupInterface() uses libnl to add the address and set the default gateway. Added nashSetMTU() to set the interface MTU using libnl. Modified writeResolvConf() to not use pumpNetIntf. --- nash/Makefile | 4 +- nash/network.c | 429 +++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 335 insertions(+), 98 deletions(-) diff --git a/nash/Makefile b/nash/Makefile index 1d03c3f..f1cceb7 100644 --- a/nash/Makefile +++ b/nash/Makefile @@ -32,14 +32,14 @@ libnash_OBJECTS = lib.o hotplug.o wrap.o list.o dict.o block.o uevent.o dm.o \ include ../Makefile.inc CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include -CFLAGS += $(shell pkg-config --cflags libdhcp) +CFLAGS += $(shell pkg-config --cflags libnl-1) LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash nash_LIBPATHS = -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid -L/$(LIB) nash_LIBS += -ldevmapper -lparted -lblkid -lselinux -lsepol nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf -nash_LIBS += $(shell pkg-config --libs libdhcp) -lm +nash_LIBS += $(shell pkg-config --libs libnl-1) -lm # We need to link against libgcc_s directly, or it'll /dlopen() it during # backtrace()! This is not teh way!!!1!!!one!!!. nash_LIBS += -lgcc_s diff --git a/nash/network.c b/nash/network.c index 5d017c3..09a1cbf 100644 --- a/nash/network.c +++ b/nash/network.c @@ -2,10 +2,8 @@ * nash-network.c * * Simple network bring-up code for nash. - * It currently uses libpump and looks a lot like the network code in - * anaconda * - * Copyright 2006-2008 Red Hat, Inc. All rights reserved. + * Copyright 2006, 2007, 2008 Red Hat, Inc. * * 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 @@ -21,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * Author(s): Jeremy Katz <katzj(a)redhat.com> + * David Cantrell <dcantrell(a)redhat.com> */ #include <errno.h> @@ -29,13 +28,28 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <sys/socket.h> +#include <arpa/inet.h> #include <popt.h> -#include <pump.h> + +#include <netlink/netlink.h> +#include <netlink/socket.h> +#include <netlink/route/rtnl.h> +#include <netlink/route/route.h> +#include <netlink/route/addr.h> +#include <netlink/route/link.h> #include <nash.h> #include "util.h" +#define DHCLIENT "/sbin/dhclient" +#define RESOLVCONF "/etc/resolv.conf" +#define DHCLIENTLEASES "/var/lib/dhclient/dhclient.leases" +#define BUFSIZ 4096 + /* returns 1 for link, 0 for no link, -1 for unknown */ int get_link_status(char *ifname); @@ -60,29 +74,55 @@ static int waitForLink(char * dev) { return 1; } -static void writeResolvConf(struct pumpNetIntf intf) { - char * filename = "/etc/resolv.conf"; +static void writeResolvConf(char *dns, char *nameserver, char *domain) { FILE * f; - char buf[INET6_ADDRSTRLEN+1]; - ip_addr_t *addr; - int i; + char * tmpdns = NULL, * c = NULL; + struct in_addr addr; + struct in6_addr addr6; - if (!(intf.set & PUMP_NETINFO_HAS_DOMAIN) && !intf.numDns) + if (dns == NULL && nameserver == NULL && domain == NULL) return; - f = fopen(filename, "w"); + f = fopen(RESOLVCONF, "w"); if (!f) { - eprintf("Cannot create %s: %s\n", filename, strerror(errno)); + eprintf("Cannot create %s: %s\n", RESOLVCONF, strerror(errno)); return; } - if (intf.set & PUMP_NETINFO_HAS_DOMAIN) - fprintf(f, "search %s\n", intf.domain); + if (domain != NULL) + fprintf(f, "search %s\n", domain); + + if (nameserver != NULL) { + if (inet_pton(AF_INET, nameserver, &addr) > 0 || + inet_pton(AF_INET6, nameserver, &addr6) > 0) { + fprintf(f, "nameserver %s\n", nameserver); + } + } - for (i = 0; i < intf.numDns; i++) { - addr = &(intf.dnsServers[i]); - inet_ntop(addr->sa_family, IP_ADDR(addr), buf, INET6_ADDRSTRLEN); - fprintf(f, "nameserver %s\n", buf); + /* dns is a command delimited list of name IP addresses + * can be IPv4 or IPv6 addresses, just make sure they + * satisfy input to inet_pton() + */ + if (dns && *dns) { + if ((tmpdns = strdup(dns)) == NULL) { + eprintf("Failure reading dns servers: %s\n", strerror(errno)); + fclose(f); + return; + } + + c = strtok(tmpdns, ","); + while (c != NULL) { + memset(&addr, 0, sizeof(addr)); + memset(&addr6, 0, sizeof(addr6)); + + if (inet_pton(AF_INET, c, &addr) > 0 || + inet_pton(AF_INET6, c, &addr) > 0) + fprintf(f, "nameserver %s\n", c); + else + eprintf("Invalid nameserver address %s: %s\n", c, strerror(errno)); + + c = strtok(NULL, ","); + } } fclose(f); @@ -92,45 +132,201 @@ static void writeResolvConf(struct pumpNetIntf intf) { return; } -static void nashNetLogger(void * arg, int priority, char * fmt, va_list va) { - nash_log_level loglevel = NASH_NOTICE; +static int nashSetMTU(char * dev, int mtu) { + struct nl_handle *handle = NULL; + struct nl_cache *cache = NULL; + struct rtnl_link *link = NULL; + struct rtnl_link *request = NULL; - if (priority <= LOG_ERR) - loglevel = NASH_ERROR; - else if (priority <= LOG_WARNING) - loglevel = NASH_WARNING; + if (dev == NULL || mtu <= 0) + return 1; - nashLoggerV(_nash_context, loglevel, fmt, va); - nashLogger(_nash_context, loglevel, "\n"); -} + if ((handle = nl_handle_alloc()) == NULL) + return 1; -static inline int nashPton(char * addr_str, ip_addr_t *ret) { - struct in_addr addr; - struct in6_addr addr6; + if (nl_connect(handle, NETLINK_ROUTE)) { + nl_handle_destroy(handle); + return 1; + } - if (!addr_str) - return 0; + if ((cache = rtnl_link_alloc_cache(handle)) == NULL) { + nl_close(handle); + nl_handle_destroy(handle); + return 1; + } - if (inet_pton(AF_INET, addr_str, &addr)) { - *ret = ip_addr_in(&addr); - return 1; - } else if (inet_pton(AF_INET6, addr_str, &addr6)) { - *ret = ip_addr_in6(&addr6); - return 1; + if ((link = rtnl_link_get_by_name(cache, dev)) == NULL) { + nl_close(handle); + nl_handle_destroy(handle); + return 1; + } + + request = rtnl_link_alloc(); + rtnl_link_set_mtu(request, mtu); + + if (rtnl_link_change(handle, link, request, 0)) { + rtnl_link_put(link); + nl_close(handle); + nl_handle_destroy(handle); + return 1; } return 0; } +static char *dhclientLeaseLineParse(char *linebuf, char *key) { + char *b = NULL, *e = NULL; + + if ((b = index(strstr(linebuf, key), ' ')) == NULL) + return NULL; + b++; + + while (*b == '"') + b++; + + if ((e = rindex(b, ';')) == NULL) + return NULL; + *e = '\0'; + e--; + + while (*e == '"') { + *e = '\0'; + e--; + } + + return b; +} + +static void nashSetHostname(char *hostname, char *domain) { + int hfailed = 0; + char *tmp = NULL; + + if (hostname == NULL) + return; + + if (domain != NULL) { + if (asprintf(&tmp, "%s.%s", hostname, domain) != -1) { + if (sethostname(tmp, strlen(tmp)) == -1) { + hfailed = 1; + } + + free(tmp); + } + } else { + if (sethostname(hostname, strlen(hostname)) == -1) { + return; + } + } + + if (hfailed == 1) { + if (sethostname(hostname, strlen(hostname)) == -1) { + return; + } + } + + return; +} + +static char *nashSetupInterface(char *dev, char *ip, char *netmask, char *broadcast, char *gateway) { + int ifindex = 0; + int prefix = -1; + struct nl_handle *handle = NULL; + struct nl_cache *cache = NULL; + struct rtnl_addr *addr = NULL; + struct rtnl_route *route = NULL; + struct nl_addr *nl_ip = NULL; + struct nl_addr *nl_bc = NULL; + struct nl_addr *nl_gw = NULL; + struct in_addr mask; + + if (dev == NULL || ip == NULL) + return "dev and ip are empty"; + + if ((handle = nl_handle_alloc()) == NULL) + return "failed to get a Netlink handle"; + + if (nl_connect(handle, NETLINK_ROUTE)) { + nl_handle_destroy(handle); + return "failed to connect to NETLINK_ROUTE"; + } + + if ((cache = rtnl_link_alloc_cache(handle)) == NULL) { + nl_close(handle); + nl_handle_destroy(handle); + return "failed to get a link cache"; + } + + /* configure the IP address, netmask, broadcast */ + addr = rtnl_addr_alloc(); + ifindex = rtnl_link_name2i(cache, dev); + rtnl_addr_set_ifindex(addr, ifindex); + + nl_ip = nl_addr_parse(ip, AF_UNSPEC); + rtnl_addr_set_local(addr, nl_ip); + + if (broadcast != NULL) { + nl_bc = nl_addr_parse(broadcast, AF_UNSPEC); + rtnl_addr_set_broadcast(addr, nl_bc); + } + + if (netmask != NULL) { + if (inet_pton(AF_INET, netmask, &addr) > 0) { + while (mask.s_addr != 0) { + mask.s_addr = mask.s_addr >> 1; + prefix++; + } + } + + if (prefix != -1) { + rtnl_addr_set_prefixlen(addr, prefix); + } + } + + rtnl_addr_add(handle, addr, 0); + rtnl_addr_put(addr); + + if (nl_ip != NULL) { + nl_addr_destroy(nl_ip); + } + + if (nl_bc != NULL) { + nl_addr_destroy(nl_bc); + } + + /* configure the gateway */ + if (gateway != NULL) { + route = rtnl_route_alloc(); + nl_gw = nl_addr_parse(gateway, AF_UNSPEC); + rtnl_route_set_gateway(route, nl_gw); + + rtnl_route_add(handle, route, 0); + rtnl_route_put(route); + + if (nl_gw != NULL) { + nl_addr_destroy(nl_gw); + } + } + + /* success */ + nl_close(handle); + nl_handle_destroy(handle); + return NULL; +} + int nashNetworkCommand(char * cmd) { int argc; char ** argv; char * bootProto = NULL, * dev = NULL, * dhcpclass = NULL, * ethtool = NULL, * hostname = NULL; char * gateway = NULL, * ip = NULL, * nameserver = NULL, * netmask = NULL, * dns = NULL, * domain = NULL; - int mtu = 0, rc; + char * broadcast = NULL; + int mtu = 0, rc, status; char * err = NULL; - struct pumpNetIntf intf; - struct in_addr addr; + char * val = NULL; + pid_t pid; + FILE *f = NULL; + int in_lease = 0; + int in_interface = 0; + char linebuf[BUFSIZ]; poptContext optCon; struct poptOption netOptions[] = { { "bootproto", '\0', POPT_ARG_STRING, &bootProto, 0, NULL, NULL }, @@ -147,14 +343,14 @@ int nashNetworkCommand(char * cmd) { { "hostname", '\0', POPT_ARG_STRING, &hostname, 0, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL } }; - + if (poptParseArgvString(cmd, &argc, (const char ***) &argv) || !argc) { eprintf("ERROR: Invalid options to network command\n"); return 1; } - - optCon = poptGetContext(NULL, argc, (const char **) argv, - netOptions, 0); + + optCon = poptGetContext(NULL, argc, (const char **) argv, + netOptions, 0); while ((rc = poptGetNextOpt(optCon)) > 0) {} if (rc < -1) { @@ -167,73 +363,114 @@ int nashNetworkCommand(char * cmd) { nashLogger(_nash_context, NASH_WARNING, "WARNING: ethtool options not currently handled\n"); } - memset(&intf,'\0', sizeof(intf)); + if (dev == NULL) + dev = strdup("eth0"); if (mtu) { - intf.mtu = mtu; - intf.set |= PUMP_INTFINFO_HAS_MTU; - } - - if (hostname != NULL) { - intf.hostname = hostname; - intf.set |= PUMP_NETINFO_HAS_HOSTNAME; - } - - if (domain != NULL) { - intf.domain = domain; - intf.set |= PUMP_NETINFO_HAS_DOMAIN; - } - - if (dns) { - char *c, *buf = strdup(dns); - - c = strtok(buf, ","); - while ((intf.numDns < MAXNS) && (c != NULL)) { - if (nashPton(c, &intf.dnsServers[intf.numDns])) - intf.numDns++; - c = strtok(NULL, ","); + if (nashSetMTU(dev, mtu)) { + nashLogger(_nash_context, NASH_WARNING, "WARNING: unable to set MTU on %s to %d\n", dev, mtu); } - if (intf.numDns) - intf.set |= PUMP_NETINFO_HAS_DNS; } - if (dev == NULL) - dev = strdup("eth0"); + if (hostname) + nashSetHostname(hostname, domain); - strncpy(intf.device, dev, 9); + if (dns || nameserver) + writeResolvConf(dns, nameserver, domain); if ((bootProto != NULL) && (!strncmp(bootProto, "dhcp", 4))) { - waitForLink(dev); nashLogger(_nash_context, NASH_NOTICE, "Sending request for IP information through %s\n", dev); - pumpDhcpClassRun(&intf, NULL, - dhcpclass ? dhcpclass : "nash", - DHCPv6_DISABLE, DHCP_USE_LEASE_DATABASE, - 45, nashNetLogger, LOG_INFO); - } else { /* static IP. hope enough is specified! */ - if (nashPton(ip, &intf.ip)) - intf.set |= PUMP_INTFINFO_HAS_IP; - if (nashPton(netmask, &intf.netmask)) - intf.set |= PUMP_INTFINFO_HAS_NETMASK; - if (nashPton(gateway, &intf.gateway)) - intf.set |= PUMP_NETINFO_HAS_GATEWAY; - - /* FIXME: what about IPv6 ? */ - if (intf.set & PUMP_INTFINFO_HAS_NETMASK && - intf.netmask.sa_family == AF_INET) { - addr.s_addr = IP_ADDR_IN(&intf.ip)->s_addr & IP_ADDR_IN(&intf.netmask)->s_addr; - intf.network = ip_addr_in(&addr); - addr.s_addr = IP_ADDR_IN(&intf.network)->s_addr | ~IP_ADDR_IN(&intf.netmask)->s_addr; - intf.broadcast = ip_addr_in(&addr); - intf.set |= PUMP_INTFINFO_HAS_NETWORK | PUMP_INTFINFO_HAS_BROADCAST; + + waitForLink(dev); + pid = fork(); + + /* start dhclient */ + if (pid == 0) { + /* dhclient returns code 2 for failure, do the same */ + if (setpgrp() == -1) + exit(2); + + if (execl(DHCLIENT, DHCLIENT, "-4", "-1", "-n", NULL) == -1) + exit(2); + } else if (pid == -1) { + eprintf("Failed to start dhclient.\n"); + return 1; + } else { + if (waitpid(pid, &status, 0) == -1) { + return 1; + } + } + + /* collect lease information */ + if ((f = fopen(DHCLIENTLEASES, "r")) == NULL) + return 1; + + while (fgets(linebuf, BUFSIZ, f) != NULL) { + linebuf[strlen(linebuf) - 1] = '\0'; + + if (in_lease == 0) { + if (strstr(linebuf, "lease {") != NULL) { + in_lease = 1; + } + } else if (in_lease == 1) { + if (strstr(linebuf, "interface") != NULL) { + val = dhclientLeaseLineParse(linebuf, "interface"); + + if (!strcmp(dev, val)) { + in_lease = 2; + in_interface = 1; + } + } + } else if (in_interface == 1) { + if (strstr(linebuf, "fixed-address") != NULL) { + val = dhclientLeaseLineParse(linebuf, "fixed-address"); + ip = strdup(val); + } else if (strstr(linebuf, "subnet-mask") != NULL) { + val = dhclientLeaseLineParse(linebuf, "subnet-mask"); + netmask = strdup(val); + } else if (strstr(linebuf, "domain-name-servers") != NULL) { + val = dhclientLeaseLineParse(linebuf, "domain-name-servers"); + dns = strdup(val); + val = dns; + + while (*val != '\0') { + if (*val == ' ') + *val = ','; + val++; + } + } else if (strstr(linebuf, "broadcast-address") != NULL) { + val = dhclientLeaseLineParse(linebuf, "broadcast-address"); + broadcast = strdup(val); + } else if (strstr(linebuf, "routers") != NULL) { + val = dhclientLeaseLineParse(linebuf, "routers"); + gateway = strdup(val); + } else if (strstr(linebuf, "host-name") != NULL) { + val = dhclientLeaseLineParse(linebuf, "host-name"); + hostname = strdup(val); + } else if (strstr(linebuf, "domain-name") != NULL) { + val = dhclientLeaseLineParse(linebuf, "domain-name"); + domain = strdup(val); + } + + if (strstr(linebuf, "}") != NULL) { + in_lease = 0; + in_interface = 0; + } + } } + + fclose(f); + + if (hostname) + nashSetHostname(hostname, domain); } - err = pumpSetupInterface(&intf); + err = nashSetupInterface(dev, ip, netmask, broadcast, gateway); if (err) { nashLogger(_nash_context, NASH_ERROR, "ERROR: Interface setup failed: %s\n", err); return 1; } - writeResolvConf(intf); + writeResolvConf(dns, nameserver, domain); sleep(2); return 0; -- 1.6.0.3

3 7

[PATCH] Better naming for LVM volume groups and logical volumes (#461682)
by David Cantrell 03 Dec '08

03 Dec '08

Try to name volume groups as vg_HOSTNAME and logical volumes as lv_MOUNTPOINT, if we can. Swap partitions will be lv_swapNN where NN is a unique number in the instance where more than one swap partition in use. The / partition will get the name lv_root. Fall back on the old naming system (VolGroupNN for volume groups and LogVolNN for logical volumes) for people doing custom setup or where the hostname is localhost. For swap partition naming, tack on an NN designation when there are more than 1 swap partitions requested. If only one is requested, it will be "lv_swap". --- autopart.py | 41 +++++++++++++++++++++++++++++++++-------- fsset.py | 5 ++++- lvm.py | 57 +++++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 74 insertions(+), 29 deletions(-) diff --git a/autopart.py b/autopart.py index ff62f37..716fb12 100644 --- a/autopart.py +++ b/autopart.py @@ -1463,7 +1463,7 @@ def doAutoPartition(anaconda): # FIXME: this is a hack so that autopartition'd vgs # can have a unique name if req.autoname == 1 and req.volumeGroupName == "lvm": - n = lvm.createSuggestedVGName(partitions) + n = lvm.createSuggestedVGName(partitions, anaconda.id.network) req.volumeGroupName = n if (isinstance(req, partRequests.LogicalVolumeRequestSpec)): @@ -1649,11 +1649,15 @@ def autoCreateLVMPartitionRequests(autoreq): requests.append(nr) volnum = 0 + swapvol = 0 + totalswaps = 0 + for (mntpt, fstype, minsize, maxsize, grow, format, asvol) in autoreq: - if fstype: - ptype = fsset.fileSystemTypeGet(fstype) - else: - ptype = fsset.fileSystemTypeGetDefault() + if fsset.fileSystemTypeGet(fstype) == fsset.fileSystemTypeGet("swap"): + totalswaps += 1 + + for (mntpt, fstype, minsize, maxsize, grow, format, asvol) in autoreq: + ptype = fsset.fileSystemTypeGet(fstype) if not asvol: newrequest = partRequests.PartitionSpec(ptype, @@ -1663,17 +1667,38 @@ def autoCreateLVMPartitionRequests(autoreq): grow = grow, format = format) else: + # try to incorporate the mount point in to the logical volume name + if mntpt is not None and mntpt != '': + if mntpt == '/': + lvtemplate = 'lv_root' + else: + tmp = string.strip(mntpt) + tmp = tmp.replace('/', '_') + + while tmp.startswith('_'): + tmp = tmp[1:] + + lvtemplate = "lv_%s" % (tmp,) + else: + if ptype == fsset.fileSystemTypeGet("swap"): + if totalswaps > 1: + lvtemplate = "lv_swap%02d" % (swapvol,) + swapvol += 1 + else: + lvtemplate = "lv_swap" + else: + lvtemplate = "LogVol%02d" % (volnum,) + volnum += 1 + newrequest = partRequests.LogicalVolumeRequestSpec(ptype, mountpoint = mntpt, size = minsize, maxSizeMB = maxsize, grow = grow, format = format, - lvname = "LogVol%02d" %(volnum,), + lvname = "%s" % (lvtemplate,), volgroup = "lvm") - volnum += 1 - requests.append(newrequest) return requests diff --git a/fsset.py b/fsset.py index b726985..a4b3cd4 100644 --- a/fsset.py +++ b/fsset.py @@ -78,7 +78,10 @@ def fileSystemTypeGetDefault(): def fileSystemTypeGet(key): - return fileSystemTypes[key] + if fileSystemTypes.has_key(key): + return fileSystemTypes[key] + else: + return fileSystemTypeGetDefault() def fileSystemTypeRegister(klass): fileSystemTypes[klass.getName()] = klass diff --git a/lvm.py b/lvm.py index 00f7c02..0e07a1f 100644 --- a/lvm.py +++ b/lvm.py @@ -528,45 +528,62 @@ def getMaxLVSize(pe): else: return (16*1024*1024) #Max is 16TiB -def createSuggestedVGName(partitions): +def createSuggestedVGName(partitions, network): """Given list of partition requests, come up with a reasonable VG name partitions - list of requests """ - i = 0 - while 1: - tmpname = "VolGroup%02d" % (i,) - if not partitions.isVolumeGroupNameInUse(tmpname): - break - i = i + 1 - if i>99: - tmpname = "" + # try to create a volume group name incorporating the hostname + hn = network.hostname + if hn is not None and hn != '': + if hn == 'localhost' or hn == 'localhost.localdomain': + vgtemplate = "VolGroup" + elif hn.find('.') != -1: + vgtemplate = "vg_%s" % (hn.split('.')[0].lower(),) + else: + vgtemplate = "vg_%s" % (hn.lower(),) + else: + vgtemplate = "VolGroup" + + if not partitions.isVolumeGroupNameInUse(vgtemplate): + return vgtemplate + else: + i = 0 + while 1: + tmpname = "%s%02d" % (vgtemplate, i,) + if not partitions.isVolumeGroupNameInUse(tmpname): + break + + i += 1 + if i > 99: + tmpname = "" + + return tmpname - return tmpname - def createSuggestedLVName(logreqs): """Given list of LV requests, come up with a reasonable LV name partitions - list of LV requests for this VG """ + i = 0 lnames = [] for lv in logreqs: - lnames.append(lv.logicalVolumeName) - + lnames.append(lv.logicalVolumeName) + while 1: - tmpname = "LogVol%02d" % (i,) - if (logreqs is None) or (tmpname not in lnames): - break + tmpname = "LogVol%02d" % (i,) + if (logreqs is None) or (tmpname not in lnames): + break - i = i + 1 - if i>99: - tmpname = "" + i += 1 + if i > 99: + tmpname = "" return tmpname - + def getVGUsedSpace(vgreq, requests, diskset): vgused = 0 for request in requests.requests: -- 1.6.0.3

1 0

[PATCH] If dhcp is in use, copy dhclient in to the initrd.
by David Cantrell 03 Dec '08

03 Dec '08

--- mkinitrd | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mkinitrd b/mkinitrd index 1316189..2bb1e0f 100755 --- a/mkinitrd +++ b/mkinitrd @@ -1371,6 +1371,7 @@ if [ -n "$raiddevices" ]; then fi if [ "$root" == "dhcp" ]; then + inst "/sbin/dhclient" "$MNTIMAGE" /sbin/dhclient inst "/usr/sbin/nbd-client" "$MNTIMAGE" /sbin/nbd-client fi -- 1.6.0.3

2 2

(no subject)
by David Cantrell 03 Dec '08

03 Dec '08

Updated patch for improved automatic LVM volume group and logical volume naming. Incorporated changes suggested by Hans and Jeremy.

2 3

[PATCH] RHEL4.8 #233050 - ports of lvm PV size clamping from RHEL5
by Radek Vykydal 03 Dec '08

03 Dec '08

Hi, lvm partitioning (clamping of PV size) again, this time for 4.8. This is fix for 4.8 #233050. It required some commits to be ported from 5.3: commit cc9d0f4e57b11a37fc5d33d0374509e43a97840c commit 8b4c702d0c2c6130c5263a4944405efa1301ced9 commit 4f9c6e49d113a88a28c55c51bb5eab6ad756612b commit a68ab7d2823836ee90171cf419864e248ad99ce7 commit 4aa9ca1c35b867fa5a4d94c41591700ca7ab5edb (5.3 #415871) commit 08233b0c42f8b453ff7d8bde03c9adc57d92d7ed (5.3 #463780) I tested the patch with reproducer from bz and reproducers from #415871 and #463780 which are the last two commits of the list above. Note: I didn't port patches fixing other corner cases hit and fixed in 5.3: - wiping old lvm metadata https://bugzilla.redhat.com/show_bug.cgi?id=468431 https://bugzilla.redhat.com/show_bug.cgi?id=469700 - handling corner case when clamped size == partition size https://bugzilla.redhat.com/show_bug.cgi?id=468944 - computing size of preexisting VG in UI https://bugzilla.redhat.com/show_bug.cgi?id=217913 - lvm on raid chunk alignment https://bugzilla.redhat.com/show_bug.cgi?id=463431 Radek

1 0

[PATCH] fix traceback in partitioning ui
by David Lehman 03 Dec '08

03 Dec '08

Partition requests can be None when populating the tree. (#474284) Port of commit 3568291 from rhel5-branch. Patch attached.

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