Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[PATCH] pyblock.
by Joel Granados 19 Dec '08

19 Dec '08

Hey list. Here is a patch to address https://bugzilla.redhat.com/show_bug.cgi?id=475386 What does it do? Every time the subset of a raid set has a subsubset (second subset), as when we are in raid01 and raid10. we activate the subsubsets and leave the active throughout the whole installation. This of course is not general at all, but since we are using pyblock for dmraid.py purposes only, I don't see how this could harm other install cases. we, in rhel5 handle mdraid, lvm, dm-crypt ... throught the cmd line commands so I don't see this interfering in other stuff. Its rather ugly but it works for my test cases, Now if I could get grub to work after the installation, it would be great (but thats another story) This patch is most likely for rhel54, but wanted to post it here to see what you guys thought and for me not to forget it when I come back from vacations :) Review appreciated Regards. -- Joel Andres Granados Red Hat / Brno Czech Republic

2 1

Anaconda merge review
by Jason L Tibbitts III 19 Dec '08

19 Dec '08

I've been staring at the anaconda merge review ticket, https://bugzilla.redhat.com/show_bug.cgi?id=225246, for two years now and thought I'd look at it. Turns out the specfile isn't all that complicated and really only needs a few fixes, but I'm not sure if anyone will actually see updates to the ticket. Currently only Jeremy is CC'd; is that correct, should I add someone else, or should I just CC this list? Or, for that matter, I can just send my comments here or chat on IRC. I don't really care as long as someone is listening on the other end. - J<

4 7

[PATCH] Catch exceptions from gettext.GNUTranslations
by David Cantrell 18 Dec '08

18 Dec '08

Report with po/*.mo file caused the exception and keep going. The current failure is in po/tg.mo. --- scripts/getlangnames.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py index b81d26d..05b9805 100644 --- a/scripts/getlangnames.py +++ b/scripts/getlangnames.py @@ -32,7 +32,13 @@ for k in langs.localeInfo.keys(): f = open("po/%s.mo" %(l,)) except (OSError, IOError): continue - cat = gettext.GNUTranslations(f) + + try: + cat = gettext.GNUTranslations(f) + except: + sys.stderr.write("*** ERROR reading po/%s.mo\n" % (l,)) + continue + cat.set_output_charset("utf-8") names[langs.localeInfo[k][0]] = cat.lgettext(langs.localeInfo[k][0]) found = True -- 1.6.0.3

2 2

[PATCH] Allow 'ks' to function as it once did (#471812)
by David Cantrell 18 Dec '08

18 Dec '08

This is a much more readable and reasonable patch to restore the 'ks' boot option functionality. The nextserver and bootfile are read from the DHCP option set and used to build the URL to find the kickstart file. [rawhide] --- loader/nfsinstall.c | 105 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 80 insertions(+), 25 deletions(-) diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index 9a61cad..a098fe3 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -35,6 +35,10 @@ #include <sys/socket.h> #include <arpa/inet.h> #include <netdb.h> +#include <glib.h> +#include <nm-client.h> +#include <nm-device.h> +#include <nm-dhcp4-config.h> #include "copy.h" #include "loader.h" @@ -369,8 +373,11 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc, int getFileFromNfs(char * url, char * dest, struct loaderData_s * loaderData) { char * host = NULL, *path = NULL, * file = NULL, * opts = NULL; char * chk = NULL, *ip = NULL; - int failed = 0; + int failed = 0, i = 0; iface_t iface; + NMClient *client = NULL; + NMState state; + const GPtrArray *devices; if (kickstartNetworkUp(loaderData, &iface)) { logMessage(ERROR, "unable to bring up network"); @@ -380,43 +387,91 @@ int getFileFromNfs(char * url, char * dest, struct loaderData_s * loaderData) { /* if they just did 'linux ks', they want us to figure it out from * the dhcp/bootp information */ -/* XXX: fixme NetworkManager integration */ -/* - if (url == NULL) { - char ret[47]; - ip_addr_t *tip; + g_type_init(); + + client = nm_client_new(); + if (!client) { + logMessage(CRITICAL, "%s (%d): failure creating NM proxy", + __func__, __LINE__); + return 1; + } + + state = nm_client_get_state(client); + if (state != NM_STATE_CONNECTED) { + logMessage(ERROR, "%s (%d): no active network devices", + __func__, __LINE__); + g_object_unref(client); + return 1; + } + + devices = nm_client_get_devices(client); + for (i = 0; i < devices->len; i++) { + NMDevice *candidate = g_ptr_array_index(devices, i); + const char *devname = nm_device_get_iface(candidate); + NMDHCP4Config *dhcp = NULL; + const char *server_name = NULL; + const char *filename = NULL; + struct in_addr addr; + char nextserver[INET_ADDRSTRLEN+1]; + + if (nm_device_get_state(candidate) != NM_DEVICE_STATE_ACTIVATED) + continue; + + if (strcmp(iface.device, devname)) + continue; + + dhcp = nm_device_get_dhcp4_config(candidate); + if (!dhcp) { + logMessage(ERROR, "no boot options received by DHCP"); + continue; + } - if (!(netCfg.dev.set & PUMP_INTFINFO_HAS_NEXTSERVER)) { + server_name = nm_dhcp4_config_get_one_option(dhcp, "server_name"); + if (!server_name) { logMessage(ERROR, "no bootserver was found"); + g_object_unref(client); return 1; } - tip = &(netCfg.dev.nextServer); - if (!(netCfg.dev.set & PUMP_INTFINFO_HAS_BOOTFILE)) { - inet_ntop(tip->sa_family, IP_ADDR(tip), ret, IP_STRLEN(tip)); - - if (asprintf(&url, "%s:%s", ret, "/kickstart/") == -1) { - logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); - abort(); + /* 'server_name' may be a hostname or an IPv4 address */ + memset(&nextserver, '\0', sizeof(nextserver)); + if (inet_pton(AF_INET, server_name, &addr) >= 1) { + strcpy(nextserver, server_name); + } else { + struct hostent *he = gethostbyname(server_name); + if (he != NULL) { + if (inet_ntop(AF_INET, he->h_addr_list[0], + nextserver, INET_ADDRSTRLEN) == NULL) { + memset(&nextserver, '\0', sizeof(nextserver)); + } } + } + + filename = nm_dhcp4_config_get_one_option(dhcp, "filename"); + if (filename == NULL) { + if (asprintf(&url, "%s:/kickstart/", nextserver) == -1) { + logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); + abort(); + } logMessage(ERROR, "bootp: no bootfile received"); } else { - inet_ntop(tip->sa_family, IP_ADDR(tip), ret, IP_STRLEN(tip)); + if (asprintf(&url, "%s:%s", nextserver, filename) == -1) { + logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); + abort(); + } - if (asprintf(&url, "%s:%s", ret, netCfg.dev.bootFile) == -1) { - logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); - abort(); - } - - logMessage(INFO, "bootp: bootfile is %s", netCfg.dev.bootFile); + logMessage(INFO, "bootp: bootfile is %s", filename); } + + break; } -*/ + + g_object_unref(client); /* get the IP of the target system */ if ((ip = iface_ip2str(loaderData->netDev, AF_INET)) == NULL) { - logMessage(ERROR, "nl_ip2str returned NULL"); + logMessage(ERROR, "iface_ip2str returned NULL"); return 1; } @@ -476,8 +531,8 @@ int getFileFromNfs(char * url, char * dest, struct loaderData_s * loaderData) { failed = 1; } - free(host); - free(path); + if (host) free(host); + if (path) free(path); if (ip) free(ip); umount("/tmp/mnt"); -- 1.6.0.3

2 4

[PATCH] update partedUtils.py:findExistingRootPartitions to return UUID
by Alexander Todorov 18 Dec '08

18 Dec '08

The attached patch updates findExistingRootPartitions to return dev, fs, release string, label and uuid and fixes all callers to use the 5 tuple. This is required so that later changes to upgrades functionality can fit better in the code. For more background see: https://www.redhat.com/archives/anaconda-devel-list/2008-December/msg00210.… Review and comments are appreciated. Regards, Alexander.

2 1

[PATCH] make anaconda work with new yum
by Joel Granados Moreno 18 Dec '08

18 Dec '08

Apparently YUM API changed and fubared the composed. This change allows any other changes to the argument list to occur without us having to change anything. Quick review appreciated.

3 3

cherry-pick 594864adce6e5ac58b914adcfa1b90aa33e739cb to f9-branch
by Jeroen van Meeuwen 18 Dec '08

18 Dec '08

The commit merges beautifully and allows anaconda-11.4.0-83-1 to be build on up-to-date machines. Thanks! Kind regards, Jeroen van Meeuwen -kanarip

3 4

[PATCH] Fix telnet install support (#471082)
by David Cantrell 18 Dec '08

18 Dec '08

Someone tried it in F-10 and reported that it didn't work. The startTelnetd() function in telnetd.c needed some changes. [rawhide] --- loader/telnetd.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/loader/telnetd.c b/loader/telnetd.c index 99c6feb..17935bf 100644 --- a/loader/telnetd.c +++ b/loader/telnetd.c @@ -230,7 +230,7 @@ int beTelnet(void) { } void startTelnetd(struct loaderData_s * loaderData) { - char ret[INET_ADDRSTRLEN+1]; + char *ipaddr = NULL; iface_t iface; iface_init_iface_t(&iface); @@ -240,12 +240,16 @@ void startTelnetd(struct loaderData_s * loaderData) { return; } - if (iface.ipaddr.s_addr) { - inet_ntop(AF_INET, &iface.ipaddr, ret, INET_ADDRSTRLEN); - logMessage(INFO, "going to beTelnet for %s", ret); - if (!beTelnet()) - flags |= LOADER_FLAGS_TEXT | LOADER_FLAGS_NOSHELL; + ipaddr = iface_ip2str(iface.device, AF_INET); + if (ipaddr == NULL) { + logMessage(ERROR, "%s (%d): no IP address found for %s", + __func__, __LINE__, iface.device); + return; } + logMessage(INFO, "going to beTelnet for %s", ipaddr); + if (!beTelnet()) + flags |= LOADER_FLAGS_TEXT | LOADER_FLAGS_NOSHELL; + return; } -- 1.6.0.3

2 1

[PATCH] Reduce direct D-Bus calls in isys/iface.c.
by David Cantrell 18 Dec '08

18 Dec '08

The first patch in a two (possibly three) patch series that replaces some direct D-Bus code with libnm-glib calls. Much less verbose, easier to read, etc, etc. Tested this patch locally and all seems well. Calling it a day for now. [rawhide] --- isys/Makefile | 8 ++-- isys/iface.c | 88 ++++++++++++------------------------------------------- isys/iface.h | 4 +-- loader/loader.c | 21 +------------ 4 files changed, 26 insertions(+), 95 deletions(-) diff --git a/isys/Makefile b/isys/Makefile index 595f4b8..14c7505 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -34,10 +34,6 @@ endif PYMODULES = _isys.so SUBDIRS = -# D-Bus -LOADLIBES += $(shell pkg-config --libs dbus-1) -CFLAGS += $(shell pkg-config --cflags dbus-1) - # NetworkManager LOADLIBES += $(shell pkg-config --libs NetworkManager) CFLAGS += $(shell pkg-config --cflags NetworkManager) @@ -46,6 +42,10 @@ CFLAGS += $(shell pkg-config --cflags NetworkManager) LOADLIBES += $(shell pkg-config --libs libnl-1) CFLAGS += $(shell pkg-config --cflags libnl-1) +# libnm-glib +LOADLIBES += $(shell pkg-config --libs libnm_glib) +CFLAGS += $(shell pkg-config --cflags libnm_glib) + ifeq ($(ARCH),ppc) OBJECTS += minifind.o SOURCES += minifind.c diff --git a/isys/iface.c b/isys/iface.c index d0613e2..3e101fd 100644 --- a/isys/iface.c +++ b/isys/iface.c @@ -43,8 +43,10 @@ #include <netlink/route/addr.h> #include <netlink/route/link.h> +#include <glib.h> #include <dbus/dbus.h> #include <NetworkManager.h> +#include <nm-client.h> #include "iface.h" #include "str.h" @@ -446,99 +448,47 @@ int iface_have_in6_addr(struct in6_addr *addr6) { } /* Check if NM is already running */ -int is_nm_running(DBusConnection *connection, int *running, char **error_str) -{ - DBusError error; - DBusMessage *message, *reply; - const char *nm_service = NM_DBUS_SERVICE; - dbus_bool_t alive = FALSE; - - message = dbus_message_new_method_call("org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus", - "NameHasOwner"); - if (!message) - return 33; - - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &nm_service, - DBUS_TYPE_INVALID)) { - dbus_message_unref(message); - return 34; - } +gboolean is_nm_running(void) { + gboolean running; + NMClient *client = NULL; - dbus_error_init(&error); - reply = dbus_connection_send_with_reply_and_block(connection, - message, 2000, - &error); - if (!reply) { - if (dbus_error_is_set(&error)) { - *error_str = strdup(error.message); - dbus_error_free(&error); - } + g_type_init(); - dbus_message_unref(message); - return 35; - } + client = nm_client_new(); + if (!client) + return FALSE; - dbus_error_init(&error); - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_BOOLEAN, &alive, - DBUS_TYPE_INVALID)) { - if (dbus_error_is_set(&error)) { - *error_str = strdup(error.message); - dbus_error_free(&error); - } - - dbus_message_unref(message); - dbus_message_unref(reply); - return 36; - } - - *running = alive; - - dbus_message_unref(message); - dbus_message_unref(reply); - return 0; + running = nm_client_get_manager_running(client); + g_object_unref(client); + return running; } /* * Wait for NetworkManager to appear on the system bus */ -int wait_for_nm(DBusConnection *connection, char **error_str) { +int wait_for_nm(void) { int count = 0; /* send message and block until a reply or error comes back */ while (count < 45) { - int running = 0, ret; - - ret = is_nm_running(connection, &running, error_str); - if (ret != 0) - return ret; /* error */ - if (running) - return 0; /* nm is alive */ + if (is_nm_running()) + return 0; sleep(1); count++; } - return 37; + return 1; } /* * Start NetworkManager -- requires that you have already written out the * control files in /etc/sysconfig for the interface. */ -int iface_start_NetworkManager(DBusConnection *connection, char **error) { +int iface_start_NetworkManager(void) { pid_t pid; - int ret, running = 0; - char *ignore = NULL; - - ret = is_nm_running(connection, &running, &ignore); - if (ignore) - free(ignore); - if (ret == 0 && running) + if (is_nm_running()) return 0; /* already running */ /* Start NetworkManager */ @@ -562,7 +512,7 @@ int iface_start_NetworkManager(DBusConnection *connection, char **error) { } else if (pid == -1) { return 1; } else { - return wait_for_nm(connection, error); + return wait_for_nm(); } return 0; diff --git a/isys/iface.h b/isys/iface.h index 497feaa..5cd8614 100644 --- a/isys/iface.h +++ b/isys/iface.h @@ -27,8 +27,6 @@ #include <netlink/cache.h> #include <netlink/socket.h> -#include <dbus/dbus.h> - /* Enumerated types used in iface.c as well as loader's network code */ enum { IPUNUSED, IPV4, IPV6 }; @@ -150,7 +148,7 @@ int iface_have_in6_addr(struct in6_addr *addr6); /* * Start NetworkManager */ -int iface_start_NetworkManager(DBusConnection *connection, char **error); +int iface_start_NetworkManager(void); /* * Set Maximum Transfer Unit (MTU) on specified interface diff --git a/loader/loader.c b/loader/loader.c index a028f1c..ec54d6f 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1781,10 +1781,6 @@ int main(int argc, char ** argv) { struct loaderData_s loaderData; - char *error_str = NULL; - DBusError error; - DBusConnection *connection = NULL; - char *path; char * cmdLine = NULL; char * ksFile = NULL; @@ -1950,21 +1946,8 @@ int main(int argc, char ** argv) { } /* Start NetworkManager now so it's always available to talk to. */ - dbus_error_init(&error); - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (connection == NULL) { - if (dbus_error_is_set(&error)) { - logMessage(DEBUGLVL, "%s (%d): %s: %s", __func__, - __LINE__, error.name, error.message); - dbus_error_free(&error); - } - } else { - rc = iface_start_NetworkManager(connection, &error_str); - if (rc != 0) { - logMessage(INFO, "failed to start NetworkManager (%d): error %d (%s)", - __LINE__, rc, error_str ? error_str : "unknown"); - } - } + if (iface_start_NetworkManager()) + logMessage(INFO, "failed to start NetworkManager"); if (!FL_CMDLINE(flags)) startNewt(); -- 1.6.0.3

2 1

[PATCH] Check error from asprintf() correctly for dhcpclass handling.
by David Cantrell 17 Dec '08

17 Dec '08

If asprintf() errors, it returns -1. Check for that correctly and return 20 on error. [rawhide] --- loader/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/net.c b/loader/net.c index aead300..e7f6c70 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1170,7 +1170,7 @@ int writeEnabledNetInfo(iface_t *iface) { iface->vendorclass = "anaconda"; } else { if (asprintf(&iface->vendorclass, "anaconda-%s %s %s", - kv.sysname, kv.release, kv.machine)) { + kv.sysname, kv.release, kv.machine) == -1 ) { return 20; } } -- 1.6.0.3

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