anaconda-patches October 2012

anaconda-patches@lists.fedorahosted.org

18 participants
134 discussions

[PATCH] skip vnc prompt with text mode and kickstart
by Brian C. Lane 19 Oct '12

19 Oct '12

From: "Brian C. Lane" <bcl(a)redhat.com> --- anaconda | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anaconda b/anaconda index 5a3611b..745097f 100755 --- a/anaconda +++ b/anaconda @@ -460,6 +460,10 @@ def setupDisplay(anaconda, opts): if iutil.memInstalled() < isys.MIN_GUI_RAM: flags.vncquestion = False + # disable VNC question if text mode is requested and this is a ks install + if anaconda.displayMode == 't' and flags.automatedInstall: + flags.vncquestion = False + # disable VNC question if we were explicitly asked for text in kickstart if anaconda.ksdata.displaymode.displayMode == DISPLAY_MODE_TEXT: flags.vncquestion = False -- 1.7.11.4

2 1

Fix repeated visits through the storage spoke
by David Lehman 18 Oct '12

18 Oct '12

Also fixes various bugs and things I noticed during testing, &c. There's more that I'd like to clean up around this stuff, but I have to push on so I can get the custom spoke feature-complete.

2 20

[PATCH] (v2) Keep hostname when updating ksdata after GUI network configuration (#866516)
by Radek Vykydal 18 Oct '12

18 Oct '12

--- pyanaconda/network.py | 7 +++++-- pyanaconda/ui/gui/spokes/network.py | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 112259a..b4f3b16 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -557,11 +557,14 @@ def dracutBootArguments(ifcfg, storage_ipaddr, hostname=None): return netargs -def kickstartNetworkData(ifcfg, hostname=None): +def kickstartNetworkData(ifcfg=None, hostname=None): from pyanaconda.kickstart import NetworkData kwargs = {} + if not ifcfg and hostname: + return NetworkData(hostname=hostname, bootProto="") + # ipv4 and ipv6 if not ifcfg.get("ESSID"): kwargs["device"] = ifcfg.iface @@ -893,5 +896,5 @@ def networkInitialize(ksdata): if ksdata.network.hostname is None: hostname = getHostname() - nd = NetworkData(hostname=hostname) + nd = kickstartNetworkData(hostname=hostname) ksdata.network.network.append(nd) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 39b320e..f7cb666 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -922,11 +922,14 @@ class NetworkSpoke(NormalSpoke): self.network_control_box = NetworkControlBox(self.builder) def apply(self): + hostname = self.data.network.hostname self.data.network.network = [] for dev in self.network_control_box.listed_devices: network_data = getKSNetworkData(dev) if network_data is not None: self.data.network.network.append(network_data) + nd = kickstartNetworkData(hostname=hostname) + self.data.network.network.append(nd) @property def completed(self): @@ -1044,7 +1047,7 @@ def getKSNetworkData(device): if ifcfg_suffix: device_cfg = NetworkDevice(netscriptsDir, ifcfg_suffix) device_cfg.loadIfcfgFile() - retval = kickstartNetworkData(device_cfg) + retval = kickstartNetworkData(ifcfg=device_cfg) if device.get_iface() in getActiveNetDevs(): retval.activate = True -- 1.7.4

2 1

[PATCH] don't save system time on s390 (#867856)
by Dan Horák 18 Oct '12

18 Oct '12

--- pyanaconda/timezone.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/pyanaconda/timezone.py b/pyanaconda/timezone.py index 6d07317..61f7e75 100644 --- a/pyanaconda/timezone.py +++ b/pyanaconda/timezone.py @@ -96,6 +96,9 @@ def save_hw_clock(timezone): """ + if iutil.isS390(): + return + cmd = "hwclock" args = ["--systohc"] if timezone.isUtc: -- 1.7.7.6

2 1

[PATCH] Keep hostname when updating ksdata after GUI network configuration (#866516)
by Radek Vykydal 18 Oct '12

18 Oct '12

--- pyanaconda/ui/gui/spokes/network.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 39b320e..2290d31 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -922,11 +922,14 @@ class NetworkSpoke(NormalSpoke): self.network_control_box = NetworkControlBox(self.builder) def apply(self): + hostname = self.data.network.hostname self.data.network.network = [] for dev in self.network_control_box.listed_devices: network_data = getKSNetworkData(dev) if network_data is not None: self.data.network.network.append(network_data) + nd = NetworkData(hostname) + ksdata.network.network.append(nd) @property def completed(self): -- 1.7.4

1 1

[PATCH] Don't offer /usr as a mount point (#867558)
by Jesse Keating 17 Oct '12

17 Oct '12

--- pyanaconda/ui/gui/spokes/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index b390f9a..d35ef3e 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -160,7 +160,7 @@ def ui_storage_logger(): def populate_mountpoint_store(store, used_mountpoints): # sure, add whatever you want to this list. this is just a start. - paths = ["/", "/boot", "/home", "/usr", "/var", + paths = ["/", "/boot", "/home", "/srv", "/var", "swap", "biosboot", "prepboot"] for path in paths: if path not in used_mountpoints: -- 1.7.11.4

2 1

[PATCH] Number timezones starting with 1 (#859342)
by Martin Sivak 17 Oct '12

17 Oct '12

--- pyanaconda/ui/tui/spokes/time.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyanaconda/ui/tui/spokes/time.py b/pyanaconda/ui/tui/spokes/time.py index 2cea1b8..cc26ec3 100644 --- a/pyanaconda/ui/tui/spokes/time.py +++ b/pyanaconda/ui/tui/spokes/time.py @@ -69,7 +69,7 @@ class TimeZoneSpoke(NormalTUISpoke): displayed = [TextWidget(z) for z in self._regions] def _prep(i, w): - number = TextWidget("%2d)" % i) + number = TextWidget("%2d)" % (i + 1)) return ColumnWidget([(4, [number]), (None, [w])], 1) # split zones to three columns @@ -85,7 +85,7 @@ class TimeZoneSpoke(NormalTUISpoke): def input(self, args, key): try: - keyid = int(key) + keyid = int(key) - 1 if args: self._selection = "%s/%s" % (args, self._timezones[args][keyid]) self.apply() -- 1.7.11.4

2 1

[rhel6-branch] [PATCH] Do not use boot= in grub with fips=1 and /boot on /
by Vratislav Podzimek 17 Oct '12

17 Oct '12

Resolves: rhbz#851249 Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- booty/bootloaderInfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index 20d25ea..a3d96bf 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -168,8 +168,8 @@ class KernelArguments: if flags.cmdline.get("fips") == "1": bootDev = self.id.storage.mountpoints.get("/boot", rootDev) - bootArgs.add("boot=%s" % bootDev.fstabSpec) if bootDev is not rootDev: + bootArgs.add("boot=%s" % bootDev.fstabSpec) neededDevs = [ rootDev, bootDev ] if self.id.storage.fsset.swapDevices: -- 1.7.11.4

2 1

[PATCH] Add missing pieces for kickstart's encryption cipher option.
by David Lehman 17 Oct '12

17 Oct '12

--- pyanaconda/kickstart.py | 9 +++++---- pyanaconda/storage/__init__.py | 1 + pyanaconda/storage/partitioning.py | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 4c0ef5d..3245bdb 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -241,7 +241,7 @@ class Authconfig(commands.authconfig.FC3_Authconfig): except RuntimeError as msg: log.error("Error running /usr/sbin/authconfig %s: %s", args, msg) -class AutoPart(commands.autopart.F17_AutoPart): +class AutoPart(commands.autopart.F18_AutoPart): def execute(self, storage, ksdata, instClass): from pyanaconda.storage.partitioning import doAutoPartition @@ -256,6 +256,7 @@ class AutoPart(commands.autopart.F17_AutoPart): if self.encrypted: storage.encryptedAutoPart = True storage.encryptionPassphrase = self.passphrase + storage.encryptionCipher = self.cipher storage.autoPartEscrowCert = getEscrowCertificate(storage.escrowCertificates, self.escrowcert) storage.autoPartAddBackupPassphrase = self.backuppassphrase @@ -548,7 +549,7 @@ class Lang(commands.lang.FC3_Lang): def execute(self, *args, **kwargs): localization.write_language_configuration(self, ROOT_PATH) -class LogVol(commands.logvol.F17_LogVol): +class LogVol(commands.logvol.F18_LogVol): def execute(self, storage, ksdata, instClass): for l in self.lvList: l.execute(storage, ksdata, instClass) @@ -1080,12 +1081,12 @@ class PartitionData(commands.partition.F18_PartData): parents=request) storage.createDevice(luksdev) -class Raid(commands.raid.F15_Raid): +class Raid(commands.raid.F18_Raid): def execute(self, storage, ksdata, instClass): for r in self.raidList: r.execute(storage, ksdata, instClass) -class RaidData(commands.raid.F15_RaidData): +class RaidData(commands.raid.F18_RaidData): def execute(self, storage, ksdata, instClass): raidmems = [] devicename = "md%d" % self.device diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 23f7e41..680bc27 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -323,6 +323,7 @@ class Storage(object): self.encryptedAutoPart = False self.autoPartType = AUTOPART_TYPE_LVM self.encryptionPassphrase = None + self.encryptionCipher = None self.escrowCertificates = {} self.autoPartEscrowCert = None self.autoPartAddBackupPassphrase = False diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py index 0b9e99c..fda0fd1 100644 --- a/pyanaconda/storage/partitioning.py +++ b/pyanaconda/storage/partitioning.py @@ -76,6 +76,7 @@ def _scheduleImplicitPartitions(storage, disks): if storage.encryptedAutoPart: fmt_type = "luks" fmt_args = {"passphrase": storage.encryptionPassphrase, + "cipher": storage.encryptionCipher, "escrow_cert": storage.autoPartEscrowCert, "add_backup_passphrase": storage.autoPartAddBackupPassphrase} else: @@ -163,6 +164,7 @@ def _schedulePartitions(storage, disks): if request.encrypted and storage.encryptedAutoPart: fmt_type = "luks" fmt_args = {"passphrase": storage.encryptionPassphrase, + "cipher": storage.encryptionCipher, "escrow_cert": storage.autoPartEscrowCert, "add_backup_passphrase": storage.autoPartAddBackupPassphrase} else: -- 1.7.6.5

2 1

[PATCH][rhel6-branch] Add missing pieces for kickstart encryption cipher option.
by David Lehman 17 Oct '12

17 Oct '12

Related: rhbz#838736 --- kickstart.py | 5 +++-- storage/__init__.py | 1 + storage/formats/luks.py | 2 ++ storage/partitioning.py | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kickstart.py b/kickstart.py index 32389a6..ec9ca90 100644 --- a/kickstart.py +++ b/kickstart.py @@ -234,7 +234,7 @@ class Authconfig(commands.authconfig.FC3_Authconfig): def execute(self, anaconda): anaconda.id.auth = self.authconfig -class AutoPart(commands.autopart.F12_AutoPart): +class AutoPart(commands.autopart.RHEL6_AutoPart): def execute(self, anaconda): # sets up default autopartitioning. use clearpart separately # if you want it @@ -244,6 +244,7 @@ class AutoPart(commands.autopart.F12_AutoPart): if self.encrypted: anaconda.id.storage.encryptedAutoPart = True anaconda.id.storage.encryptionPassphrase = self.passphrase + anaconda.id.storage.encryptionCipher = self.cipher anaconda.id.storage.autoPartEscrowCert = \ getEscrowCertificate(anaconda, self.escrowcert) anaconda.id.storage.autoPartAddBackupPassphrase = \ @@ -930,7 +931,7 @@ class Reboot(commands.reboot.FC6_Reboot): def execute(self, anaconda): anaconda.id.ksdata.skipSteps.append("complete") -class RaidData(commands.raid.F12_RaidData): +class RaidData(commands.raid.RHEL6_RaidData): def execute(self, anaconda): raidmems = [] devicename = "md%d" % self.device diff --git a/storage/__init__.py b/storage/__init__.py index 805514c..cd70cfa 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -311,6 +311,7 @@ class Storage(object): self.clearPartChoice = None self.encryptedAutoPart = False self.encryptionPassphrase = None + self.encryptionCipher = None self.autoPartEscrowCert = None self.autoPartAddBackupPassphrase = False self.encryptionRetrofit = False diff --git a/storage/formats/luks.py b/storage/formats/luks.py index e16f5c6..5654376 100644 --- a/storage/formats/luks.py +++ b/storage/formats/luks.py @@ -109,6 +109,8 @@ class LUKS(DeviceFormat): def writeKS(self, f): f.write(" --encrypted") + if self.cipher: + f.write(" --cipher=\"%s\"" % self.cipher) @property def dict(self): diff --git a/storage/partitioning.py b/storage/partitioning.py index b038c23..e20a18f 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -68,6 +68,7 @@ def _createFreeSpacePartitions(anaconda): if anaconda.id.storage.encryptedAutoPart: fmt_type = "luks" fmt_args = {"escrow_cert": anaconda.id.storage.autoPartEscrowCert, + "cipher": anaconda.id.storage.encryptionCipher, "add_backup_passphrase": anaconda.id.storage.autoPartAddBackupPassphrase} else: fmt_type = "lvmpv" -- 1.7.6.5

2 1

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches October 2012