Anaconda-devel December 2009

anaconda-devel@lists.stg.fedoraproject.org

30 participants
103 discussions

[PATCH] - change our default partitioning scheme
by Chris Lumens 30 Apr '10

30 Apr '10

Here's a patch series that ends up with creating a /home by default. The algorithm is basically: - VG < 50 GB: make /boot, swap, rest as / - VG >= 50 GB: make /boot, swap, / with a 50 GB max, rest as /home Let the arguing begin. - Chris

11 26

(no subject)
by Martin Sivak 19 Jan '10

19 Jan '10

Driver disc stuff, 4th iteration

4 28

rsyslogd in anaconda, take two
by Ales Kozumplik 11 Jan '10

11 Jan '10

Because Martin Sivak has complained about how forking / error in startup is handled. The new patch addresses those issues.

3 4

[master] Enable IPv6 GUI in loader
by Ales Kozumplik 08 Jan '10

08 Jan '10

Hi, Even though the Network Manager is not quite ready for IPv6 support as anaconda needs it yet, I decided to go ahead with enabling the GUI so the code is present in the rhel6 branch after the rebase. IPv6 support needs to be in rhel6 either way and waiting for the last minute for NM to be ready would just add lots of last minute changes from me too. That's unpleasant and risky. The first patch enables the #ifdefed pieces and does necessary changes so the code compiles. The second one deals with two bugs that occur in the (new) manual network configuration window. Looking forward to your comments. Ales

3 6

Change default kernel cmdline to make dracut only online the minimum of devices
by Hans de Goede 25 Dec '09

25 Dec '09

Hi All, Currently dracut (as configured in Fedora) will online everything it finds on the system (all Volume Groups, all mdraid sets, etc). While looking for the root fs. This is not necessarily a good idea, esp not so when running on machine with lots of disks, or connected to a SAN. This also leads to issues when booting on headless machines with dmcrypt devices (which are not needed for the root fs). So I would like to propose to add the necessary kernel cmdline paramters to grub.conf, to tell dracut to only online certain devices (those needed for /) I would like to make this change soon (in plenty of time for RHEL-6 beta), my plan is to make anaconda write the needed cmdline options to grub.conf, as it already has all the necessary information in its devicetree, and already has a framework for writing kernel cmdline options for devices which need them (fcoe, iscsi, dasd, zfcp) as they cannot be autodiscovered. This would mean that for new installs we would always use the online minimum devices needed dracut boot method. For existing installs, we would still use the bring up everything method, as anaconda does not re-write grub.conf on a normal update, this would only affect F-12 -> F-13 updates, and should not be a problem there, as people running F-12 will already be using the bringup everything method, and that thus is working for them. Feedback welcome. Regards, Hans

2 3

[PATCH 1/4] Avoid duplicate kernel cmdline options and cleanup booty dracut code
by Hans de Goede 24 Dec '09

24 Dec '09

It is possible for 2 disks to have the same disk dracut cmdline options, or network cmdline options (if the disks are network devices) for example 2 iscsi disks on the same host. In this case we should only include the specific option once. This patch puts the collection of storage related setupStrings in a function, and makes get() loop over all kernel cmdline providing bits, so that the code for proper whitespace seperation of various args is not duplicated. --- booty/bootloaderInfo.py | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 067ffa7..6e6d403 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -86,26 +86,35 @@ def rootIsDevice(dev): class KernelArguments: - def get(self): - args = self.args + def getDracutStorageArgs(self): + args = [] root = self.id.storage.rootDevice for d in self.id.storage.devices: - if root.dependsOn(d): - dracutSetupString = d.dracutSetupString() - if len(dracutSetupString): - args += " %s" % dracutSetupString - import storage - if isinstance(d, storage.devices.NetworkStorageDevice): - args += " " - args += self.id.network.dracutSetupString(d) - - args += self.id.instLanguage.dracutSetupString() - args += self.id.keyboard.dracutSetupString() - - if args and self.appendArgs: - args += " " - - return args + self.appendArgs + if not root.dependsOn(d): + continue + + args.append(d.dracutSetupString()) + import storage + if isinstance(d, storage.devices.NetworkStorageDevice): + args.append(self.id.network.dracutSetupString(d)) + + return args + + def get(self): + args = "" + for s in self.getDracutStorageArgs() + [ + self.id.instLanguage.dracutSetupString(), + self.id.keyboard.dracutSetupString(), + self.args, + self.appendArgs ]: + s = s.strip() + if not s: + continue + if args: + args += " " + args += s + + return args def set(self, args): self.args = args -- 1.6.5.2

4 15

[master] fix for a bug in 05ce88b2 that split one line over several in program.log
by Ales Kozumplik 23 Dec '09

23 Dec '09

--- iutil.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/iutil.py b/iutil.py index e01fd8c..dd78f54 100644 --- a/iutil.py +++ b/iutil.py @@ -277,7 +277,7 @@ def execWithCallback(command, argv, stdin = None, stdout = None, elif stderr is None or not isinstance(stderr, file): stderr = sys.stderr.fileno() - program_log.info("Running... %s\n" % ([command] + argv,)) + program_log.info("Running... %s" % ([command] + argv,)) p = os.pipe() childpid = os.fork() @@ -295,6 +295,7 @@ def execWithCallback(command, argv, stdin = None, stdout = None, os.close(p[1]) + logline = '' while 1: try: s = os.read(p[0], 1) @@ -305,7 +306,11 @@ def execWithCallback(command, argv, stdin = None, stdout = None, if echo: os.write(stdout, s) - map(program_log.info, s.splitlines()) + if s == '\n': + program_log.info(logline) + logline = '' + else: + logline += s; if callback: callback(s, callback_data=callback_data) -- 1.6.2.5

2 2

[master] Introduces rsylogd to anaconda (part of #524980)
by Ales Kozumplik 23 Dec '09

23 Dec '09

A proper syslog daemon allows for remote logging that includes installed system's syslog. Removes the init.c code that simulated syslog activity until now. --- loader/Makefile.am | 3 +- loader/init.c | 217 ++++++++++++++------------------------------------ scripts/mk-images | 47 +++++++++++ scripts/upd-instroot | 4 +- 4 files changed, 113 insertions(+), 158 deletions(-) diff --git a/loader/Makefile.am b/loader/Makefile.am index e5d1b7f..e90822f 100644 --- a/loader/Makefile.am +++ b/loader/Makefile.am @@ -53,7 +53,8 @@ loader_SOURCES = loader.c copy.c log.c moduleinfo.c loadermisc.c \ method.c cdinstall.c hdinstall.c nfsinstall.c \ urlinstall.c net.c urls.c telnet.c telnetd.c -init_CFLAGS = $(COMMON_CFLAGS) +init_CFLAGS = $(COMMON_CFLAGS) $(GLIB_CFLAGS) +init_LDADD = $(GLIB_LIBS) init_SOURCES = init.c undomounts.c shutdown.c copy.c shutdown_CFLAGS = $(COMMON_CFLAGS) -DAS_SHUTDOWN=1 diff --git a/loader/init.c b/loader/init.c index 021f2ab..648cc22 100644 --- a/loader/init.c +++ b/loader/init.c @@ -26,6 +26,7 @@ #ifndef SOCK_STREAM # define SOCK_STREAM 1 #endif +#define klogctl syslog #else #include <ctype.h> #include <dirent.h> @@ -53,13 +54,13 @@ #include <linux/vt.h> #include <termios.h> #include <libgen.h> +#include <glib.h> #include "init.h" #include "copy.h" #include "devt.h" #include "devices.h" -#define syslog klogctl #endif #include <asm/types.h> @@ -113,6 +114,7 @@ char * env[] = { void shutDown(int doKill, reboot_action rebootAction); static int getKillPolicy(void); +static void getSyslog(char*); struct termios ts; static int expected_exit = 0; @@ -138,164 +140,35 @@ static void fatal_error(int usePerror) { #endif } -static int logChunk(int len, char *inbuf, char *outbuf) { - int inctr, outctr; - - for (inctr = 0, outctr = 0; inctr < len; inctr++) { - /* If the character is a NULL that's immediately followed by a open - * bracket, we've found the beginning of a new kernel message. Put in - * a line separator. - */ - if (inbuf[inctr] == '\0' && inctr+1 < len && inbuf[inctr+1] == '<') { - outbuf[outctr] = '\n'; - outctr++; - } - - /* Or, if we see a NULL right before the end of the chunk, that's also - * a good place to add a separator. - */ - else if (inbuf[inctr] == '\0' && inctr+1 == len) { - outbuf[outctr] = '\n'; - outctr++; - } - - /* Otherwise, simply output the character as long as it's not NULL. */ - else if (inbuf[inctr] != '\0') { - outbuf[outctr] = inbuf[inctr]; - outctr++; - } - } - - return outctr; -} - -static void doklog(char * fn) { - fd_set readset, unixs; - int in, out, i; - int log; - socklen_t s; - int sock = -1; - struct sockaddr_un sockaddr; - char inbuf[1024], outbuf[1024]; - int readfd; +/* sets up and launches syslog */ +static void startSyslog(void) { + int conf_fd; int ret; - - in = open("/proc/kmsg", O_RDONLY,0); - if (in < 0) { - /* FIXME: was perror */ - printstr("open /proc/kmsg"); - return; - } - - out = open(fn, O_WRONLY, 0); - if (out < 0) - printf("couldn't open %s for syslog -- still using /tmp/syslog\n", fn); - - log = open("/tmp/syslog", O_WRONLY | O_CREAT, 0644); - if (log < 0) { - /* FIXME: was perror */ - printstr("error opening /tmp/syslog"); - sleep(5); - - close(in); - return; + char addr[128]; + char forwardtcp[] = "*.* @@"; + + getSyslog(addr); + if (strlen(addr) > 0) { + conf_fd = open("/etc/rsyslog.conf", O_WRONLY|O_APPEND); + if (conf_fd < 0) { + printf("error opening /etc/rsyslog.conf: %d\n", errno); + printf("syslog forwarding will not be enabled\n"); + sleep(5); + } else { + ret = write(conf_fd, forwardtcp, strlen(forwardtcp)); + ret = write(conf_fd, addr, strlen(addr)); + ret = write(conf_fd, "\n", 1); + close(conf_fd); + } } - /* if we get this far, we should be in good shape */ - - if (fork()) { - /* parent */ - close(in); - close(out); - close(log); - return; - } - close(0); - close(1); - close(2); - - dup2(1, log); - -#if defined(USE_LOGDEV) - /* now open the syslog socket */ - sockaddr.sun_family = AF_UNIX; - strcpy(sockaddr.sun_path, "/dev/log"); - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { - printf("error creating socket: %d\n", errno); - sleep(5); - } - printstr("got socket\n"); - if (bind(sock, (struct sockaddr *) &sockaddr, sizeof(sockaddr.sun_family) + - strlen(sockaddr.sun_path))) { - printf("bind error: %d\n", errno); - sleep(5); - } - printstr("bound socket\n"); - chmod("/dev/log", 0666); - if (listen(sock, 5)) { - printf("listen error: %d\n", errno); - sleep(5); + if (fork() == 0) { + /* rsyslog is going to take care of things, so disable console logging */ + klogctl(8, NULL, 1); + execl("/sbin/rsyslogd", "/sbin/rsyslogd", "-c4", NULL); + /* happens on error */ + doExit(1); } -#endif - - syslog(8, NULL, 1); - - FD_ZERO(&unixs); - while (1) { - memcpy(&readset, &unixs, sizeof(unixs)); - - if (sock >= 0) - FD_SET(sock, &readset); - - FD_SET(in, &readset); - - i = select(20, &readset, NULL, NULL, NULL); - if (i <= 0) continue; - - if (FD_ISSET(in, &readset)) { - i = read(in, inbuf, sizeof(inbuf)); - if (i > 0) { - int loggedLen = logChunk(i, inbuf, outbuf); - - if (out >= 0) - ret = write(out, outbuf, loggedLen); - ret = write(log, outbuf, loggedLen); - } - } - - for (readfd = 0; readfd < 20; ++readfd) { - if (FD_ISSET(readfd, &readset) && FD_ISSET(readfd, &unixs)) { - i = read(readfd, inbuf, sizeof(inbuf)); - if (i > 0) { - int loggedLen = logChunk(i, inbuf, outbuf); - - if (out >= 0) - ret = write(out, outbuf, loggedLen); - - ret = write(log, outbuf, loggedLen); - } else if (i == 0) { - /* socket closed */ - close(readfd); - FD_CLR(readfd, &unixs); - } - } - } - - if (sock >= 0 && FD_ISSET(sock, &readset)) { - s = sizeof(sockaddr); - readfd = accept(sock, (struct sockaddr *) &sockaddr, &s); - if (readfd < 0) { - if (out >= 0) - ret = write(out, "error in accept\n", 16); - ret = write(log, "error in accept\n", 16); - close(sock); - sock = -1; - } else { - FD_SET(readfd, &unixs); - } - } - } } static int setupTerminal(int fd) { @@ -440,6 +313,38 @@ static int getKillPolicy(void) { return 1; } +/* Looks through /proc/cmdline for remote syslog paramters. */ +static void getSyslog(char *addr) { + int fd; + int len; + char buf[1024]; + + /* assume nothing gets found */ + addr[0] = '\0'; + if ((fd = open("/proc/cmdline", O_RDONLY,0)) <= 0) { + return; + } + len = read(fd, buf, sizeof(buf) - 1); + close(fd); + buf[len] = '\0'; + + int i; + int argc; + char** argv; + GError* err; + if (!g_shell_parse_argv(buf, &argc, &argv, &err )) { + g_error_free(err); + return; + } + for (i = 0; i < argc; ++i) { + if (!strncmp(argv[i], "syslog=", 7)) { + strcpy(addr, argv[i] + 7); + break; + } + } + g_strfreev(argv); +} + static int getInitPid(void) { int fd = 0, pid = -1, ret; char * buf = calloc(1, 10); @@ -762,7 +667,7 @@ int main(int argc, char **argv) { /* Now we have some /tmp space set up, and /etc and /dev point to it. We should be in pretty good shape. */ - doklog("/dev/tty4"); + startSyslog(); /* write out a pid file */ if ((fd = open("/var/run/init.pid", O_WRONLY|O_CREAT, 0644)) > 0) { diff --git a/scripts/mk-images b/scripts/mk-images index c3b1686..970e6cb 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -556,6 +556,7 @@ makeinitrd() { mkdir -p $MBD_DIR/tmp mkdir -p $MBD_DIR/usr/libexec mkdir -p $MBD_DIR/usr/$LIBDIR/NetworkManager + mkdir -p $MBD_DIR/usr/$LIBDIR/rsyslog mkdir -p $MBD_DIR/usr/share/dbus-1/system-services mkdir -p $MBD_DIR/var/lib/dbus mkdir -p $MBD_DIR/var/lib/dhclient @@ -760,6 +761,52 @@ makeinitrd() { instbin $IMGPATH /usr/sbin/mdadm $MBD_DIR /sbin/mdadm instbin $IMGPATH /usr/sbin/mdmon $MBD_DIR /sbin/mdmon + # rsyslog + instbin $IMGPATH /usr/sbin/rsyslogd $MBD_DIR /sbin/rsyslogd + ( cd $IMGPATH/usr/$LIBDIR/rsyslog + for f in *.so; do + instbin $IMGPATH /usr/$LIBDIR/rsyslog/$f $MBD_DIR /usr/$LIBDIR/rsyslog/$f + done + ) + # \EOF has a quote in the first character on purpose; see man bash on here documents + cat > $MBD_DIR/etc/rsyslog.conf <<\EOF +#### MODULES #### +$ModLoad imuxsock.so # provides support for local system logging +$ModLoad imklog.so # provides kernel logging support + +#### GLOBAL DIRECTIVES #### +# Use default timestamp format +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +#### TEMPLATES #### + +$template anaconda_tty4, "%syslogseverity-text:::uppercase% %programname%:%msg%\n" +$template anaconda_syslog, "%timestamp:8:$:date-rfc3164%,%timestamp:1:3:date-subseconds% %syslogseverity-text:::uppercase% %programname%:%msg%\n" + +#### RULES #### +*.*;\ +authpriv.none /tmp/syslog;anaconda_syslog + & /dev/tty4;anaconda_tty4 + +# ### begin forwarding rule ### +# The statement between the begin ... end define a SINGLE forwarding +# rule. They belong together, do NOT split them. If you create multiple +# forwarding rules, duplicate the whole block! +# +# An on-disk queue is created for this action. If the remote host is +# down, messages are spooled to disk and sent when it is up again. +$WorkDirectory /tmp/spool # where to place spool files +$ActionQueueFileName rsyslog_fw # unique name prefix for spool files +$ActionQueueMaxDiskSpace 1m # space limit (use as much as possible) +$ActionQueueSaveOnShutdown off # do not save messages to disk on shutdown +$ActionQueueType LinkedList # run asynchronously +$ActionResumeRetryCount -1 # infinite retries if host is down +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional +# ### end of the forwarding rule ### + +EOF + + # Misc instbin $IMGPATH /usr/sbin/dmidecode $MBD_DIR /sbin/dmidecode instbin $IMGPATH /usr/bin/egrep $MBD_DIR /sbin/egrep diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 2a79ebf..79b22bc 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -188,7 +188,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 acl anaconda pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-nss python-pyblock python-sqlite python-epdb python-urlgrabber python-volume_key pyxf86config readline redhat-artwork - reiserfs-utils rpm rpm-libs rpm-python sed selinux-policy-targeted + reiserfs-utils rpm rpm-libs rpm-python rsyslog sed selinux-policy-targeted setup slang smc-meera-fonts specspo sqlite synaptics system-config-date system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release sysvinit-tools taipeifonts tcp_wrappers tcp_wrappers-libs telnet @@ -456,6 +456,7 @@ sbin/reiserfstune sbin/resize_reiserfs sbin/resize2fs sbin/route +sbin/rsyslogd sbin/setfiles sbin/sfdisk sbin/silo @@ -483,6 +484,7 @@ usr/$LIBDIR/libuser/* usr/$LIBDIR/pango usr/$LIBDIR/python?.? usr/$LIBDIR/rpm/rpmpopt +usr/$LIBDIR/rsyslog usr/$LIBDIR/libiscsi.so* usr/$LIBDIR/libsqlite3.so* usr/$LIBDIR/xorg/modules -- 1.6.2.5

3 5

Added *Anaconda Stage* to the How_to_debug_installation_problems page
by He Rui 23 Dec '09

23 Dec '09

Greetings, When testing boot methods of installation, '/anaconda is able to transition to stage2 without error' /is really important to make sure that the install actually starts the anaconda. But many people feel confused of what the stages are during installation. Therefore, I created a page[1] telling the differences and how to judge between them. And this probably is something we should publicize better for bug reporters as well. So I also add the *Anaconda Stage* content to the existing How_to_debug_installation_problems wiki page[2]. Can someone please review it? Feel free for comments and improvements. :-) Cheers, Rui He [1] http://fedoraproject.org/wiki/Anaconda/Stage [2] http://fedoraproject.org/wiki/How_to_debug_installation_problems#Anaconda_S… -- Contacts FAS name: Rhe IRC nick: rhe #fedora-qa Email: rhe(a)redhat.com

3 4

[PATCH 1/4] Avoid duplicate kernel cmdline options and cleanup booty dracut code
by Ales Kozumplik 23 Dec '09

23 Dec '09

- return args + self.appendArgs + if not root.dependsOn(d): + continue + + args.append(d.dracutSetupString()) Is situation when a parent itself depends on something also handled?

2 1

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 2009