Anaconda-devel February 2011

anaconda-devel@lists.fedoraproject.org

21 participants
82 discussions

[PATCH rhel6-branch] Do not activate first ks network device in non-network installs.
by Radek Vykydal 23 Feb '11

23 Feb '11

To resotre rhel5 behaviour ... one more case found: for media (non-network) installs kickstart network command should not bring network up. Related: rhbz#638131 --- loader/kickstart.c | 14 ++++---------- loader/kickstart.h | 2 +- loader/loader.c | 6 ++++-- loader/net.c | 27 ++++++++++++++++++++++++--- loader/net.h | 1 + 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index b418d74..3007f86 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -370,13 +370,7 @@ int isKickstartFileRemote(char *ksFile) { location = ksFile + 3; } - if (!strncmp(location, "http", 4) || - !strncmp(location, "ftp://", 6) || - !strncmp(location, "nfs:", 4)) { - return 1; - } else { - return 0; - } + return isURLRemote(location); } void getKickstartFile(struct loaderData_s *loaderData) { @@ -543,16 +537,16 @@ static void setMediaCheck(struct loaderData_s * loaderData, int argc, return; } -void addActivateToFirstKsNetworkCommand() { +void markFirstKsNetworkCommand() { int i = 0; for (i = 0; i < numCommands; i++) { if (commands[i].code == KS_CMD_NETWORK) { - logMessage(INFO, "adding --activate to first kickstart network command"); + logMessage(DEBUGLVL, "marking first kickstart network command"); commands[i].argc++; commands[i].argv = g_realloc(commands[i].argv, sizeof(gchar *) * (commands[i].argc + 1)); - commands[i].argv[commands[i].argc -1] = "--activate"; + commands[i].argv[commands[i].argc -1] = "--firstnetdev"; commands[i].argv[commands[i].argc] = NULL; break; } diff --git a/loader/kickstart.h b/loader/kickstart.h index 2a3b334..24612cf 100644 --- a/loader/kickstart.h +++ b/loader/kickstart.h @@ -50,6 +50,6 @@ int isKickstartFileRemote(char *ksFile); void getKickstartFile(struct loaderData_s * loaderData); void runKickstart(struct loaderData_s * loaderData); int getKickstartFromBlockDevice(char *device, char *path); -void addActivateToFirstKsNetworkCommand(); +void markFirstKsNetworkCommand(); #endif diff --git a/loader/loader.c b/loader/loader.c index ac289a5..0154ce0 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1521,7 +1521,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData, case STEP_NETWORK: { if (((installMethods[validMethods[loaderData->method]].type != - DEVICE_NETWORK) && (!hasGraphicalOverride()) && + DEVICE_NETWORK) && !FL_ASKNETWORK(flags) && !FL_EARLY_NETWORKING(flags) && !ibft_present()) || @@ -2049,6 +2049,8 @@ int main(int argc, char ** argv) { logMessage(INFO, "text mode forced due to serial/virtpconsole"); flags |= LOADER_FLAGS_TEXT; } + if (hasGraphicalOverride()) + flags |= LOADER_FLAGS_EARLY_NETWORKING; set_fw_search_path(&loaderData, "/firmware:/lib/firmware"); start_fw_loader(&loaderData); @@ -2238,7 +2240,7 @@ int main(int argc, char ** argv) { getKickstartFile(&loaderData); if (FL_KICKSTART(flags) && (ksReadCommands((ksFile)?ksFile:loaderData.ksFile)!=LOADER_ERROR)) { - addActivateToFirstKsNetworkCommand(); + markFirstKsNetworkCommand(); runKickstart(&loaderData); } } diff --git a/loader/net.c b/loader/net.c index 5a09ef9..1531d4f 100644 --- a/loader/net.c +++ b/loader/net.c @@ -1524,7 +1524,7 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc, gchar *bootProto = NULL, *device = NULL, *class = NULL, *ethtool = NULL; gchar *essid = NULL, *wepkey = NULL, *onboot = NULL, *gateway = NULL; gint mtu = 1500, dhcpTimeout = -1; - gboolean noipv4 = FALSE, noipv6 = FALSE, noDns = FALSE, noksdev = FALSE, activate = FALSE, nodefroute=FALSE; + gboolean noipv4 = FALSE, noipv6 = FALSE, noDns = FALSE, noksdev = FALSE, activate = FALSE, nodefroute=FALSE, firstnetdev=FALSE; GOptionContext *optCon = g_option_context_new(NULL); GError *optErr = NULL; struct in_addr addr; @@ -1558,6 +1558,7 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc, { "onboot", 0, 0, G_OPTION_ARG_STRING, &onboot, NULL, NULL }, { "notksdevice", 0, 0, G_OPTION_ARG_NONE, &noksdev, NULL, NULL }, { "activate", 0, 0, G_OPTION_ARG_NONE, &activate, NULL, NULL }, + { "firstnetdev", 0, 0, G_OPTION_ARG_NONE, &firstnetdev, NULL, NULL }, { "nodefroute", 0, 0, G_OPTION_ARG_NONE, &nodefroute, NULL, NULL }, { "dhcptimeout", 0, 0, G_OPTION_ARG_INT, &dhcpTimeout, NULL, NULL }, { NULL }, @@ -1712,8 +1713,13 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc, iface.defroute = 0; } - if (!is_nm_connected()) { - logMessage(INFO, "activating because no network connection is available"); + if (firstnetdev && + (loaderData->method == METHOD_URL || + loaderData->method == METHOD_NFS || + isURLRemote(loaderData->instRepo) || + FL_EARLY_NETWORKING(flags) || + ibft_present())) { + logMessage(INFO, "activating first device from kickstart because network is needed"); activateDevice(loaderData, &iface); return; } @@ -2329,4 +2335,19 @@ int wait_for_iface_disconnection(char *ifname) { g_object_unref(client); return 3; } + +int isURLRemote(char *url) { + if (url == NULL) { + return 0; + } + + if (!strncmp(url, "http", 4) || + !strncmp(url, "ftp://", 6) || + !strncmp(url, "nfs:", 4)) { + return 1; + } else { + return 0; + } +} + /* vim:set shiftwidth=4 softtabstop=4: */ diff --git a/loader/net.h b/loader/net.h index 308a116..a737e0c 100644 --- a/loader/net.h +++ b/loader/net.h @@ -82,5 +82,6 @@ int disconnectDevice(char *device); void splitHostname (char *str, char **host, char **port); int wait_for_iface_activation(char * ifname); int wait_for_iface_disconnection(char *ifname); +int isURLRemote(char *url); #endif -- 1.7.2

2 2

[rhel6-branch] another fix for /boot on LVM for s390x
by David Cantrell 23 Feb '11

23 Feb '11

Patch comment explains things. Jan Stodola has tested this on s390x and it solves the problem there. Also applicable to master. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

3 3

[PATCH rhel6-branch] Don't show the cleardisk dialog on upgrades (#679725).
by Chris Lumens 23 Feb '11

23 Feb '11

This has the disadvantage of making it so you cannot pick a different disk to install your bootloader to should you choose to create a new bootloader config. However, that is probably less confusing than the current situation. --- upgrade.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/upgrade.py b/upgrade.py index 58960ec..088dcdb 100644 --- a/upgrade.py +++ b/upgrade.py @@ -267,7 +267,6 @@ def setSteps(anaconda): "welcome", "filtertype", "filter", - "cleardiskssel", "installtype", "storageinit", "findrootparts", @@ -298,6 +297,6 @@ def setSteps(anaconda): if not iutil.isX86(): dispatch.skipStep("bootloader") + dispatch.skipStep("upgbootloader") - if not iutil.isX86(): - dispatch.skipStep("upgbootloader") + dispatch.skipStep("cleardiskssel", permanent=1) -- 1.7.1.1

2 1

[PATCH f15-branch master] Fix setting of some network values in loader kickstart.
by Radek Vykydal 23 Feb '11

23 Feb '11

Also remove noksdevice handling. It doesn't work anymore, I wonder if it ever have worked or even been used. --- loader/kickstart.c | 94 ++++++++++++++++++++++++++-------------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index 06804f8..7e7379b 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -677,7 +677,7 @@ cleanup: static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *handler) { PyObject *list = getDataList(handler, "network"); - PyObject *ele, *attr, *noksdev; + PyObject *ele, *attr; iface_t iface; if (!list) @@ -695,12 +695,20 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand if (objIsStr(attr, "dhcp") || objIsStr(attr, "bootp")) { loaderData->ipv4 = strdup("dhcp"); loaderData->ipinfo_set = 1; - } else if (loaderData->ipv4) { - loaderData->ipinfo_set = 1; + } else if (objIsStr(attr, "static")) { + _setNetworkString(ele, "ip", &loaderData->ipv4, &loaderData->ipinfo_set); } Py_XDECREF(attr); +#ifdef ENABLE_IPV6 + _setNetworkString(ele, "ipv6", &loaderData->ipv6, &loaderData->ipv6info_set); +#endif + + _setNetworkString(ele, "nameserver", &loaderData->dns, NULL); + _setNetworkString(ele, "netmask", &loaderData->netmask, NULL); + _setNetworkString(ele, "hostname", &loaderData->hostname, NULL); + /* --gateway is common for ipv4 and ipv6, same as in loader UI */ attr = getObject(ele, "gateway", 0); if (isNotEmpty(attr)) { @@ -735,63 +743,57 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand Py_XDECREF(attr); - noksdev = getObject(ele, "notksdevice", 0); - if (!isTrue(noksdev)) { - attr = getObject(ele, "device", 0); - if (isNotEmpty(attr)) { - char *device = PyString_AsString(attr); + attr = getObject(ele, "device", 0); + if (isNotEmpty(attr)) { + char *device = PyString_AsString(attr); - /* If --device=MAC was given, translate into a device name now. */ - if (index(device, ':') != NULL) - loaderData->netDev = iface_mac2device(device); - else - loaderData->netDev = strdup(device); + /* If --device=MAC was given, translate into a device name now. */ + if (index(device, ':') != NULL) + loaderData->netDev = iface_mac2device(device); + else + loaderData->netDev = strdup(device); - loaderData->netDev_set = 1; - } + loaderData->netDev_set = 1; + } - Py_XDECREF(attr); + Py_XDECREF(attr); - _setNetworkString(ele, "dhcpclass", &loaderData->netCls, &loaderData->netCls_set); - _setNetworkString(ele, "ethtool", &loaderData->ethtool, NULL); - _setNetworkString(ele, "essid", &loaderData->essid, NULL); - _setNetworkString(ele, "wepkey", &loaderData->wepkey, NULL); + _setNetworkString(ele, "dhcpclass", &loaderData->netCls, &loaderData->netCls_set); + _setNetworkString(ele, "ethtool", &loaderData->ethtool, NULL); + _setNetworkString(ele, "essid", &loaderData->essid, NULL); + _setNetworkString(ele, "wepkey", &loaderData->wepkey, NULL); - attr = getObject(ele, "noipv4", 0); - if (isTrue(attr)) - flags |= LOADER_FLAGS_NOIPV4; + attr = getObject(ele, "noipv4", 0); + if (isTrue(attr)) + flags |= LOADER_FLAGS_NOIPV4; - Py_XDECREF(attr); + Py_XDECREF(attr); - attr = getObject(ele, "mtu", 0); - if (isNotEmpty(attr)) { - /* Don't free this string! */ - char *mtu = PyString_AsString(attr); + attr = getObject(ele, "mtu", 0); + if (isNotEmpty(attr)) { + /* Don't free this string! */ + char *mtu = PyString_AsString(attr); - errno = 0; - loaderData->mtu = strtol(mtu, NULL, 10); + errno = 0; + loaderData->mtu = strtol(mtu, NULL, 10); - if ((errno == ERANGE && (loaderData->mtu == LONG_MIN || - loaderData->mtu == LONG_MAX)) || - (errno != 0 && loaderData->mtu == 0)) { - logMessage(ERROR, "%s: %d: %m", __func__, __LINE__); - abort(); - } + if ((errno == ERANGE && (loaderData->mtu == LONG_MIN || + loaderData->mtu == LONG_MAX)) || + (errno != 0 && loaderData->mtu == 0)) { + logMessage(ERROR, "%s: %d: %m", __func__, __LINE__); + abort(); } + } - Py_XDECREF(attr); + Py_XDECREF(attr); #ifdef ENABLE_IPV6 - attr = getObject(ele, "noipv6", 0); - if (isTrue(attr)) - flags |= LOADER_FLAGS_NOIPV6; - - if (loaderData->ipv6) - loaderData->ipv6info_set = 1; + attr = getObject(ele, "noipv6", 0); + if (isTrue(attr)) + flags |= LOADER_FLAGS_NOIPV6; - Py_XDECREF(attr); + Py_XDECREF(attr); #endif - } attr = getObject(ele, "nodns", 0); if (isTrue(attr)) @@ -799,8 +801,6 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand Py_XDECREF(attr); - Py_XDECREF(noksdev); - /* Make sure the network is always up if there's a network line in the * kickstart file, as %post/%pre scripts might require that. */ -- 1.7.2

2 1

[PATCH] Use /dev/.oldtmp instead of /oldtmp when moving around initrd /tmp
by Will Woods 23 Feb '11

23 Feb '11

/dev is definitely a writeable filesystem at this point, so let's use that for temporary storage rather than assuming that / will always be writeable. --- loader/init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/init.c b/loader/init.c index 51ab2a2..6163933 100644 --- a/loader/init.c +++ b/loader/init.c @@ -774,7 +774,7 @@ int main(int argc, char **argv) { /* we want our /tmp to be tmpfs, but we also want to let people hack * their initrds to add things like a ks.cfg, so this has to be a little * tricky */ - rename("/tmp", "/oldtmp"); + copyDirectory("/tmp", "/dev/.oldtmp", copyErrorFn, copyErrorFn); mkdir("/tmp", 0755); printf("mounting /tmp as tmpfs... "); @@ -782,8 +782,8 @@ int main(int argc, char **argv) { fatal_error(1); printf("done\n"); - copyDirectory("/oldtmp", "/tmp", copyErrorFn, copyErrorFn); - unlink("/oldtmp"); + copyDirectory("/dev/.oldtmp", "/tmp", copyErrorFn, copyErrorFn); + unlink("/dev/.oldtmp"); /* Now we have some /tmp space set up, and /etc and /dev point to it. We should be in pretty good shape. */ -- 1.7.4

4 4

[firstboot] We need to quit plymouth before running firstboot (#679171)
by Martin Gracik 23 Feb '11

23 Feb '11

Hiding the splash is not enough. If plymouth is running when we execute firstboot, pressing the Enter key causes it to exit. --- init/firstboot | 4 ---- systemd/firstboot-graphical.service | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/init/firstboot b/init/firstboot index 6e92a84..7286b15 100755 --- a/init/firstboot +++ b/init/firstboot @@ -65,13 +65,9 @@ case "$1" in . /etc/profile.d/lang.sh - /usr/bin/plymouth --hide-splash - /usr/sbin/firstboot $args RETVAL=$? - /usr/bin/plymouth --show-splash - # If firstboot succeeded, chkconfig it off so we don't see the message # every time about starting up firstboot. if [ "$RETVAL" -eq 0 ]; then diff --git a/systemd/firstboot-graphical.service b/systemd/firstboot-graphical.service index fb18796..f4d6934 100644 --- a/systemd/firstboot-graphical.service +++ b/systemd/firstboot-graphical.service @@ -6,12 +6,12 @@ Conflicts=firstboot-text.service [Service] Environment=RUNLEVEL=5 +ExecStartPre=-/bin/plymouth quit ExecStart=/etc/init.d/firstboot start TimeoutSec=0 StandardInput=tty RemainAfterExit=yes Type=oneshot -SysVStartPriority=99 [Install] WantedBy=graphical.target -- 1.7.3.2

2 1

[PATCH f15-branch, master] Attempt at fixing reboot behavior in kickstart (#676968).
by Chris Lumens 23 Feb '11

23 Feb '11

I think that rebooting is accomplished by not specifying halt or reboot, so don't specify either of those. --- loader/kickstart.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index 06804f8..b816b35 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -544,6 +544,7 @@ static void setSELinux(struct loaderData_s * loaderData, PyObject *handler) { } static void setShutdown(struct loaderData_s * loaderData, PyObject *handler) { + PyObject *rebootObj = getObject(constantsMod, "KS_REBOOT", 0); PyObject *shutdownObj = getObject(constantsMod, "KS_SHUTDOWN", 0); PyObject *settingObj = getattr(handler, "reboot", "action"); @@ -555,11 +556,12 @@ static void setShutdown(struct loaderData_s * loaderData, PyObject *handler) { else { if (settingObj == shutdownObj) flags |= LOADER_FLAGS_POWEROFF; - else + else if (settingObj != rebootObj) flags |= LOADER_FLAGS_HALT; } cleanup: + Py_XDECREF(rebootObj); Py_XDECREF(shutdownObj); Py_XDECREF(settingObj); } -- 1.7.1.1

2 1

[PATCH rhel5 0/4] Add blacklist= to RHEL5
by Brian C. Lane 22 Feb '11

22 Feb '11

Here is an untested (and uncompiled) 1st pass at adding a blacklist= kernel command line feature. I'd like to know what you thing, am I on the right track here? I generally don't like adding global extern variables, but in this case I think it is worth it not to have to make more extensive changes in the code. What this does is add support for blacklist=modname on the kernel command line. It blocks loading these modules in the low level module loading code, and it writes out a /etc/modprobe.d/anaconda.conf blacklist file like we do in RHEL6 so that the modules remain blacklisted upon reboot. I retain the parsed /proc/cmdline in memory so that there is no need to come up with some other structure and memory management to keep track of blacklisted modules. If this looks good I'll proceed with testing to make sure it actually works. Brian C. Lane (4): Add global vars to retain parsed /proc/cmdline (#569883) Convert earlyModuleLoad to use cmdline_argv (#569883) Check blacklist= for the module name before loading it (#569883) Write /etc/modprobe.d/anaconda.conf blacklist (#569883) loader2/hardware.c | 35 ++++++++++++----------------------- loader2/loader.c | 6 ++++++ loader2/modules.c | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 25 deletions(-) -- 1.7.4

3 6

[PATCH][rhel6, f15, master] Only apply global passphrase to devices with no passphrase. (#679223)
by David Lehman 22 Feb '11

22 Feb '11

--- pyanaconda/storage/__init__.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index ddac09c..ca43673 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -175,7 +175,8 @@ def storageComplete(anaconda): if anaconda.storage.encryptionPassphrase: for dev in anaconda.storage.devices: - if dev.format.type == "luks" and not dev.format.exists: + if dev.format.type == "luks" and not dev.format.exists and \ + not device.format.hasKey: dev.format.passphrase = anaconda.storage.encryptionPassphrase map(lambda d: anaconda.storage.services.update(d.services), -- 1.7.3.4

2 1

[rhel6-branch] Add the fipscheck library (#679072)
by Martin Gracik 22 Feb '11

22 Feb '11

We need these files to run sshd in fips mode. --- scripts/upd-instroot | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 580be39..bf45a71 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -165,7 +165,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda device-mapper-multipath device-mapper-multipath-libs dhclient dmraid dmraid-libs dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme eject ethtool - elfutils-libelf expat fcoe-utils fipscheck + elfutils-libelf expat fcoe-utils fipscheck fipscheck-lib firstboot fontconfig freetype gail gawk gdb-gdbserver gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf gnome-themes gpm grep gtk2 gtk2-engines hal @@ -534,7 +534,8 @@ usr/$LIBDIR/libsmime3.so usr/$LIBDIR/libssl3.so usr/$LIBDIR/xserver/SecurityPolicy usr/$LIBDIR/.*.hmac -$LIBDIR/.libgcrypt*.hmac +$LIBDIR/libfipscheck.so* +$LIBDIR/.*.hmac usr/bin/[ usr/bin/Xorg usr/bin/Xvnc @@ -548,6 +549,7 @@ usr/bin/eject usr/bin/expr usr/bin/fipscheck usr/bin/.fipscheck.hmac +usr/bin/fipshmac usr/bin/gdbserver usr/bin/gdialog usr/bin/gdk-pixbuf-query-loaders* -- 1.7.3.2

2 1

← Newer
1
2
3
4
5
6
7
8
9
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 February 2011