Anaconda-devel September 2011

anaconda-devel@lists.fedoraproject.org

24 participants
81 discussions

[f16-branch] Do not show loop devices in the filtering UI.
by Ales Kozumplik 26 Sep '11

26 Sep '11

Previously, getting the parted object for a loop device failed and so we skipped it. That no longer happens, parted returns a valid object, so we need to explicitly filter loop devices out. Resolves: rhbz#739828 --- pyanaconda/iw/filter_gui.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py index a2aef98..7acf30e 100644 --- a/pyanaconda/iw/filter_gui.py +++ b/pyanaconda/iw/filter_gui.py @@ -412,6 +412,7 @@ class FilterWindow(InstallWindow): def _getFilterDisks(self): """ Return a list of disks to pass to MultipathTopology. """ return filter(lambda d: udev_device_is_disk(d) and \ + not udev_device_is_loop(d) and \ not udev_device_is_dm(d) and \ not udev_device_is_md(d) and \ not udev_device_get_md_container(d), -- 1.7.6

2 1

f16 patches
by David Lehman 23 Sep '11

23 Sep '11

Patch 3 can wait until after beta. The other three are all still being tested but are intended for beta.

2 8

[PATCH rhel5-branch] Accept dotted-quad netmask for IPv4 in loader UI (#719578)
by Radek Vykydal 23 Sep '11

23 Sep '11

Resolves: rhbz#719578 Port from master. --- loader2/net.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader2/net.c b/loader2/net.c index dc84983..7769191 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -91,11 +91,15 @@ char *nfsServerPrompt = \ static void cidrCallback(newtComponent co, void * dptr) { struct intfconfig_s * data = dptr; int cidr, upper = 0; + struct in_addr addr; if (co == data->cidr4Entry) { if (data->cidr4 == NULL && data->ipv4 == NULL) return; + if (inet_pton(AF_INET, data->cidr4, &addr) >= 1) + return; + cidr = atoi(data->cidr4); upper = 32; } else if (co == data->cidr6Entry) { -- 1.7.4

2 1

[lorax] Add xen-kbdfront package to initrd (#740378)
by Martin Gracik 23 Sep '11

23 Sep '11

--- share/ramdisk.ltmpl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/share/ramdisk.ltmpl b/share/ramdisk.ltmpl index b020183..d57766c 100644 --- a/share/ramdisk.ltmpl +++ b/share/ramdisk.ltmpl @@ -160,6 +160,7 @@ install "volume_key" install "volume_key-libs" install "wget" install "wqy-microhei-fonts" +install "xen-kbdfront" install "xfsprogs" install "xorg-x11-drivers" install "xorg-x11-fonts-ethiopic" -- 1.7.3.2

2 1

[rhel6-branch] grub: write 'ip=eth0:dhcp, auto6' instead of 'ip=eth0:dhcp ip=eth0:auto6'
by Ales Kozumplik 22 Sep '11

22 Sep '11

Unit test included. Resolves: rhbz#740222 --- booty/bootloaderInfo.py | 32 +++++++++++++++++++++++++++++++ tests/booty_test/bootloaderInfo_test.py | 28 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 tests/booty_test/bootloaderInfo_test.py diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index e3b5d34..4e1e7d3 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -86,6 +86,36 @@ def rootIsDevice(dev): class KernelArguments: + def _merge_ip(self, args): + """ + Find ip= arguments targetting the same interface and merge them. + """ + # partition the input + def partition_p(arg): + # we are only interested in ip= parameters that use some kind of + # automatic network setup: + return arg.startswith("ip=") and arg.count(":") == 1 + ip_params = filter(partition_p, args) + rest = set(filter(lambda p: not partition_p(p), args)) + # strip away 'ip=' and split at the colon: + ip_params = map(lambda p: p[3:], ip_params) + ip_params = map(lambda p: p.split(":"), ip_params) + # create mapping from nics to their configurations + config = {} + for (nic, cfg) in ip_params: + if nic in config: + config[nic].append(cfg) + else: + config[nic] = [cfg] + + # output the new parameters: + ip_params = set() + for nic in config: + ip_params.add("ip=%s:%s" % (nic, ",".join(sorted(config[nic])))) + rest.update(ip_params) + + return rest + def getDracutStorageArgs(self, devices): args = set() types = {} @@ -135,6 +165,8 @@ class KernelArguments: all_args.update(self.args) all_args.update(self.appendArgs) + all_args = self._merge_ip(all_args) + return " ".join(all_args) def set(self, args): diff --git a/tests/booty_test/bootloaderInfo_test.py b/tests/booty_test/bootloaderInfo_test.py new file mode 100644 index 0000000..fe057a8 --- /dev/null +++ b/tests/booty_test/bootloaderInfo_test.py @@ -0,0 +1,28 @@ +import mock + +class KernelArgumentsTestCase(mock.TestCase): + def setUp(self): + self.setupModules( + ['_isys', 'logging', 'anaconda_log', 'block']) + + def tearDown(self): + self.tearDownModules() + + def test_merge_ip(self): + import booty + ka = booty.KernelArguments(mock.Mock()) + + # test that _merge_ip() doesnt break the simple case: + args = set(["one", "two", "ip=eth0:dhcp"]) + self.assertEqual(ka._merge_ip(args), + set(["one", "two", "ip=eth0:dhcp"])) + + # test that it does what it's supposed to: + args = set(["one", "two", "ip=eth0:dhcp", "ip=eth0:auto6", + "ip=wlan0:dhcp", + "ip=10.34.102.102::10.34.39.255:24:aklab:eth2:none"]) + self.assertEqual(ka._merge_ip(args), set([ + "one", "two", + "ip=wlan0:dhcp", + "ip=10.34.102.102::10.34.39.255:24:aklab:eth2:none", + "ip=eth0:auto6,dhcp"])) -- 1.7.6

1 0

[rhel5-branch] Remove old labels before labeling disk entries (#566668)
by Martin Gracik 22 Sep '11

22 Sep '11

--- fsset.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fsset.py b/fsset.py index 51519f6..6b87ff5 100644 --- a/fsset.py +++ b/fsset.py @@ -1822,6 +1822,9 @@ MAILADDR root sys.exit(0) def labelEntry(self, entry, chroot): + # remove old label + entry.setLabel(None) + label = entry.device.getLabel() if label: entry.setLabel(label) -- 1.7.3.2

2 1

[PATCH] Fix detection of RAW driverdisc partitions while in manual selection mode
by Martin Sivak 22 Sep '11

22 Sep '11

Related: rhbz#732496 --- loader/driverdisk.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/loader/driverdisk.c b/loader/driverdisk.c index 37f71f1..df9d311 100644 --- a/loader/driverdisk.c +++ b/loader/driverdisk.c @@ -432,6 +432,8 @@ int getRemovableDevices(char *** devNames) { return numDevices; } +static void getDDFromDev(struct loaderData_s * loaderData, char * dev, GTree *moduleState); + /* Prompt for loading a driver from "media" * * class: type of driver to load. @@ -442,7 +444,7 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData, char * device = NULL, * part = NULL, * ddfile = NULL; char ** devNames = NULL; enum { DEV_DEVICE, DEV_PART, DEV_CHOOSEFILE, DEV_LOADFILE, - DEV_INSERT, DEV_LOAD, DEV_PROBE, + DEV_INSERT, DEV_LOAD, DEV_PROBE, DEV_LOADRAW, DEV_DONE } stage = DEV_DEVICE; int rc, num = 0; int dir = 1; @@ -548,6 +550,12 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData, break; } + /* check if the partition contains the DD in raw format */ + if (verifyDriverDisk("/tmp/dpart") == LOADER_OK) { + stage = DEV_LOADRAW; + break; + } + ddfile = newt_select_file(_("Select driver disk image"), _("Select the file which is your driver " "disk image."), @@ -712,6 +720,12 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData, break; } + + case DEV_LOADRAW: + getDDFromDev(loaderData, part, moduleState); + stage = DEV_PROBE; + break; + case DEV_DONE: break; } @@ -799,7 +813,6 @@ void getDDFromSource(struct loaderData_s * loaderData, char * src, GTree *module } -static void getDDFromDev(struct loaderData_s * loaderData, char * dev, GTree *moduleState); void useKickstartDD(struct loaderData_s * loaderData, int argc, char ** argv) { -- 1.7.4.4

3 3

[f16-branch] Fix sigsegv in setKickstartNetwork() (strdup() from a NULL).
by Ales Kozumplik 22 Sep '11

22 Sep '11

See also 88eaea1d9e3811e08e56174f93d9362e95494e77. Resolves: rhbz#734967 --- loader/kickstart.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index f96a7a9..ebb249d 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -681,7 +681,6 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand Py_ssize_t i; PyObject *list = getDataList(handler, "network"); iface_t iface; - gboolean device_flushed = FALSE; char *cmdline_device = NULL; if (!list) @@ -783,11 +782,12 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand loaderData->netDev_set = 1; logMessage(INFO, "kickstart network command - device %s", loaderData->netDev); } else { - cmdline_device = strdup(loaderData->netDev); - loaderData->netDev_set = 0; - free(loaderData->netDev); - loaderData->netDev = NULL; - device_flushed = TRUE; + if (loaderData->netDev) { + /* save it so we can use it if wifi activation fails */ + cmdline_device = loaderData->netDev; + loaderData->netDev = NULL; + loaderData->netDev_set = 0; + } logMessage(INFO, "kickstart network command - unspecified device"); } @@ -851,12 +851,10 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand ibft_present())) { logMessage(INFO, "activating first device from kickstart because network is needed"); if (process_kickstart_wifi(loaderData) != WIFI_ACTIVATION_OK) { - if (device_flushed) { - loaderData->netDev = strdup(cmdline_device); + if (cmdline_device) { + loaderData->netDev = cmdline_device; loaderData->netDev_set = 1; - free(cmdline_device); cmdline_device = NULL; - device_flushed = FALSE; } activateDevice(loaderData, &iface); } @@ -867,12 +865,10 @@ static void setKickstartNetwork(struct loaderData_s * loaderData, PyObject *hand if (isTrue(attr)) { logMessage(INFO, "activating because --activate flag is set"); if (process_kickstart_wifi(loaderData) != WIFI_ACTIVATION_OK) { - if (device_flushed) { - loaderData->netDev = strdup(cmdline_device); + if (cmdline_device) { + loaderData->netDev = cmdline_device; loaderData->netDev_set = 1; - free(cmdline_device); cmdline_device = NULL; - device_flushed = FALSE; } activateDevice(loaderData, &iface); } -- 1.7.6

2 1

Better way to integrate tboot support into the installation process
by Wei, Gang 22 Sep '11

22 Sep '11

Hi, According to Adam Williamson's reply in Bug 734286 "tboot package was not included in install DVD yet" https://bugzilla.redhat.com/show_bug.cgi?id=734286, adding tboot package to comps would cause it to be selectable on the dvd, but only in the manual package selection screen, which is very optional and which not many people use. It would probably be best to talk to the anaconda team about the best way to integrate tboot support into the installation process. So I come back here and seek for help. Do you think it is acceptable to support tboot package selection as described in the feature request page https://fedoraproject.org/wiki/Features/Trusted_Boot#Detailed_Description? Or any better suggestion to ease the package selection for tboot? Further, if the patch should be cooked by myself, then could you give any hint about what module/files I need to change and any further project/team(s) I need to talk to? If I want to make it merged into F16 branch, when is the deadline? Thanks Jimmy

2 2

[PATCH 1/2] Move dependency info into the unit files
by Will Woods 21 Sep '11

21 Sep '11

--- data/systemd/Makefile.am | 10 +--------- data/systemd/anaconda.target | 2 +- data/systemd/loader.service | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index 2042981..196e90d 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -17,14 +17,6 @@ # # Author: Chris Lumens <clumens(a)redhat.com> -systemddir = /lib/systemd/system +systemddir = /lib/systemd/system dist_systemd_DATA = anaconda-shell.service anaconda.target loader.service instperf.service tmp.mount - MAINTAINERCLEANFILES = Makefile.in - -install-exec-local: - mkdir -p $(DESTDIR)/lib/systemd/system/anaconda.target.wants - ln -sf /lib/systemd/system/anaconda-shell.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants - ln -sf /lib/systemd/system/loader.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants - ln -sf /lib/systemd/system/rsyslog.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants - ln -sf /lib/systemd/system/udev-settle.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target index ac6d6e1..844999e 100644 --- a/data/systemd/anaconda.target +++ b/data/systemd/anaconda.target @@ -4,4 +4,4 @@ Requires=basic.target Conflicts=rescue.service rescue.target After=basic.target rescue.service rescue.target AllowIsolate=yes -Wants=anaconda-shell(a)tty2.service anaconda-shell(a)hvc1.service +Wants=loader.service anaconda-shell(a)tty2.service anaconda-shell(a)hvc1.service diff --git a/data/systemd/loader.service b/data/systemd/loader.service index 81c43b5..b6d9f43 100644 --- a/data/systemd/loader.service +++ b/data/systemd/loader.service @@ -1,7 +1,7 @@ [Unit] Description=The anaconda loader -Wants=instperf.service tmp.mount -After=instperf.service tmp.mount +Wants=instperf.service rsyslog.service udev-settle.service +After=instperf.service rsyslog.service udev-settle.service [Service] Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin PYTHONPATH=/tmp/updates TERM=linux -- 1.7.6.2

3 4

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel September 2011