autopatch/anaconda
4
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: autopatch:a8
Branches Tags
autopatch:a8
autopatch:a10s
autopatch:a10
autopatch:a9
...
pull from: autopatch:a10s
Branches Tags
autopatch:a10s
autopatch:a10
autopatch:a9
autopatch:a8

No commits in common. "a8" and "a10s" have entirely different histories.
a8 ... a10s

12 changed files with 228 additions and 185 deletions
Show Stats Expand all files Collapse all files

55
config.yaml
View File

@ -1,43 +1,58 @@
actions:
- replace:
- target: "spec"
find: |
%else
%bcond_with glade
%bcond_with live
%endif
replace: |
%else
%if 0%{?almalinux}
%bcond_without live
%else
%bcond_with glade
%bcond_with live
%endif
%endif
count: 1
- target: "spec"
find: "%autosetup -p 1"
replace: |
%autosetup -p 1
# AlmaLinux install class
cp %{SOURCE1} data/product.d/
# Debrand
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po
%autosetup -p 1
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po
count: 1
- modify_release:
- suffix: ".alma.1"
enabled: true
- changelog_entry:
- name: "Neal Gompa"
email: "ngompa@almalinux.org"
line:
- "Enable Btrfs support for AlmaLinux"
- name: "Eduard Abdullin"
email: "eabdullin@almalinux.org"
line:
- "AlmaLinux changes"
- "Apply AlmaLinux patches"
- "Enable live subpackage by default on AlmaLinux"
- add_files:
- type: "source"
name: "almalinux.conf"
- type: "patch"
name: "0001-Add-Minimal-repo-support.patch"
number: 1001
- type: "patch"
name: "0002-Change-anaconda-background-color.patch"
number: "Latest"
- type: "patch"
name: "anaconda-almalinux-installer-colors.patch"
number: 1000
- type: "patch"
name: "anaconda-almalinux-disable-subscription.patch"
name: "0003-Remove-visible-Fedora-references.patch"
number: "Latest"
- type: "patch"
name: "anaconda-almalinux-disable-cdn-radiobutton.patch"
name: "0004-Revert-storage-Remove-support-for-the-btrfs-command-.patch"
number: "Latest"
- type: "patch"
name: "anaconda-almalinux-remove-visible-rh-references.patch"
name: "0005-data-profile.d-almalinux-Add-Btrfs-support.patch"
number: "Latest"
- type: "patch"
name: "anaconda-almalinux-add-minimal-repo.patch"
number: 1006

24
files/0001-Add-Minimal-repo-support.patch Normal file
View File

@ -0,0 +1,24 @@
From 2b5791f0ed5a4b6886b49eeefeed66511e7218ce Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 16:50:16 +0000
Subject: [PATCH 1/5] Add Minimal repo support
---
pyanaconda/core/constants.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 5232e6d..8e87274 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -58,6 +58,7 @@ DEFAULT_REPOS = [
"BaseOS", # Used by RHEL
"baseos", # Used by CentOS Stream
"eln-baseos", # Used by Fedora ELN
+ "Minimal", # Used by AlmaLinux
]
DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"
--
2.43.5

25
files/0002-Change-anaconda-background-color.patch Normal file
View File

@ -0,0 +1,25 @@
From 7d0eaa2ebb521e327b98171689e4731a7db5d503 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 16:59:05 +0000
Subject: [PATCH 2/5] Change anaconda background color
---
data/anaconda-gtk.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
index f83cf15..e5d859c 100644
--- a/data/anaconda-gtk.css
+++ b/data/anaconda-gtk.css
@@ -95,7 +95,7 @@ infobar.error box {
* to be overridden by a stylesheet in product.img.
*/
-@define-color anaconda_bg_color #2f4265;
+@define-color anaconda_bg_color #0b2335;
.logo-sidebar {
background-color: @anaconda_bg_color;
--
2.43.5

55
files/0003-Remove-visible-Fedora-references.patch Normal file
View File

@ -0,0 +1,55 @@
From 36a77712950b1462573ade28c1bd6f175a201174 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Fri, 9 Aug 2024 17:03:55 +0000
Subject: [PATCH 3/5] Remove visible Fedora references
---
data/liveinst/gnome/fedora-welcome.js | 6 +++---
.../liveinst/gnome/org.fedoraproject.welcome-screen.desktop | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js
index fc42e5d..ce60209 100755
--- a/data/liveinst/gnome/fedora-welcome.js
+++ b/data/liveinst/gnome/fedora-welcome.js
@@ -46,7 +46,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
}
constructor(application) {
- const title = _('Welcome to Fedora!');
+ const title = _('Welcome to AlmaLinux!');
super({
application,
title,
@@ -58,7 +58,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
const statusPage = new Adw.StatusPage({
title,
iconName: 'fedora-logo-icon',
- description: _('This live media can be used to install Fedora or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
+ description: _('This live media can be used to install AlmaLinux or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
});
this.content.set_child(statusPage);
@@ -71,7 +71,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
statusPage.set_child(buttonBox);
const installButton = new Gtk.Button({
- label: _('Install Fedora…'),
+ label: _('Install AlmaLinux…'),
actionName: 'window.install-fedora',
});
installButton.add_css_class('pill');
diff --git a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
index c3551b1..8c9065b 100644
--- a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
+++ b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Fedora
+Name=Welcome to AlmaLinux
Icon=fedora-logo-icon
Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false
--
2.43.5

54
files/0004-Revert-storage-Remove-support-for-the-btrfs-command-.patch Normal file
View File

@ -0,0 +1,54 @@
From 97723cd95779e09d448bae6f0d3eb0313fc875d1 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Sat, 25 Jan 2025 17:14:07 -0500
Subject: [PATCH 4/5] Revert "storage: Remove support for the btrfs command on
RHEL10"
Restore Btrfs support so system installations can use Btrfs and
images can be built using Lorax with Btrfs as the filesystem.
This reverts commit d426413bb7bae72a7f4f6770a567998c75d62a23.
---
pyanaconda/modules/storage/kickstart.py | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/modules/storage/kickstart.py b/pyanaconda/modules/storage/kickstart.py
index f435dd7f4c..e154c79a79 100644
--- a/pyanaconda/modules/storage/kickstart.py
+++ b/pyanaconda/modules/storage/kickstart.py
@@ -100,6 +100,23 @@ class AutoPart(COMMANDS.AutoPart):
return retval
+class BTRFS(COMMANDS.BTRFS):
+ """The btrfs kickstart command."""
+
+ def parse(self, args):
+ """Parse the command."""
+ retval = super().parse(args)
+
+ # Check the file system type.
+ fmt = get_format("btrfs")
+
+ if not fmt.supported or not fmt.formattable:
+ msg = _("Btrfs file system is not supported.")
+ raise KickstartParseError(msg, lineno=self.lineno)
+
+ return retval
+
+
class ClearPart(COMMANDS.ClearPart):
"""The clearpart kickstart command."""
@@ -295,7 +312,7 @@ class StorageKickstartSpecification(KickstartSpecification):
commands = {
"autopart": AutoPart,
"bootloader": COMMANDS.Bootloader,
- "btrfs": COMMANDS.BTRFS,
+ "btrfs": BTRFS,
"clearpart": ClearPart,
"fcoe": Fcoe,
"ignoredisk": IgnoreDisk,
--
2.49.0

35
files/0005-data-profile.d-almalinux-Add-Btrfs-support.patch Normal file
View File

@ -0,0 +1,35 @@
From 5d2bd35eade079c5406c601b371b827729bfd3fe Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@almalinux.org>
Date: Fri, 30 May 2025 14:27:12 -0400
Subject: [PATCH 5/5] data/profile.d/almalinux: Add Btrfs support
As part of enabling Btrfs support, set reasonable defaults for
Btrfs compression similar to Fedora Linux and CentOS Hyperscale
and allow it to be part of the payload of requested packages to
be installed so that installs with Btrfs are not broken out of the box.
---
data/profile.d/almalinux.conf | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/data/profile.d/almalinux.conf b/data/profile.d/almalinux.conf
index b40c556adc..d45d682391 100644
--- a/data/profile.d/almalinux.conf
+++ b/data/profile.d/almalinux.conf
@@ -16,7 +16,14 @@ forbidden_modules =
[Bootloader]
efi_dir = almalinux
+[Storage]
+btrfs_compression = zstd:1
+
[Payload]
+# RHEL removes btrfs-progs, but we want it back
+ignored_packages =
+ ntfsprogs
+
enable_closest_mirror = True
default_source = CLOSEST_MIRROR
--
2.49.0

30
files/almalinux.conf
View File

@ -1,30 +0,0 @@
# Anaconda configuration file for AlmaLinux.
[Product]
product_name = AlmaLinux
[Base Product]
product_name = Red Hat Enterprise Linux
[Anaconda]
# List of enabled Anaconda DBus modules for RHEL.
# but without org.fedoraproject.Anaconda.Modules.Subscription
kickstart_modules =
org.fedoraproject.Anaconda.Modules.Timezone
org.fedoraproject.Anaconda.Modules.Network
org.fedoraproject.Anaconda.Modules.Localization
org.fedoraproject.Anaconda.Modules.Security
org.fedoraproject.Anaconda.Modules.Users
org.fedoraproject.Anaconda.Modules.Payloads
org.fedoraproject.Anaconda.Modules.Storage
org.fedoraproject.Anaconda.Modules.Services
[Bootloader]
efi_dir = almalinux
[Payload]
enable_closest_mirror = True
default_source = CLOSEST_MIRROR
[License]
eula = /usr/share/almalinux-release/EULA

13
files/anaconda-almalinux-add-minimal-repo.patch
View File

@ -1,13 +0,0 @@
diff -Naur anaconda-33.16.6.7/pyanaconda/core/constants.py anaconda-33.16.6.7.minimal/pyanaconda/core/constants.py
--- anaconda-33.16.6.7/pyanaconda/core/constants.py 2022-03-09 12:45:44.000000000 +0000
+++ anaconda-33.16.6.7.minimal/pyanaconda/core/constants.py 2022-05-10 10:43:57.228244800 +0000
@@ -61,7 +61,8 @@
"fedora-modular-server",
"rawhide",
"BaseOS", # Used by RHEL
- "baseos"] # Used by CentOS Stream
+ "baseos", # Used by CentOS Stream
+ "Minimal"] # Used by AlmaLinux
# Get list of repo names which should be used as updates repos
DEFAULT_UPDATE_REPOS = ["updates",

12
files/anaconda-almalinux-disable-cdn-radiobutton.patch
View File

@ -1,12 +0,0 @@
diff -uNrp anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py
--- anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py 2020-08-24 05:10:07.000000000 -0500
+++ anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py 2020-11-16 10:41:09.663907591 -0600
@@ -704,6 +704,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI
self._network_button = self.builder.get_object("networkRadioButton")
self._network_box = self.builder.get_object("networkBox")
+ really_hide(self._cdn_button)
+
self._url_entry = self.builder.get_object("urlEntry")
self._protocol_combo_box = self.builder.get_object("protocolComboBox")
self._iso_chooser_button = self.builder.get_object("isoChooserButton")

14
files/anaconda-almalinux-disable-subscription.patch
View File

@ -1,14 +0,0 @@
diff -uprN a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py
--- a/pyanaconda/ui/gui/spokes/subscription.py 2020-09-04 11:31:43.743451360 +0300
+++ b/pyanaconda/ui/gui/spokes/subscription.py 2020-09-04 11:33:07.002306508 +0300
@@ -540,6 +540,10 @@ class SubscriptionSpoke(NormalSpoke):
# also set the spoke warning banner
self.show_warning_message(error_message)
+ @property
+ def showable(self):
+ return False
+
def initialize(self):
NormalSpoke.initialize(self)
self.initialize_start()

16
files/anaconda-almalinux-installer-colors.patch
View File

@ -1,16 +0,0 @@
diff -uprN a/data/anaconda-gtk.css b/data/anaconda-gtk.css
--- a/data/anaconda-gtk.css 2020-11-16 01:33:12.596735620 +0300
+++ b/data/anaconda-gtk.css 2020-11-16 01:35:17.925684936 +0300
@@ -92,10 +92,11 @@ infobar.error {
@define-color redhat #2d2d2d;
@define-color fedora #2f4265;
+@define-color almalinux #0b2335;
/* theme colors/images */
-@define-color product_bg_color @redhat;
+@define-color product_bg_color @almalinux;
/* logo and sidebar classes */

80
files/anaconda-almalinux-remove-visible-rh-references.patch
View File

@ -1,80 +0,0 @@
diff -Naur anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop
--- anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop 2020-05-25 18:17:00.000000000 +0300
+++ anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop 2021-01-22 07:43:25.007068971 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Red Hat Enterprise Linux
+Name=Welcome to AlmaLinux
Exec=/usr/share/anaconda/gnome/rhel-welcome
Terminal=false
Type=Application
diff -Naur anaconda-33.16.3.26/docs/intro.rst anaconda-33.16.3.26.alma/docs/intro.rst
--- anaconda-33.16.3.26/docs/intro.rst 2020-05-27 07:53:25.000000000 +0300
+++ anaconda-33.16.3.26.alma/docs/intro.rst 2021-01-22 07:43:24.989735757 +0300
@@ -1,8 +1,8 @@
Introduction to Anaconda
========================
-Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux
-and some other distributions.
+Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux,
+AlmaLinux, and some other distributions.
During installation, a target computer's hardware is identified and configured
and the appropriate file systems for the system's architecture are created.
diff -Naur anaconda-33.16.3.26/docs/iscsi.rst anaconda-33.16.3.26.alma/docs/iscsi.rst
--- anaconda-33.16.3.26/docs/iscsi.rst 2018-11-08 13:54:59.000000000 +0300
+++ anaconda-33.16.3.26.alma/docs/iscsi.rst 2021-01-22 07:43:24.988652432 +0300
@@ -139,7 +139,7 @@
The booting problems are either due to incorrectly generated dracut boot
arguments or they are simply dracut bugs.
-Note that many of the iscsi adapters are installed in different Red Hat machines
+Note that many of the iscsi adapters are installed in different AlmaLinux machines
and so the issues can often be reproduced and debugged.
diff -Naur anaconda-33.16.3.26/pyanaconda/core/constants.py anaconda-33.16.3.26.alma/pyanaconda/core/constants.py
--- anaconda-33.16.3.26/pyanaconda/core/constants.py 2021-01-22 07:44:21.084349532 +0300
+++ anaconda-33.16.3.26.alma/pyanaconda/core/constants.py 2021-01-22 07:43:24.897653058 +0300
@@ -160,8 +160,8 @@
)
WARNING_HARDWARE_UNSUPPORTED = N_(
- "This hardware (or a combination thereof) is not supported by Red Hat. For more information "
- "on supported hardware, please refer to http://www.redhat.com/hardware."
+ "This hardware (or a combination thereof) is not supported by AlmaLinux. For more information "
+ "on supported hardware, please refer to https://almalinux.org."
)
# Storage messages
diff -Naur anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js
--- anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js 2021-02-02 13:55:25.000000000 +0300
+++ anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js 2021-07-23 06:36:40.836621474 +0300
@@ -59,7 +59,7 @@
default_width: 600,
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Red Hat Enterprise Linux"),
+ title: _("Welcome to AlmaLinux"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@@ -88,7 +88,7 @@
spacing: 16 });
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try RHEL"), true));
+ tryContent.add(makeLabel(_("Try AlmaLinux"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@@ -104,7 +104,7 @@
let installButton = new Gtk.Button({ child: installContent });
buttonBox.add(installButton);
- this._label = makeLabel(_("You are currently running Red Hat Enterprise Linux from live media.\nYou can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
+ this._label = makeLabel(_("You are currently running AlmaLinux from live media.\nYou can install AlmaLinux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
mainGrid.add(this._label);
installButton.connect('clicked', Lang.bind(this,