Skip to content

Commit

Permalink
Few fixes:
Browse files Browse the repository at this point in the history
- Set default hostname to 'dom0'
- Exclude rd.neednet from bootargs
- Drop workaround patches for missing url-lib
  • Loading branch information
fepitre committed Dec 20, 2019
1 parent 48e269b commit c5bc43c
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 133 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 714a4b237a3d88b1462c7ba4233682df1561146d Mon Sep 17 00:00:00 2001
From 121ff650cdb62607a38a76c33d2a286458b0cb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Sun, 15 Dec 2019 18:17:29 +0100
Expand Down
60 changes: 0 additions & 60 deletions 0019-fix-dracut-module-to-work-with-reduced-dependencies.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 62ef6085df00d556d9e1bacb30b062cb574d981b Mon Sep 17 00:00:00 2001
From 950d90199f1a42f460f058cf130ae7512e70b293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Sun, 15 Dec 2019 18:28:13 +0100
Expand Down
55 changes: 0 additions & 55 deletions 0021-Do-not-fail-during-initramfs-start-up-due-to-missing.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cf611b648a7b60cbebc2f58a357fe32a3c433d80 Mon Sep 17 00:00:00 2001
From fae89fe65bb8ec36a9be47bafc3e7189241e86a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Sun, 15 Dec 2019 18:39:15 +0100
Expand All @@ -14,7 +14,7 @@ Adapted from a98ba275162937a56f7ca1ee5428b00de883677a
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/bootloader/base.py b/pyanaconda/bootloader/base.py
index 84b74afed..b0b65fd1a 100644
index 84b74afed..f7f1ba1ff 100644
--- a/pyanaconda/bootloader/base.py
+++ b/pyanaconda/bootloader/base.py
@@ -814,8 +814,11 @@ class BootLoader(object):
Expand All @@ -25,7 +25,7 @@ index 84b74afed..b0b65fd1a 100644
- if opt not in flags.cmdline:
+ global_no_preserve_args = ["stage2", "root", "rescue", "rd.live.check",
+ "ip", "repo", "ks", "rd.md", "rd.luks",
+ "rd.dm", "rd.lvm.lv", "rd.lvm"]
+ "rd.dm", "rd.lvm.lv", "rd.lvm", "rd.neednet"]
+ for opt in flags.cmdline.keys():
+ if opt in global_no_preserve_args:
continue
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 75a443617e9fbfa1930796b41d5eae6ef87be197 Mon Sep 17 00:00:00 2001
From 4370610b45cbf49d7c04fd298d9c8b90a080f619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Sun, 15 Dec 2019 18:42:49 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9b3229a17b7dbf32864d4e7492172f8a43534af9 Mon Sep 17 00:00:00 2001
From eef66c0efe346d23d8aad3eff4404cd70daf2b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Tue, 17 Dec 2019 10:26:11 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 77fa6e67ebbdf564a5efd1c6781faad75234aa59 Mon Sep 17 00:00:00 2001
From 91a7a198bb32c0e5b0638c73423450476ad9ea16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Tue, 17 Dec 2019 13:47:10 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 437ee5ec32dcde014a2d0efd7adaf6181092ab5c Mon Sep 17 00:00:00 2001
From ee0488f02423552a9dd404496d35cff7d1d8758b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Thu, 19 Dec 2019 16:32:48 +0100
Expand Down
40 changes: 40 additions & 0 deletions 0026-Set-default-hostname-to-dom0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
From b4ebe20d79f5c73c7b9be6d2981c934b83dfb609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Fri, 20 Dec 2019 10:23:25 +0100
Subject: [PATCH] Set default hostname to 'dom0'

---
pyanaconda/modules/network/network.py | 2 +-
pyanaconda/network.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/modules/network/network.py b/pyanaconda/modules/network/network.py
index d5e348e01..75bfca096 100644
--- a/pyanaconda/modules/network/network.py
+++ b/pyanaconda/modules/network/network.py
@@ -62,7 +62,7 @@ class NetworkModule(KickstartModule):
self._firewall_module = FirewallModule()

self.hostname_changed = Signal()
- self._hostname = "localhost.localdomain"
+ self._hostname = "dom0"

self.current_hostname_changed = Signal()
self._hostname_service_proxy = None
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index cd97007d2..b91be3b4d 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -45,7 +45,7 @@ from pyanaconda.modules.common.structures.network import NetworkDeviceInfo
from pyanaconda.anaconda_loggers import get_module_logger
log = get_module_logger(__name__)

-DEFAULT_HOSTNAME = "localhost.localdomain"
+DEFAULT_HOSTNAME = "dom0"

network_connected = None
network_connected_condition = threading.Condition()
--
2.21.0

17 changes: 8 additions & 9 deletions anaconda.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@ Patch14: 0015-Drop-NTP-configuration-spoke.patch
Patch15: 0016-Do-not-add-resume-kernel-option.patch
Patch16: 0017-Avoid-adding-duplicated-kernel-entries.patch
Patch17: 0018-Set-default-scheme-in-custom-partitioning.patch
Patch18: 0019-fix-dracut-module-to-work-with-reduced-dependencies.patch
Patch19: 0020-Use-kernel-install-instead-of-grubby-to-regenerate.patch
Patch20: 0021-Do-not-fail-during-initramfs-start-up-due-to-missing.patch
Patch21: 0022-Drop-useless-on-Qubes-dependencies-on-network-filesy.patch
Patch22: 0023-Use-installer-kernel-parameters-as-default-for-insta.patch
Patch23: 0024-Generate-proper-extlinux.conf.patch
Patch24: 0025-root_password-remove-ssh-options.patch
Patch25: 0026-Do-not-mount-pre-existing-partitions-and-do-not-dete.patch
Patch26: 0027-Set-encrypted-partitioning-by-default.patch
Patch18: 0019-Use-kernel-install-instead-of-grubby-to-regenerate.patch
Patch19: 0020-Drop-useless-on-Qubes-dependencies-on-network-filesy.patch
Patch20: 0021-Use-installer-kernel-parameters-as-default-for-insta.patch
Patch21: 0022-Generate-proper-extlinux.conf.patch
Patch22: 0023-root_password-remove-ssh-options.patch
Patch23: 0024-Do-not-mount-pre-existing-partitions-and-do-not-dete.patch
Patch24: 0025-Set-encrypted-partitioning-by-default.patch
Patch25: 0026-Set-default-hostname-to-dom0.patch

# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
Expand Down

0 comments on commit c5bc43c

Please sign in to comment.