Backport PR #5292 to fix media check failure visibility

Upstream tag: anaconda-39.32.6-1
Upstream commit: 1a4aed72

.gitignore

@@ -374,3 +374,12 @@
 /anaconda-39.27.tar.bz2
 /anaconda-39.28.tar.bz2
 /anaconda-39.29.tar.bz2
+/anaconda-39.30.tar.bz2
+/anaconda-39.31.tar.bz2
+/anaconda-39.32.tar.bz2
+/anaconda-39.32.1.tar.bz2
+/anaconda-39.32.2.tar.bz2
+/anaconda-39.32.3.tar.bz2
+/anaconda-39.32.4.tar.bz2
+/anaconda-39.32.5.tar.bz2
+/anaconda-39.32.6.tar.bz2

.packit.yml

@@ -38,32 +38,24 @@ jobs:
 
   - job: propose_downstream
     trigger: release
-    dist_git_branches: main
+    dist_git_branches: f39
 
   - job: tests
     trigger: pull_request
     targets:
-      - fedora-rawhide
-
-  - job: copr_build
-    trigger: pull_request
-    targets:
-      - fedora-rawhide
-    additional_repos:
-      # This repository contains fixup of Rawhide broken environment.
-      # Mainly useful when there is a package which is not yet in Rawhide but build is available.
-      - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/"
+      - fedora-39
 
   - job: copr_build
     trigger: commit
     targets:
-      - fedora-rawhide
-    branch: master
+      - fedora-39
+    branch: fedora-39
     owner: "@rhinstaller"
-    project: Anaconda
+    project: Anaconda-devel
+    preserve_project: True
     additional_repos:
+      - "copr://@storage/blivet-daily"
       # This repository contains fixup of Rawhide broken environment.
       # Mainly useful when there is a package which is not yet in Rawhide but build is available.
       - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/"
-    preserve_project: True
 

0001-anaconda-diskroot-wait-before-dying-on-media-check-f.patch

@@ -0,0 +1,47 @@
+From 3c5ce5a65502cebbc7a846a78375ddc1ddb5cb59 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 30 Oct 2023 09:45:02 -0700
+Subject: [PATCH] anaconda-diskroot: wait before dying on media check fail
+
+If a modesetting driver has been loaded by the time the media
+check happens, halting the system (as we currently do immediately
+if the check fails) blanks the screen, which is confusing for
+the user. This adds a warning message and a 12-hour wait before
+the system is eventually halted, so the user can see the media
+check failure and (presumably) reboot and fix the medium.
+
+It also tweaks the text of the failure message not to call it a
+"CD check", since it's not 1998 any more.
+
+Resolves: rhbz#2246410
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ dracut/anaconda-diskroot | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/dracut/anaconda-diskroot b/dracut/anaconda-diskroot
+index 295b0b51ae..966bd84488 100755
+--- a/dracut/anaconda-diskroot
++++ b/dracut/anaconda-diskroot
+@@ -25,11 +25,15 @@ run_checkisomd5() {
+                 state="inactive"
+             fi
+             if [ "$rc" = "1" ]; then
+-                die "CD check failed!"
++                warn "Media check failed! We do not recommend using this medium. System will halt in 12 hours"
++                sleep 43200
++                die "Media check failed!"
+                 exit 1
+             fi
+             if [ "$state" = "failed" ]; then
+-                die "CD check failed!"
++                warn "Media check failed! We do not recommend using this medium. System will halt in 12 hours"
++                sleep 43200
++                die "Media check failed!"
+                 exit 1
+             fi
+             [ -x /bin/plymouth ] && /bin/plymouth --show-splash
+-- 
+2.41.0
+

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.78.1.post5+g4b99855.
+The file was generated using packit 0.84.0.

anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
-Version: 39.29
-Release: 1%{?dist}
+Version: 39.32.6
+Release: 2%{?dist}
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -12,6 +12,11 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2246410
+# https://github.com/rhinstaller/anaconda/pull/5292
+# wait before halt on media check failure
+Patch: 0001-anaconda-diskroot-wait-before-dying-on-media-check-f.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -41,7 +46,7 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %define nmver 1.0
 %define pykickstartver 3.47-1
 %define pypartedver 2.5-2
-%define pythonblivetver 1:3.7.1-4
+%define pythonblivetver 1:3.8.1-1
 %define rpmver 4.15.0
 %define simplelinever 1.9.0-1
 %define subscriptionmanagerver 1.26
@@ -357,15 +362,13 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %else
 # Remove all live-installer files from the buildroot
 rm -rf \
-  %{buildroot}/%{_sysconfdir}/pam.d/liveinst \
-  %{buildroot}/%{_sysconfdir}/security/console.apps/liveinst \
   %{buildroot}/%{_sysconfdir}/xdg/autostart/liveinst-setup.desktop \
   %{buildroot}/%{_bindir}/liveinst \
   %{buildroot}/%{_libexecdir}/liveinst-setup.sh \
-  %{buildroot}/%{_sbindir}/liveinst \
   %{buildroot}/%{_datadir}/anaconda/gnome \
   %{buildroot}/%{_datadir}/anaconda/gnome/fedora-welcome \
   %{buildroot}/%{_datadir}/anaconda/gnome/org.fedoraproject.welcome-screen.desktop \
+  %{buildroot}/%{_datadir}/polkit-1/actions/* \
   %{buildroot}/%{_datadir}/applications/liveinst.desktop
 %endif
 
@@ -421,9 +424,7 @@ rm -rf \
 
 %files live
 %{_bindir}/liveinst
-%{_sbindir}/liveinst
-%config(noreplace) %{_sysconfdir}/pam.d/*
-%config(noreplace) %{_sysconfdir}/security/console.apps/*
+%{_datadir}/polkit-1/actions/*
 %{_libexecdir}/liveinst-setup.sh
 %{_datadir}/applications/*.desktop
 %{_datadir}/anaconda/gnome
@@ -489,6 +490,193 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Oct 30 2023 Adam Williamson <awilliam@redhat.com> - 39.32.6-2
+- Backport PR #5292 to fix media check failure visibility
+
+* Tue Oct 17 2023 Packit <hello@packit.dev> - 39.32.6-1
+- Revert "Disable geolocation on the Fedora Workstation live image" (kkoukiou)
+
+* Tue Oct 17 2023 Packit <hello@packit.dev> - 39.32.5-1
+- Update translations from Weblate for fedora-39 (github-actions)
+- storage: Handle BTRFS with systemd-boot (jeremy.linton)
+
+* Mon Oct 09 2023 Packit <hello@packit.dev> - 39.32.4-1
+- Simplify keyboard layout handling, rely on localed more (awilliam)
+
+* Mon Sep 18 2023 Packit <hello@packit.dev> - 39.32.3-1
+- Update translations from Weblate for fedora-39 (github-actions)
+- liveinst: Don't exec pkexec (rstrode)
+- cppcheck: Pretend we know more macros (vslavik)
+- Add 'localhost-live' to ignored hostnames for device naming (vtrefny)
+- Update translations from Weblate for fedora-39 (github-actions)
+- webui: Fix checking for locked LUKS devices (vtrefny)
+
+* Thu Sep 07 2023 Packit <hello@packit.dev> - 39.32.2-1
+- Use Firefox environment variables for styling (mkolman)
+- Copy /var/lib/gnome-initial-setup/state to installed system (rstrode)
+- webui: add pixel test for modify storage test (rvykydal)
+- webui: use Blivet-gui name instead of Blivet (rvykydal)
+- Revert the ESP maximum size back to 600MiB (richard)
+- webui: add tests for modify storage dialogs (rvykydal)
+- webui: if blivet-gui exits earlier then the delay update the dialog
+  (rvykydal)
+- webui: do not show rescan dialog in case of critical error (rvykydal)
+- webui: make blivet-gui start failure a Critical Error (rvykydal)
+- webui: catch errors when spawning blivet-gui (rvykydal)
+- webui: add dialogs around launching blivet-gui (rvykydal)
+- webui: show error name in Critical Error dialog only if it exists (rvykydal)
+- core: Look up live user from PKEXEC_UID (rstrode)
+- webui: Show warning when trying to use non-ASCII LUKS passphrase (vtrefny)
+- webui: tests: move wait for re-scanning to finish before moving forward with
+  the tests (kkoukiou)
+- webui: When re-scanning don't reset disk selection (kkoukiou)
+- Update translations from Weblate for fedora-39 (github-actions)
+- j2 render: Preserve hashbangs (vslavik)
+- j2 render: Flip logic for empty result (vslavik)
+- j2 render: Clean up details (vslavik)
+- Update translations from Weblate
+
+* Wed Aug 30 2023 Packit <hello@packit.dev> - 39.32.1-1
+- tests: Add a webui test case with EFI system (vtrefny)
+- webui: Show error when mounting /boot/efi to a non-EFI partition (vtrefny)
+- webui: Add /boot/efi to required mount points when in EFI mode (vtrefny)
+- tests: Add support for running webui tests in an EFI VM (vtrefny)
+- webui: Do not show unusable devices in mount point assignment (vtrefny)
+- Update translations from Weblate for fedora-39 (github-actions)
+- webui: Enable mount point mapping based on filesystem not partition (vtrefny)
+- webui: add offline version to BZ report dialog (rvykydal)
+- webui: monitor network connection state from the Anaconda backend (rvykydal)
+- webui: Let error reporting dialog test area auto resize (kkoukiou)
+- webui: add basic test for sidebar navigation (#2233805) (rvykydal)
+- webui: do not reset validity of step id moving to the same step (#2233805)
+  (rvykydal)
+- webui: Update request IDs when removing mount point row (vtrefny)
+- Fix spelling mistake / typo: "Criticall error" (awilliam)
+- Disable geolocation on the Fedora Workstation live image (mkolman)
+- Set up the fedora-39 branch (mkolman)
+- Update translations from Weblate
+
+* Tue Aug 22 2023 Packit <hello@packit.dev> - 39.32-1
+- liveinst: Ensure DBUS_SESSION_BUS_ADDRESS is set in live install (rstrode)
+- screensaver: Look at $PKEXEC_UID not $USERHELPER_UID (rstrode)
+- webui: disable disk selection while disks are being rescanned (kkoukiou)
+- webui: show spinner in the disk selection while the backend did not update
+  (kkoukiou)
+- WebUI: update pixel tests for Fedora 40 (jvanderwaa)
+- webui: show 25 rows in the bug report log review. (rvykydal)
+- webui: add option to report an issue to global menu (rvykydal)
+- webui: bump cockpit-* dependencies in updates.img (kkoukiou)
+- Update translations from Weblate for master (github-actions)
+- release-notes: Document support for compressed kernel modules in Driver Discs
+  (peter.georg)
+- Add documentation about support for compressed kernel modules (peter.georg)
+- dd_extract: Update test info to reflect added support for compressed kernel
+  modules (peter.georg)
+- dd_extract: Add test for zstd compressed kernel module (peter.georg)
+- dd_extract: Add test for xz compressed kernel module (peter.georg)
+- dd_extract: Add support for compressed kernel modules (peter.georg)
+- Update translations from Weblate
+
+* Tue Aug 22 2023 Packit <hello@packit.dev> - 39.31-1
+- po: Don't try to delete extra.pot (vslavik)
+- tests: Rename test to match file with code (vslavik)
+- tests: Split localed wrapper from module (vslavik)
+- tests: Split live keyboard from module (vslavik)
+- tets: Split localization module task tests (vslavik)
+- Update translations from Weblate
+
+* Mon Aug 21 2023 Packit <hello@packit.dev> - 39.30-1
+- webui: update pixel tests (kkoukiou)
+- webui: move groupedAdditional content to PageGroup as specified in the
+  documentation (kkoukiou)
+- webui: port disk selector to the new Select implementation (kkoukiou)
+- webui: tests: workaround non-unique selector for the modal (kkoukiou)
+- webui: Upgrade to Patternfly 5 (kkoukiou)
+- Improve image building docs (mkolman)
+- Improve image building docs (mkolman)
+- webui: Do not show unused devices on the review page (vtrefny)
+- liveinst: Port to polkit (rstrode)
+- webui: Fixed typo to launch Live OS ISO with test/webui_testvm.py script
+  (akankovs)
+- webui: Automatically prefill mount point for swap devices (vtrefny)
+- manual: Allow using swap without reformatting (vtrefny)
+- Update translations from Weblate for master (github-actions)
+- webui: Allow changing and removing duplicate required mount points (vtrefny)
+- webui: test editing of the log in error reporting dialog (rvykydal)
+- Correct spelling of "formatted" (awilliam)
+- webui: Remove obsolete check for btrfs reformat support (vtrefny)
+- Add realease notes for keyboard from live system (jkonecny)
+- Add support for virtual console keymap from live (jkonecny)
+- Add live environment keyboard settings support (jkonecny)
+- Don't directly copy webui files in makeupdates script (mkolman)
+- webui: increase default size of log review text area in critical error dialog
+  (rvykydal)
+- test: allow booting a Live OS ISO with test/webui_testvm.py script (kkoukiou)
+- webui: use monospace font in critical error dialog (rvykydal)
+- webui: disable error reporting button when reading log for review (rvykydal)
+- webui: in Critical Error test click to report to BZ only after the log is
+  read (rvykydal)
+- Move get_missing_keyboard_configuration method (jkonecny)
+- Fix typo in the LocalizationInterface docstring (jkonecny)
+- Add execWithCaptureAsLiveUser to run as liveuser (jkonecny)
+- Extract liveuser data from help to generic tooling (jkonecny)
+- make: Document downloading .po from l10n repo (vslavik)
+- make: Update POT from branch, not pinned commit (vslavik)
+- webui: tests: cleanup webui.log in the end of the test (kkoukiou)
+- webui: give better feedback to user after 'Report issue' was clicked
+  (kkoukiou)
+- webui: add testing of log existence in critical error handling (rvykydal)
+- webui: translate critical error context only in the dialog (rvykydal)
+- webui: use Critical Error dialog for critical failures on Back button
+  (rvykydal)
+- webui: use Critical Error dialog in installation progress (rvykydal)
+- webui: use Critical Error dialog to handle erros in getting data about
+  storage (rvykydal)
+- webui: display also the background wizard page with Critical Error dialog
+  (rvykydal)
+- webui: use form layout and add log review of journal (rvykydal)
+- webui: add button for reporting to Bugzilla to CriticalError dialog
+  (rvykydal)
+- webui: tests: convert testErrorHandling to a non-destructive test (kkoukiou)
+- webui: tests: remove unused variable (kkoukiou)
+- webui: use storage exception for critical error dialog test (rvykydal)
+- webui: move partition_disk to Storage helper class (rvykydal)
+- webui: use Critical Error dialog to handle erros in getting data about
+  storage (rvykydal)
+- webui: use Critical Error dialog for disks rescan (rvykydal)
+- webui: use Critical Error dialog in installation progress (rvykydal)
+- webui: add context to Critical Error dialog (rvykydal)
+- webui: Prevent the Anaconda window from being closed by keyboard shortcuts
+  (akankovs)
+- webui: fix make rsync not updating the test VM (kkoukiou)
+- webui: Back/Next button are not localized (akankovs)
+- webui: tests are expecting #mount-point-mapping-table-row-{rowId}-format
+  selector (kkoukiou)
+- webui: fix TestStorageMountPoints.testBasic (rvykydal)
+- webui: tests: use m.write for writing files (kkoukiou)
+- webui: tests: extend the TestInstallationProgress test to include reboot
+  (jvanderwaa)
+- webui: introduce a button to launch blivet GUI (kkoukiou)
+- webui: when using the remote option just relax the address that cockpit-ws
+  binds to (kkoukiou)
+- webui: After returning to InstallationLanguage, the next button does not work
+  (akankovs)
+- Remove PatternFly workaround from build.js (mkolman)
+- spec: Bump required blivet version to 3.8.1 (vtrefny)
+- webui: Changing of checkbox for switch (akankovs)
+- iscsi: Allow changing iSCSI initiator name once set (vtrefny)
+- Update translations from Weblate for master (github-actions)
+- webui: fix logic for when to re-create the partitioning (kkoukiou)
+- webui: compress dist files also on development builds (kkoukiou)
+- webui: webui-desktop: don't use tls when spawning cockpit-ws (kkoukiou)
+- docs: Add translation bumper to CI status page (vslavik)
+- webui: extend condition that blocks rendering of the installation scenario
+  step (kkoukiou)
+- Update translations from Weblate for master (github-actions)
+- webui: do not keep in the central state all possible created partitioning
+  objects (kkoukiou)
+- Update translations from Weblate
+
 * Thu Aug 03 2023 Packit <hello@packit.dev> - 39.29-1
 - webui: spread the state update function into seperate hooks and useMemo
   (kkoukiou)

sources

@@ -1 +1 @@
-SHA512 (anaconda-39.29.tar.bz2) = 7e9c3dbe1249397fbd3e6b64eb2ca0ed2b016d1a6841e2b7f9abdeea3384008e2fc792471cfbe929c28a6e95c8709262aa4d37b3232360e45aeb42426c73f77f
+SHA512 (anaconda-39.32.6.tar.bz2) = 73b9f00f00c09e6de156ec4f826282af570e068bf5038f30fa08a8dd8646283db78a64fb025feec94f1770c6247a1e979bd12685ce0e8f96bc305d568803cbec

tests/dirinstall/dirinstall.sh

@@ -1,5 +1,10 @@
 #!/bin/sh -eux
 
+# Remove webui because it does not support much anything yet
+
+# Possible alternative: rpm -E --nodeps anaconda-webui
+dnf remove -y anaconda-webui
+
 
 # Prepare test work directory
 

tests/dirinstall/repositories

@@ -1,4 +1,5 @@
 # Names of local repositories whose urls will be used for installation
 # Repositories for "Fedora X" release:
 BASE_REPO="fedora"
-REPOS="fedora-modular"
+REPOS=""
+#REPOS="fedora-modular"