anaconda-patches

anaconda-patches@lists.fedorahosted.org

11180 discussions

[PATCH] Fix dhcpclass to work both via kickstart and the boot cmdline.
by Chris Lumens 05 Jul '16

05 Jul '16

This does two things: First, if inst.dhcpclass= was given on the command line, make sure the /etc/dhclient.conf file is copied over to the anaconda environment. NM will read this file and merge its contents with the device-specific ones before running dhclient. This preserves the command line setting should we re-run dhclient later (like, on a kickstart install). Second, if network --dhcpclass= is given in a kickstart file, write out a device-specific dhclient config blob in /etc/dhcp. This file will then get copied over to the anaconda environment. NM will merge it, just like in the first case. Resolves: rhbz#1293051 --- dracut/Makefile.am | 1 + dracut/anaconda-copy-dhclient.sh | 4 ++++ dracut/module-setup.sh | 1 + dracut/parse-kickstart | 10 +++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 dracut/anaconda-copy-dhclient.sh diff --git a/dracut/Makefile.am b/dracut/Makefile.am index b389a34..04fe8f7 100644 --- a/dracut/Makefile.am +++ b/dracut/Makefile.am @@ -33,6 +33,7 @@ dist_dracut_SCRIPTS = module-setup.sh \ anaconda-diskroot \ anaconda-copy-ks.sh \ anaconda-copy-cmdline.sh \ + anaconda-copy-dhclient.sh \ anaconda-copy-s390ccwconf.sh \ anaconda-ifcfg.sh \ fetch-kickstart-net.sh \ diff --git a/dracut/anaconda-copy-dhclient.sh b/dracut/anaconda-copy-dhclient.sh new file mode 100755 index 0000000..b38da5b --- /dev/null +++ b/dracut/anaconda-copy-dhclient.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# Copy over dhclient config files to the anaconda environment +[ -d /etc/dhcp ] && copytree /etc/dhcp /run/initramfs/state/etc/dhcp/ +[ -f /etc/dhclient.conf ] && cp /etc/dhclient.conf /run/initramfs/state/etc/ diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh index 5afdfcb..c3b879d 100755 --- a/dracut/module-setup.sh +++ b/dracut/module-setup.sh @@ -38,6 +38,7 @@ install() { inst_hook pre-pivot 50 "$moddir/anaconda-copy-ks.sh" inst_hook pre-pivot 50 "$moddir/anaconda-copy-cmdline.sh" inst_hook pre-pivot 50 "$moddir/anaconda-copy-s390ccwconf.sh" + inst_hook pre-pivot 90 "$moddir/anaconda-copy-dhclient.sh" inst_hook pre-pivot 99 "$moddir/save-initramfs.sh" inst_hook pre-shutdown 50 "$moddir/anaconda-pre-shutdown.sh" # kickstart parsing, WOOOO diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index bc9cbdd..e26bd92 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -460,7 +460,7 @@ def ksnet_to_ifcfg(net, filename=None): if net.nodefroute: ifcfg['DEFROUTE'] = "no" - # FUTURE: dhcpclass, ethtool, essid/wepkey/wpakay, etc. + # FUTURE: ethtool, essid/wepkey/wpakey, etc. if net.bootProto == 'dhcp': srcpath = "/tmp/dhclient.%s.lease" % dev @@ -471,6 +471,14 @@ def ksnet_to_ifcfg(net, filename=None): os.makedirs(dstdir) shutil.copyfile(srcpath, dstpath) + if net.dhcpclass: + dstdir = "/etc/dhcp" + if not os.path.isdir(dstdir): + os.makedirs(dstdir) + + with open("%s/dhclient-%s.conf" % (dstdir, dev), "w") as f: + f.write("send vendor-class-identifier \"%s\";" % net.dhcpclass) + if net.bondslaves: ifcfg.pop('HWADDR', None) ifcfg['TYPE'] = "Bond" -- 2.4.3

2 1

[blivet/1.20-devel] Restore the correct default partition table type for AArch64 EFI.
by d.marlin 23 Jun '16

23 Jun '16

From: "d.marlin" <dmarlin(a)redhat.com> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com> Resolves: rhbz#1349130 --- blivet/platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/platform.py b/blivet/platform.py index 63c566b..d1217fd 100644 --- a/blivet/platform.py +++ b/blivet/platform.py @@ -268,7 +268,7 @@ class MacEFI(EFI): class Aarch64EFI(EFI): _non_linux_format_types = ["vfat", "ntfs"] - _disklabel_types = ["msdos", "gpt"] + _disklabel_types = ["gpt", "msdos"] class PPC(Platform): _ppcMachine = arch.getPPCMachine() -- 1.8.3.1

2 1

[master 1/1] Fix the name sensitivity in the custom spoke.
by dashea 07 Jun '16

07 Jun '16

From: David Shea <dshea(a)redhat.com> When switching from an existing device to a non-existing device of the same type, the sensitivity of the "Name" field was not being updated. Add an extra call to the combo box change signal handler to handle this case. --- pyanaconda/ui/gui/spokes/custom.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 769c6dd..01b216e 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1552,8 +1552,14 @@ def _populate_right_side(self, selector): self._setup_fstype_combo(device) # Set up the device type combo. + orig_device_type = self._get_current_device_type() device_type = self._setup_device_type_combo(device, device_name) + # If the device type did not change, run the signal handler anyway + # to update widgets for the new device + if orig_device_type == device_type: + self.on_device_type_changed(self._typeCombo) + fancy_set_sensitive(self._fsCombo, self._reformatCheckbox.get_active() and device_type != DEVICE_TYPE_BTRFS) @@ -1586,7 +1592,8 @@ def _populate_right_side(self, selector): self._populate_raid(get_raid_level(device)) self._populate_container(device=use_dev) - # do this last in case this was set sensitive in on_device_type_changed + + # do this last to override the decision made by on_device_type_changed if necessary if use_dev.exists or use_dev.type == "btrfs volume": fancy_set_sensitive(self._nameEntry, False) -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/92662b3c7fec4478472381387cd5…

1 0

New: [rhinstaller/anaconda/pulls/665 master] Fix the name sensitivity in the custom spoke.
by dashea 07 Jun '16

07 Jun '16

When switching from an existing device to a non-existing device of the same type, the sensitivity of the "Name" field was not being updated. Add an extra call to the combo box change signal handler to handle this case. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/665

1 0

Re: [rhinstaller/anaconda/pulls/665 master] Fix the name sensitivity in the custom spoke.
by dashea 07 Jun '16

07 Jun '16

Added label: master. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/665

1 0

Re: [rhinstaller/anaconda/pulls/665 master] Fix the name sensitivity in the custom spoke.
by dashea 07 Jun '16

07 Jun '16

Added label: rhel7-branch. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/665

1 0

Re: [rhinstaller/anaconda/pulls/664 rhel7-branch] Fix a covscan warning about fetch-driver-net (#1269915)
by dashea 07 Jun '16

07 Jun '16

Added label: ACK. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/664

1 0

Re: [rhinstaller/anaconda/pulls/664 rhel7-branch] Fix a covscan warning about fetch-driver-net (#1269915)
by dashea 07 Jun '16

07 Jun '16

Looks fine to me. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/664

1 0

Re: [rhinstaller/blivet/pulls/434 3.0-devel] Configuration actions
by dashea 07 Jun '16

07 Jun '16

I notice this doesn't really do any explicit checking of the new value. I think any errors would come up in `apply`, which I'm not sure is what we want -- I think it might be better to check it from the constructor. Also, I'm not sure what the value is of setting `self._run` in the action class. Otherwise I think it looks good. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/434

1 0

Re: [rhinstaller/blivet/pulls/433 3.0-devel] Quickfix of merge bugs
by dashea 07 Jun '16

07 Jun '16

Looks good to me too. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/433

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches