Compare commits

...

No commits in common. "c8" and "a8-beta" have entirely different histories.
c8 ... a8-beta

9 changed files with 250 additions and 8 deletions

View File

@ -1 +1 @@
e074e8163d235feb8e027698ec607efe2144f1a3 SOURCES/anaconda-33.16.8.9.tar.bz2
7450b69534ac5ce10f8698270153984ec9871944 SOURCES/anaconda-33.16.10.4.tar.bz2

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/anaconda-33.16.8.9.tar.bz2
SOURCES/anaconda-33.16.10.4.tar.bz2

30
SOURCES/almalinux.conf Normal file
View File

@ -0,0 +1,30 @@
# 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

View File

@ -0,0 +1,13 @@
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",

View File

@ -0,0 +1,12 @@
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")

View File

@ -0,0 +1,14 @@
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()

View File

@ -0,0 +1,16 @@
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 */

View File

@ -0,0 +1,80 @@
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,

View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 33.16.8.9
Release: 1%{?dist}
Version: 33.16.10.4
Release: 1%{?dist}.alma
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -11,7 +11,15 @@ URL: http://fedoraproject.org/wiki/Anaconda
# ./autogen.sh
# make dist
Source0: %{name}-%{version}.tar.bz2
# AlmaLinux install class
Source1: almalinux.conf
# AlmaLinux
Patch1000: anaconda-almalinux-installer-colors.patch
Patch1001: anaconda-almalinux-disable-subscription.patch
Patch1002: anaconda-almalinux-disable-cdn-radiobutton.patch
Patch1003: anaconda-almalinux-remove-visible-rh-references.patch
Patch1004: anaconda-almalinux-add-minimal-repo.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -33,7 +41,7 @@ Source0: %{name}-%{version}.tar.bz2
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
%define pykickstartver 3.16.15-1
%define pykickstartver 3.16.16-1
%define pypartedver 2.5-2
%define rpmver 4.10.0
%define simplelinever 1.1.3-1
@ -264,6 +272,12 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep
%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
%build
# use actual build-time release number, not tarball creation time release number
@ -367,13 +381,77 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 33.16.10.4-1.alma
- AlmaLinux changes
* Fri Feb 16 2024 Jiri Konecny <jkonecny@redhat.com> - 33.16.10.4-1
- Lower log file permission in /tmp (jkonecny)
Resolves: RHEL-23344
- Add utility function to set file mode (jkonecny)
Related: RHEL-23344
* Wed Feb 07 2024 Martin Kolman <mkolman@redhat.com> - 33.16.10.3-1
- Fixed file-write operation to a public directory (ataf)
Resolves: RHEL-23344
* Tue Jan 23 2024 Martin Kolman <mkolman@redhat.com> - 33.16.10.2-1
- Propagate a lazy proxy of the storage model (vponcova)
Resolves: RHEL-16276
- rescue: Don't allow to mount systems without a root device (vponcova)
Resolves: RHEL-4784
* Wed Dec 13 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.10.1-1
- timezone: for kickstart allow also timezones not offered by GUI (rvykydal)
Resolves: RHEL-13151
Resolves: RHEL-4795
- Rename Organization to Organization ID on subscription screen (mkolman)
Resolves: RHEL-11168
* Mon Sep 18 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.9.5-1
- [ja_JP] - Need to update string on anaconda screen for installation completed
Resolves: rhbz#2216746
* Wed Aug 09 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.9.4-1
- iscsi: Allow changing iSCSI initiator name once set (vtrefny)
Resolves: rhbz#2223980
* Tue Jul 11 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.9.3-1
- Be more indulgent when reclaiming disk space (jstodola)
Resolves: rhbz#1855371
- Do not print error on inst.ks=cdrom|hd (jkonecny)
Resolves: rhbz#2211857
* Mon Jun 12 2023 Vladimír Slávik <vslavik@redhat.com> - 33.16.9.2-1
- Stop infinite wait for CDROM when KS is processed (jkonecny)
Resolves: rhbz#2209602
- Apply --noverifyssl option for liveimg kickstart command (jstodola)
Resolves: rhbz#1886985
- Change driver_updates exit info messages to debug (jkonecny)
Related: rhbz#2154904
* Thu May 11 2023 Radek Vykydal <rvykydal@redhat.com> - 33.16.9.1-1
- driver_updates: migrate driver_updates.py to pep8 format (jkonecny)
Related: rhbz#2154904
- driver_updates: adding tests for the new logging solution (jkonecny)
Related: rhbz#2154904
- driver_updates: add lot of debug logs for easier debugging (jkonecny)
Related: rhbz#2154904
- driver_updates: extend where we print log messages (jkonecny)
Resolves: rhbz#2154904
- Add DNS search and ignore options from kickstart (vslavik)
Resolves: rhbz#1656662
- Add DNS search and ignore options from kickstart (vslavik)
Resolves: rhbz#1656662
- Add missing documentation about OEMDRV (jkonecny)
Related: rhbz#1770969
- oemdrv: wait up to 5 seconds for disks to be handled (rmetrich)
Resolves: rhbz#1770969
* Fri Mar 17 2023 Martin Kolman <mkolman@redhat.com> - 33.16.8.9-1
- Update translations
Resolves: rhbz#2139689
* Thu Feb 09 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.8.8-1
- Underscore present in Spanish translation of 'TIME & DATE'
Resolves: rhbz#2148998
- Update outdated translations
* Thu Feb 02 2023 Jiri Konecny <jkonecny@redhat.com> - 33.16.8.7-1
- Report registration errors from kickstart (mkolman)
@ -447,7 +525,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
Resolves: rhbz#2068195
- Install rdma-core if infiniband network device is found (rvykydal)
Resolves: rhbz#2050356
* Wed Jul 20 2022 Jiri Konecny <jkonecny@redhat.com> - 33.16.7.9-1
- Add tooltip to the Insights checkbox (jkonecny)
Resolves: rhbz#2069178