Anaconda-devel December 2008

anaconda-devel@lists.fedoraproject.org

25 participants
100 discussions

[PATCH] Call 'udevadm settle' instead of 'udevsettle'.
by David Cantrell 17 Dec '08

17 Dec '08

Log file had a message telling us to use 'udevadm settle' instead of 'udevsettle' and that udevsettle support as argv[0] will be removed in the future. This patch changes loader to call 'udevadm settle'. [rawhide] --- loader/hardware.c | 6 +++--- scripts/mk-images | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/loader/hardware.c b/loader/hardware.c index 202c641..67a2953 100644 --- a/loader/hardware.c +++ b/loader/hardware.c @@ -75,7 +75,7 @@ static int detectHardware() { logMessage(DEBUGLVL, "waiting for hardware to initialize"); if (!(child = fork())) { - char *args[] = { "/sbin/udevsettle", "udevsettle", NULL, NULL }; + char *args[] = { "/sbin/udevadm", "udevadm", "settle", NULL, NULL }; int fd = open("/dev/tty3", O_RDWR); dup2(fd, 0); @@ -84,13 +84,13 @@ static int detectHardware() { close(fd); if (timeout) { - if (asprintf(&args[2],"--timeout=%d",timeout) == -1) { + if (asprintf(&args[3], "--timeout=%d", timeout) == -1) { logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); abort(); } } - rc = execv("/sbin/udevsettle",args); + rc = execv("/sbin/udevadm", args); _exit(1); } diff --git a/scripts/mk-images b/scripts/mk-images index a405df7..a8c5bdb 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -618,7 +618,6 @@ makeinitrd() { instbin $IMGPATH /usr/sbin/udevd $MBD_DIR /sbin/udevd instbin $IMGPATH /usr/sbin/udevadm $MBD_DIR /sbin/udevadm instbin $IMGPATH /usr/bin/udevinfo $MBD_DIR /sbin/udevinfo - ln -s udevadm $MBD_DIR/sbin/udevsettle instbin $IMGPATH /usr/bin/bash $MBD_DIR /sbin/bash ( cd $MBD_DIR/sbin ; ln -sf bash sh ) -- 1.6.0.3

1 1

[PATCH] Put libnm_glib and glib in the instroot.
by David Cantrell 17 Dec '08

17 Dec '08

Using the libnm_glib library for easier communication with NetworkManager, so we need this library in the instroot now (and the initrd). --- scripts/upd-instroot | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 23efc51..fcc9abe 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -148,7 +148,7 @@ die () { exit 1 } -PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit VLGothic-fonts acl anaconda +PACKAGES="GConf2 NetworkManager NetworkManager-glib ORBit2 PolicyKit VLGothic-fonts acl anaconda anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk booty busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python @@ -267,6 +267,8 @@ cat > $KEEPFILE <<EOF $LIBDIR/bdevid $LIBDIR/dbus-1 $LIBDIR/libfreebl3.so +$LIBDIR/libglib* +$LIBDIR/libgobject* $LIBDIR/libnss3.so $LIBDIR/libnss_dns* $LIBDIR/libnss_files* @@ -403,6 +405,8 @@ sbin/xfs_repair sbin/xfsdump sbin/xfsrestore usr/$LIBDIR/NetworkManager +usr/$LIBDIR/libnm_glib* +usr/$LIBDIR/libdbus* usr/$LIBDIR/dri usr/$LIBDIR/gconv usr/$LIBDIR/gdk-pixbuf/loaders/*la* -- 1.6.0.3

2 2

PACTH: RHEL53: mkinitrd: fix loading of dmraid5/10 modules
by Hans de Goede 17 Dec '08

17 Dec '08

Hi all, See atatched patch, Regards, Hans diff -up mkinitrd-5.1.19.6/mkinitrd~ mkinitrd-5.1.19.6/mkinitrd --- mkinitrd-5.1.19.6/mkinitrd~ 2008-12-17 17:02:55.000000000 +0100 +++ mkinitrd-5.1.19.6/mkinitrd 2008-12-17 17:02:55.000000000 +0100 @@ -1303,6 +1303,13 @@ if [ -n "$testdm" -a -x /sbin/dmsetup -a fi fi +if [ "$withdmraid" == "1" ]; then + findmodule dm-mem-cache + findmodule dm-region_hash + findmodule dm-message + findmodule dm-raid45 +fi + for n in $basicmodules; do findmodule $n done

2 1

[PATCH] RHEL4 - fix detection of xen environment for kbd setting (#459785)
by Radek Vykydal 17 Dec '08

17 Dec '08

Hi, /proc/xen is present in non-xen installation, so use /proc/xen/capabilities instead. Radek

2 1

[PATCH] Use libnm_glib in net.c:get_connection()
by David Cantrell 17 Dec '08

17 Dec '08

Rather than getting the NetworkManager state over D-Bus, use the libnm_glib library to get the same information. Less verbose code that way. --- loader/net.c | 107 +++++++-------------------------------------------------- 1 files changed, 14 insertions(+), 93 deletions(-) diff --git a/loader/net.c b/loader/net.c index aead300..edb8636 100644 --- a/loader/net.c +++ b/loader/net.c @@ -36,8 +36,10 @@ #include <string.h> #include <strings.h> #include <unistd.h> -#include <dbus/dbus.h> + +#include <glib.h> #include <NetworkManager.h> +#include <nm-client.h> #include "../isys/isys.h" #include "../isys/ethtool.h" @@ -1891,14 +1893,8 @@ void splitHostname (char *str, char **host, char **port) */ int get_connection(iface_t *iface) { int count = 0; - DBusConnection *connection = NULL; - DBusMessage *message = NULL; - DBusMessage *reply = NULL; - DBusError error; - DBusMessageIter iter, variant_iter; - dbus_uint32_t state = 0; - char *nm_iface = NM_DBUS_INTERFACE; - char *property = "State"; + NMClient *client = NULL; + NMState state; if (iface == NULL) { return 1; @@ -1916,92 +1912,24 @@ int get_connection(iface_t *iface) { iface->device, 0); } - dbus_error_init(&error); - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (connection == NULL) { - if (dbus_error_is_set(&error)) { - logMessage(ERROR, "%s (%d): %s: %s", __func__, - __LINE__, error.name, error.message); - dbus_error_free(&error); - } + g_type_init(); + client = nm_client_new(); + if (!client) { + logMessage(ERROR, "%s (%d): could not connect to system bus", + __func__, __LINE__); return 2; } - dbus_error_init(&error); - message = dbus_message_new_method_call(NM_DBUS_SERVICE, - NM_DBUS_PATH, - DBUS_INTERFACE_PROPERTIES, - "Get"); - if (!message) { - if (dbus_error_is_set(&error)) { - logMessage(ERROR, "%s (%d): %s: %s", __func__, - __LINE__, error.name, error.message); - dbus_error_free(&error); - } - - return 4; - } - - dbus_error_init(&error); - if (!dbus_message_append_args(message, - DBUS_TYPE_STRING, &nm_iface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID)) { - if (dbus_error_is_set(&error)) { - logMessage(ERROR, "%s (%d): %s: %s", __func__, - __LINE__, error.name, error.message); - dbus_error_free(&error); - } - - dbus_message_unref(message); - return 5; - } - /* send message and block until a reply or error comes back */ while (count < 45) { - dbus_error_init(&error); - reply = dbus_connection_send_with_reply_and_block(connection, - message, -1, - &error); - if (!reply) { - if (dbus_error_is_set(&error)) { - logMessage(ERROR, "%s (%d): %s: %s", __func__, - __LINE__, error.name, error.message); - dbus_error_free(&error); - } + state = nm_client_get_state(client); - dbus_message_unref(message); - return 6; - } - - /* extra uint32 'state' property from the returned variant type */ - dbus_message_iter_init(reply, &iter); - if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) { - logMessage(ERROR, "%s (%d): unexpected reply format", - __func__, __LINE__); - dbus_message_unref(message); - dbus_message_unref(reply); - return 7; - } - - /* open the variant */ - dbus_message_iter_recurse(&iter, &variant_iter); - if (dbus_message_iter_get_arg_type(&variant_iter) != DBUS_TYPE_UINT32) { - logMessage(ERROR, "%s (%d): unexpected reply format", - __func__, __LINE__); - dbus_message_unref(message); - dbus_message_unref(reply); - return 8; - } - - dbus_message_iter_get_basic(&variant_iter, &state); if (state == NM_STATE_CONNECTED) { logMessage(INFO, "%s (%d): NetworkManager connected", __func__, __LINE__); - dbus_message_unref(message); - dbus_message_unref(reply); res_init(); + g_object_unref(client); return 0; } @@ -2009,15 +1937,8 @@ int get_connection(iface_t *iface) { count++; } - if (message) { - dbus_message_unref(message); - } - - if (reply) { - dbus_message_unref(reply); - } - - return 9; + g_object_unref(client); + return 3; } /* vim:set shiftwidth=4 softtabstop=4: */ -- 1.6.0.3

2 1

[PATCH] Add libnm_glib CFLAGS and LIBS to loader's Makefile.
by David Cantrell 17 Dec '08

17 Dec '08

--- loader/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/Makefile b/loader/Makefile index e83d0f2..6dc0412 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -39,9 +39,9 @@ CFLAGS += $(shell pkg-config --cflags libnl-1) # NetworkManager CFLAGS += $(shell pkg-config --cflags NetworkManager) -# D-Bus -LIBS += $(shell pkg-config --libs dbus-1) -CFLAGS += $(shell pkg-config --cflags dbus-1) +# libnm-glib +CFLAGS += $(shell pkg-config --cflags libnm_glib) +LIBS += $(shell pkg-config --libs libnm_glib) ifeq (1, $(USESELINUX)) LIBS += -lselinux -lsepol -- 1.6.0.3

2 1

[PATCH] BR NetworkManager-glib-devel.
by David Cantrell 17 Dec '08

17 Dec '08

--- anaconda.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/anaconda.spec b/anaconda.spec index cb63b3b..b1b364b 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -67,6 +67,7 @@ BuildRequires: xmlto BuildRequires: yum >= %{yumver} BuildRequires: zlib-devel BuildRequires: NetworkManager-devel >= %{nmver} +BuildRequires: NetworkManager-glib-devel >= %{nmver} BuildRequires: dbus-devel >= %{dbusver} %ifarch %livearches BuildRequires: desktop-file-utils -- 1.6.0.3

2 1

[PATCH] Only write the short hostname to the localhost line (#474086)
by David Cantrell 17 Dec '08

17 Dec '08

Do not write the FQDN to the localhost line, only write the short hostname if it's something other than 'localhost'. Only write the FQDN line to /etc/hosts if we have an IP address for the host. Without this patch, users performing media installs who enter an FQDN in the hostname field end up with their FQDN == 127.0.0.1, which messes up things, such as sendmail. Writing the short name is what we really want here. [rawhide] --- network.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/network.py b/network.py index adde7cb..a2624cf 100644 --- a/network.py +++ b/network.py @@ -677,14 +677,9 @@ class Network: 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 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 + if not ip and (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") -- 1.6.0.3

2 1

[PATCH] Copy /etc/dhclient-DEV.conf file to target system (#476364)
by David Cantrell 16 Dec '08

16 Dec '08

The vendor-class setting gets written to this file during installation, but we need to copy the file to the target system to make sure it's present on reboot. Previously, we wrote this to the ifcfg file, but that variable isn't read anymore. --- network.py | 8 ++++++-- packages.py | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/network.py b/network.py index b5ecad4..9fae956 100644 --- a/network.py +++ b/network.py @@ -576,8 +576,6 @@ class Network: if (bootproto == 'dhcp' and self.hostname and self.overrideDHCPhostname): f.write("DHCP_HOSTNAME=%s\n" %(self.hostname,)) - if dev.get('DHCPCLASS'): - f.write("DHCP_CLASSID=%s\n" % dev.get('dhcpclass')) if dev.get('MTU') and dev.get('MTU') != 0: f.write("MTU=%s\n" % dev.get('MTU')) @@ -614,6 +612,12 @@ class Network: destkey = "%s/keys-%s" % (netscripts, device,) shutil.move(newkey, destkey) + # /etc/dhclient-DEVICE.conf + dhclientconf = '/etc/dhclient-' + device + '.conf' + if os.path.isfile(dhclientconf): + destdhclientconf = '%s%s' % (instPath, dhclientconf,) + shutil.copy(dhclientconf, destdhclientconf) + # /etc/sysconfig/network if not os.path.isfile(destnetwork): newnetwork = "%s.new" % (destnetwork,) diff --git a/packages.py b/packages.py index c141c92..cfc6ba2 100644 --- a/packages.py +++ b/packages.py @@ -231,7 +231,8 @@ def setFileCons(anaconda): "/etc/mdadm.conf", "/etc/hosts", "/etc/sysconfig/network", "/etc/udev/rules.d/70-persistent-net.rules", "/root/install.log", "/root/install.log.syslog", - "/etc/shadow", "/etc/shadow-", "/etc/gshadow"] + "/etc/shadow", "/etc/shadow-", "/etc/gshadow"] + \ + glob.glob('/etc/dhclient-*.conf') vgs = [] for entry in anaconda.id.partitions.requests: -- 1.6.0.3

3 5

[PATCH] Add function to get a single NM D-Bus property (#471812)
by David Cantrell 16 Dec '08

16 Dec '08

In order to patch #471812, I needed to read a lot of D-Bus properties. Created this function to do the work. Can probably rewrite the get_connection() function to use this new function too, but I will save that for a rainy day. --- loader/net.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ loader/net.h | 2 + 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/loader/net.c b/loader/net.c index aead300..14508c7 100644 --- a/loader/net.c +++ b/loader/net.c @@ -2020,4 +2020,75 @@ int get_connection(iface_t *iface) { return 9; } +/* + * Get a specific NetworkManager D-Bus property given the D-Bus interface, + * the D-Bus path, and the D-Bus property name. + */ +DBusMessage *get_nm_dbus_property(char *interface, char *path, char *property) { + char *dbus_interface = NULL; + char *dbus_path = NULL; + char *dbus_property = NULL; + DBusConnection *connection = NULL; + DBusError error; + DBusMessage *message = NULL; + DBusMessage *reply = NULL; + + if ((property == NULL) || (path == NULL) || (interface == NULL)) { + fprintf(stderr, "%s (%d): missing required argument\n", + __func__, __LINE__); + return NULL; + } + + dbus_error_init(&error); + connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + if (connection == NULL) { + dbus_error_free(&error); + fprintf(stderr, "%s (%d): %s: %s\n", __func__, __LINE__, + error.name, error.message); + return NULL; + } + + dbus_interface = strdup(interface); + dbus_path = strdup(path); + message = dbus_message_new_method_call(dbus_interface, + dbus_path, + DBUS_INTERFACE_PROPERTIES, + "Get"); + if (!message) { + fprintf(stderr, "%s (%d): %s: %s\n", __func__, __LINE__, + error.name, error.message); + free(dbus_interface); + free(dbus_path); + return NULL; + } + + dbus_property = strdup(property); + if (!dbus_message_append_args(message, + DBUS_TYPE_STRING, &dbus_interface, + DBUS_TYPE_STRING, &dbus_property, + DBUS_TYPE_INVALID)) { + dbus_message_unref(message); + fprintf(stderr, "%s (%d): %s: %s\n", __func__, __LINE__, + error.name, error.message); + free(dbus_interface); + free(dbus_path); + free(dbus_property); + return NULL; + } + + reply = dbus_connection_send_with_reply_and_block(connection, message, + -1, &error); + dbus_message_unref(message); + if (!reply) { + fprintf(stderr, "%s (%d): %s: %s\n", __func__, __LINE__, + error.name, error.message); + } + + dbus_connection_unref(connection); + free(dbus_interface); + free(dbus_path); + free(dbus_property); + return reply; +} + /* vim:set shiftwidth=4 softtabstop=4: */ diff --git a/loader/net.h b/loader/net.h index 8245084..25708fb 100644 --- a/loader/net.h +++ b/loader/net.h @@ -20,6 +20,7 @@ #ifndef H_LOADER_NET #define H_LOADER_NET +#include <dbus/dbus.h> #include <newt.h> #include "../isys/iface.h" #include "loader.h" @@ -73,5 +74,6 @@ int kickstartNetworkUp(struct loaderData_s * loaderData, iface_t * iface); void splitHostname (char *str, char **host, char **port); int get_connection(iface_t * iface); +DBusMessage *get_nm_dbus_property(char *interface, char *path, char *property); #endif -- 1.6.0.3

2 2

← 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