56 changed files with 5728 additions and 2247 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
 1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/rear-*.tar.gz
+SOURCES/rear-2.6.tar.gz
 /rear-*/
--- a/0001-skip-kernel-buildin-modules.patch
+++ b/0001-skip-kernel-buildin-modules.patch
@ -1,47 +0,0 @@
 From df5e18b8d7c8359b48bc133bfa29734934d18160 Mon Sep 17 00:00:00 2001
 From: Johannes Meixner <jsmeix@suse.com>
 Date: Mon, 10 Aug 2020 16:20:38 +0200
 Subject: [PATCH] Merge pull request #2469 from
 rear/skip-kernel-builtin-modules-issue2414
 In 400_copy_modules.sh skip copying kernel modules that are builtin modules.
 The new behaviour is that when modules are listed in modules.builtin
 and are also shown by modinfo then those modules are now skipped.
 Before for such modules the modules file(s) would have been included
 in the recovery system.
 See https://github.com/rear/rear/issues/2414
 ---
 usr/share/rear/build/GNU/Linux/400_copy_modules.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
 diff --git a/usr/share/rear/build/GNU/Linux/400_copy_modules.sh b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
 index d8d733d2..641b7f83 100644
 --- a/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
 +++ b/usr/share/rear/build/GNU/Linux/400_copy_modules.sh
@@ -133,8 +133,13 @@ for dummy in "once" ; do
         module=${module#.o}
         # Strip trailing ".ko" if there:
         module=${module#.ko}
 -        # Continue with the next module if the current one does not exist:
 +        # Continue with the next module if the current one does not exist as a module file:
         modinfo $module 1>/dev/null || continue
 +        # Continue with the next module if the current one is a kernel builtin module
 +        # cf. https://github.com/rear/rear/issues/2414#issuecomment-668632798
 +        # Quoting the grep search value is mandatory here ($module might be empty or blank),
 +        # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
 +        grep -q "$( echo $module | tr '_-' '..' )" /lib/modules/$KERNEL_VERSION/modules.builtin && continue
         # Resolve module dependencies:
         # Get the module file plus the module files of other needed modules.
         # This is currently only a "best effort" attempt because
@@ -166,7 +171,10 @@ done
 # Remove those modules that are specified in the EXCLUDE_MODULES array:
 for exclude_module in "${EXCLUDE_MODULES[@]}" ; do
 -    # Continue with the next module if the current one does not exist:
 +    # Continue with the next module only if the current one does not exist as a module file
 +    # but do not continue with the next module if the current one is a kernel builtin module
 +    # so when a module file exists that gets removed regardless if it is also a builtin module
 +    # cf. https://github.com/rear/rear/issues/2414#issuecomment-669115481
     modinfo $exclude_module 1>/dev/null || continue
     # In this case it is ignored when a module exists but 'modinfo -F filename' cannot show its filename
     # because then it is assumed that also no module file had been copied above:
--- a/SOURCES/pxe-rsync-output.patch
+++ b/SOURCES/pxe-rsync-output.patch
@ -0,0 +1,36 @@
 diff --git a/usr/share/rear/output/PXE/default/820_copy_to_net.sh b/usr/share/rear/output/PXE/default/820_copy_to_net.sh
 new file mode 100644
 index 00000000..dba1e526
 --- /dev/null
 +++ b/usr/share/rear/output/PXE/default/820_copy_to_net.sh
@@ -0,0 +1,30 @@
 +
 +# 820_copy_to_net.sh
 +
 +# Check if we have a target location OUTPUT_URL
 +test "$OUTPUT_URL" || return 0
 +
 +local scheme=$( url_scheme $OUTPUT_URL )
 +local result_file=""
 +local path=""
 +
 +case "$scheme" in
 +    (nfs|cifs|usb|tape|file|davfs)
 +        # The ISO has already been transferred by NETFS.
 +        return 0
 +        ;;
 +    (fish|ftp|ftps|hftp|http|https|sftp)
 +        # output/default/950_copy_result_files.sh will transfer them
 +        return 0
 +        ;;
 +    (rsync)
 +        LogPrint "Transferring PXE files to $OUTPUT_URL"
 +        for result_file in "${RESULT_FILES[@]}" ; do
 +            LogPrint "Transferring file: $result_file"
 +            rsync -a $v "$result_file" "$OUTPUT_URL" || Error "Problem transferring '$result_file' to $OUTPUT_URL"
 +        done
 +        ;;
 +    (*) Error "Invalid scheme '$scheme' in '$OUTPUT_URL'."
 +        ;;
 +esac
 +
--- a/SOURCES/rear-CVE-2024-23301.patch
+++ b/SOURCES/rear-CVE-2024-23301.patch
--- a/SOURCES/rear-asciidoc.patch
+++ b/SOURCES/rear-asciidoc.patch
@ -0,0 +1,584 @@
 diff --git a/doc/user-guide/12-BLOCKCLONE.adoc b/doc/user-guide/12-BLOCKCLONE.adoc
 index 061f0f49..2d4e0ed1 100644
 --- a/doc/user-guide/12-BLOCKCLONE.adoc
 +++ b/doc/user-guide/12-BLOCKCLONE.adoc
@@ -40,17 +40,17 @@ First we need to set some global options in _local.conf_,
 In our small example backups will be stored in _/mnt/rear_ directory
  on BACKUP_URL NFS server.
 -```
 +--------------------------
 # cat local.conf
 OUTPUT=ISO
 BACKUP=NETFS
 BACKUP_OPTIONS="nfsvers=3,nolock"
 BACKUP_URL=nfs://<hostname>/mnt/rear
 -```
 +--------------------------
 Now we will define variables that will apply only for targeted block device
 -```
 +--------------------------
 # cat alien.conf
 BACKUP=BLOCKCLONE                                        # Define BLOCKCLONE as backup method
 BACKUP_PROG_ARCHIVE="alien"                              # Name of image file
@@ -66,16 +66,16 @@ BLOCKCLONE_MBR_FILE="alien_boot_strap.img"               # Output filename for b
 BLOCKCLONE_PARTITIONS_CONF_FILE="alien_partitions.conf"  # Output filename for partition configuration
 BLOCKCLONE_ALLOW_MOUNTED="yes"                           # Device can be mounted during backup (default NO)
 -```
 +--------------------------
 ==== Running backup
 Save partitions configuration, bootstrap code and create actual backup of /dev/sdc1
 -```
 +--------------------------
 # rear -C alien mkbackuponly
 -```
 +--------------------------
 ==== Running restore from ReaR restore/recovery system
 -```
 +--------------------------
 # rear -C alien restoreonly
 Restore alien.dd.img to device: [/dev/sdc1]                 # User is always prompted for restore destination
 Device /dev/sdc1 was not found.                             # If destination does not exist ReaR will try to create it (or fail if BLOCKCLONE_SAVE_MBR_DEV was not set during backup)
@@ -102,7 +102,7 @@ Device     Boot Start    End Sectors  Size Id Type
 The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 -```
 +--------------------------
 ==== Summary
 In first example we have run backup of /dev/sdc1 partition and stored it on NFS
@@ -127,37 +127,37 @@ In next example we will do backup/restore using BLOCKCLONE and `ntfsclone`
  of Linux (installed on /dev/sda) and Windows 10 (installed on /dev/sdb).
 TIP: You can locate right disk devices using `df` and `os-prober`
 -```
 +--------------------------
 # df -h /boot
 Filesystem      Size  Used Avail Use% Mounted on
 /dev/sda1        10G  4.9G  5.2G  49% /           # Linux is most probably installed on /dev/sda
 # os-prober
 /dev/sdb1:Windows 10 (loader):Windows:chain       # Windows 10 is most probably installed on /dev/sdb
 -```
 +--------------------------
 First we will configure some ReaR backup global options
  (similar to link:12-BLOCKCLONE.adoc#1-backuprestore-of-arbitrary-block-device-with-blockclone-and-dd-on-nfs-server[first example]
  we will do backup/restore with help of NFS server).
 -```
 +--------------------------
 # cat local.conf
 OUTPUT=ISO
 BACKUP=NETFS
 BACKUP_OPTIONS="nfsvers=3,nolock"
 BACKUP_URL=nfs://<hostname>/mnt/rear
 REQUIRED_PROGS+=( ntfsclone )
 -```
 +--------------------------
 Now we will define backup parameters for Linux.
 -```
 +--------------------------
 # cat base_os.conf
 this_file_name=$( basename ${BASH_SOURCE[0]} )
 LOGFILE="$LOG_DIR/rear-$HOSTNAME-$WORKFLOW-${this_file_name%.*}.log"
 BACKUP_PROG_ARCHIVE="backup-${this_file_name%.*}"
 BACKUP_PROG_EXCLUDE+=( '/media/*' )
 -```
 +--------------------------
 Our Windows 10 is by default installed on two separate partitions
  (partition 1 for boot data and partition 2 for disk C:),
@@ -165,7 +165,7 @@ Our Windows 10 is by default installed on two separate partitions
 Windows boot partition:
 -```
 +--------------------------
 # cat windows_boot.conf
 BACKUP=BLOCKCLONE
 BACKUP_PROG_ARCHIVE="windows_boot"
@@ -179,10 +179,10 @@ BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SAVE_MBR_DEV="/dev/sdb"
 BLOCKCLONE_MBR_FILE="windows_boot_strap.img"
 BLOCKCLONE_PARTITIONS_CONF_FILE="windows_partitions.conf"
 -```
 +--------------------------
 Windows data partition (disk C:\):
 -```
 +--------------------------
 # cat windows_data.conf
 BACKUP=BLOCKCLONE
 BACKUP_PROG_ARCHIVE="windows_data"
@@ -196,35 +196,35 @@ BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SAVE_MBR_DEV="/dev/sdb"
 BLOCKCLONE_MBR_FILE="windows_boot_strap.img"
 BLOCKCLONE_PARTITIONS_CONF_FILE="windows_partitions.conf"
 -```
 +--------------------------
 ==== Running backup
 First we will create backup of Linux. `mkbackup` command will create bootable
  ISO image with ReaR rescue/recovery system that will be later used for
  booting broken system and consecutive recovery.
 -```
 +--------------------------
 # rear -C base_os mkbackup
 -```
 +--------------------------
 Now we create backup of Windows 10 boot partition. Command `mkbackuponly`
  will ensure that only partition data and partition layout will be saved
  (ReaR rescue/recovery system will not be created which is exactly what we want).
 -```
 +--------------------------
 # rear -C windows_boot mkbackuponly
 -```
 +--------------------------
 Similarly, we create backup of Windows 10 data partition (disk C:\)
 -```
 +--------------------------
 # rear -C windows_data mkbackuponly
 -```
 +--------------------------
 ==== Running restore from ReaR restore/recovery system
 As a first step after ReaR rescue/recovery system booted,
 we will recover Linux. This step will recover all Linux file systems,
 OS data and bootloader. Windows disk will remain untouched.
 -```
 +--------------------------
 # rear -C base_os recover
 -```
 +--------------------------
 In second step will recover Windows 10 boot partition. During this step ReaR
  will detect that destination partition is not present and ask us for device
@@ -234,25 +234,25 @@ In second step will recover Windows 10 boot partition. During this step ReaR
  partition(s) configuration (currently mounted under _/mnt/local_) will
  remain untouched. Before starting Windows 10 recovery we should identify
  right disk for recovery, as mentioned earlier disk size could be a good start.
 -```
 +--------------------------
 # fdisk -l /dev/sdb
 Disk /dev/sdb: 50 GiB, 53687091200 bytes, 104857600 sectors
 -```
 +--------------------------
 _/dev/sdb_ looks to be right destination, so we can proceed with restore.
 -```
 +--------------------------
 # rear -C windows_boot restoreonly
 Restore windows_boot.img to device: [/dev/sdb1]
 Device /dev/sdb1 was not found.
 Restore partition layout to (^c to abort): [/dev/sdb]
 Checking that no-one is using this disk right now ... OK
 ...
 -```
 +--------------------------
 Last step is to recover Windows 10 OS data (C:\).
 Partitions on _/dev/sdb_ were already created in previous step,
 hence ReaR will skip prompt for restoring partition layout.
 -```
 +--------------------------
 # rear -C windows_data restoreonly
 Restore windows_data.img to device: [/dev/sdb2]
 Ntfsclone image version: 10.1
@@ -263,7 +263,7 @@ Space in use           : 9396 MB (27.8%)
 Offset to image data   : 56 (0x38) bytes
 Restoring NTFS from image ...
 ...
 -```
 +--------------------------
 At this stage Linux together with Windows 10 is successfully restored.
@@ -286,7 +286,7 @@ In this example we will do backup/restore using BLOCKCLONE and `ntfsclone`
  Backups will be stored on NFS server.
 First we set global ReaR options
 -```
 +--------------------------
 # cat local.conf
 OUTPUT=ISO
 BACKUP=NETFS
@@ -300,23 +300,23 @@ BLOCKCLONE_SAVE_MBR_DEV="/dev/sda"
 BLOCKCLONE_MBR_FILE="boot_strap.img"
 BLOCKCLONE_PARTITIONS_CONF_FILE="partitions.conf"
 -```
 +--------------------------
 IMPORTANT: BLOCKCLONE_STRICT_PARTITIONING is mandatory if backing up
  Linux / Windows that shares one disk. Not using this option might result to
  unbootable Windows 10 installation.
 Linux configuration
 -```
 +--------------------------
 # cat base_os.conf
 this_file_name=$( basename ${BASH_SOURCE[0]} )
 LOGFILE="$LOG_DIR/rear-$HOSTNAME-$WORKFLOW-${this_file_name%.*}.log"
 BACKUP_PROG_ARCHIVE="backup-${this_file_name%.*}"
 BACKUP_PROG_EXCLUDE+=( '/media/*' )
 -```
 +--------------------------
 Windows 10 boot partition configuration
 -```
 +--------------------------
 # cat windows_boot.conf
 BACKUP=BLOCKCLONE
@@ -328,10 +328,10 @@ BLOCKCLONE_PROG=ntfsclone
 BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SOURCE_DEV="/dev/sda1"
 -```
 +--------------------------
 Windows 10 data partition configuration
 -```
 +--------------------------
 # cat windows_data.conf
 BACKUP=BLOCKCLONE
 BACKUP_PROG_ARCHIVE="windows_data"
@@ -342,42 +342,42 @@ BLOCKCLONE_PROG=ntfsclone
 BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SOURCE_DEV="/dev/sda2"
 -```
 +--------------------------
 ==== Running backup
 Backup of Linux
 -```
 +--------------------------
 # rear -C base_os mkbackup
 -```
 +--------------------------
 Backup of Windows 10 boot partition
 -```
 +--------------------------
 # rear -C windows_boot mkbackuponly
 -```
 +--------------------------
 Backup of Windows 10 data partition
 -```
 +--------------------------
 # rear -C windows_data mkbackuponly
 -```
 +--------------------------
 ==== Running restore from ReaR restore/recovery system
 Restore Linux
 -```
 +--------------------------
 # rear -C base_os recover
 -```
 +--------------------------
 During this step ReaR will also create both Windows 10 partitions
 Restore Windows 10 data partition
 -```
 +--------------------------
 # rear -C windows_data restoreonly
 -```
 +--------------------------
 Restore Windows 10 boot partition
 -```
 +--------------------------
 # rear -C windows_boot restoreonly
 -```
 +--------------------------
 === 4. Backup/restore of Linux / Windows 10 dual boot setup sharing same disk with USB as destination
@@ -389,7 +389,7 @@ In this example we will do backup/restore using BLOCKCLONE and `ntfsclone`
  Backups will be stored on USB disk drive (_/dev/sdb_ in this example).
 Global options
 -```
 +--------------------------
 # cat local.conf
 OUTPUT=USB
 BACKUP=NETFS
@@ -407,10 +407,10 @@ BLOCKCLONE_SAVE_MBR_DEV="/dev/sda"
 BLOCKCLONE_MBR_FILE="boot_strap.img"
 BLOCKCLONE_PARTITIONS_CONF_FILE="partitions.conf"
 -```
 +--------------------------
 Options used during Linux backup/restore.
 -```
 +--------------------------
 # cat local.conf
 OUTPUT=USB
 BACKUP=NETFS
@@ -428,14 +428,14 @@ BLOCKCLONE_SAVE_MBR_DEV="/dev/sda"
 BLOCKCLONE_MBR_FILE="boot_strap.img"
 BLOCKCLONE_PARTITIONS_CONF_FILE="partitions.conf"
 -```
 +--------------------------
 IMPORTANT: USB_SUFFIX option is mandatory as it avoids ReaR to hold every
  backup in separate directory, this behavior is essential for BLOCKCLONE
  backup method to work correctly.
 Windows boot partition options
 -```
 +--------------------------
 # cat windows_boot.conf
 BACKUP=BLOCKCLONE
@@ -447,10 +447,10 @@ BLOCKCLONE_PROG=ntfsclone
 BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SOURCE_DEV="/dev/sda1"
 -```
 +--------------------------
 Windows data partition options
 -```
 +--------------------------
 # cat windows_data.conf
 BACKUP=BLOCKCLONE
 BACKUP_PROG_ARCHIVE="windows_data"
@@ -461,11 +461,11 @@ BLOCKCLONE_PROG=ntfsclone
 BLOCKCLONE_PROG_OPTS="--quiet"
 BLOCKCLONE_SOURCE_DEV="/dev/sda2"
 -```
 +--------------------------
 ==== Running backup
 First we need to format target USB device, with `rear format` command
 -```
 +--------------------------
 # rear -v format /dev/sdb
 Relax-and-Recover 2.00 / Git
 Using log file: /var/log/rear/rear-centosd.log
@@ -477,15 +477,15 @@ Creating ReaR data partition up to 100% of '/dev/sdb'
 Setting 'boot' flag on /dev/sdb
 Creating ext3 filesystem with label 'REAR-000' on '/dev/sdb1'
 Adjusting filesystem parameters on '/dev/sdb1'
 -```
 +--------------------------
 Backup of Linux
 -```
 +--------------------------
 # rear -C base_os mkbackup
 -```
 +--------------------------
 Backup of Windows 10 boot partition
 -```
 +--------------------------
 # rear -C windows_boot mkbackuponly
 NTFS volume version: 3.1
 Cluster size       : 4096 bytes
@@ -496,10 +496,10 @@ Accounting clusters ...
 Space in use       : 338 MB (64.4%)
 Saving NTFS to image ...
 Syncing ...
 -```
 +--------------------------
 Backup of Windows 10 data partition
 -```
 +--------------------------
 # rear -C windows_data mkbackuponly
 NTFS volume version: 3.1
 Cluster size       : 4096 bytes
@@ -510,7 +510,7 @@ Accounting clusters ...
 Space in use       : 9833 MB (54.3%)
 Saving NTFS to image ...
 Syncing ...
 -```
 +--------------------------
 ==== Running restore from ReaR restore/recovery system
 For sake of this demonstration I've purposely used ReaR's rescue/recovery media
@@ -519,7 +519,7 @@ For sake of this demonstration I've purposely used ReaR's rescue/recovery media
  demonstrate possibility of ReaR to recover backup to arbitrary disk. +
 As first step Linux will be restored, this will create all the partitions
  needed, even those used by Windows 10.
 -```
 +--------------------------
 RESCUE centosd:~ # rear -C base_os recover
 Relax-and-Recover 2.00 / Git
 Using log file: /var/log/rear/rear-centosd.log
@@ -541,13 +541,13 @@ Original disk /dev/sda does not exist in the target system. Please choose an app
 2) /dev/sdb
 3) Do not map disk.
 #?
 -```
 +--------------------------
 Now ReaR recover command stops as it detected that disk layout is not identical.
  As our desired restore target is _/dev/sdb_ we choose right disk and continue
  recovery. ReaR will ask to check created restore scripts, but this is not
  needed in our scenario.
 -```
 +--------------------------
 #? 2
 2017-01-25 20:54:01 Disk /dev/sdb chosen as replacement for /dev/sda.
 Disk /dev/sdb chosen as replacement for /dev/sda.
@@ -607,11 +607,11 @@ Skip installing GRUB Legacy boot loader because GRUB 2 is installed (grub-probe
 Installing GRUB2 boot loader
 Finished recovering your system. You can explore it under '/mnt/local'.
 Saving /var/log/rear/rear-centosd.log as /var/log/rear/rear-centosd-recover-base_os.log
 -```
 +--------------------------
 Now we have Linux part restored, GRUB installed and partitions created, hence
  we can continue with Windows 10 boot partition recovery.
 -```
 +--------------------------
 RESCUE centosd:~ # rear -C windows_boot restoreonly
 Restore windows_boot.nc.img to device: [/dev/sda1] /dev/sdb1
 Ntfsclone image version: 10.1
@@ -622,12 +622,12 @@ Space in use           : 338 MB (64.4%)
 Offset to image data   : 56 (0x38) bytes
 Restoring NTFS from image ...
 Syncing ...
 -```
 +--------------------------
 Similarly to Linux restore, we were prompted for restore destination, which
  is /dev/sdb1 in our case. +
 As the last step we will recover Windows 10 data partition
 -```
 +--------------------------
 RESCUE centosd:~ # rear -C windows_data restoreonly
 Restore windows_data.nc.img to device: [/dev/sda2] /dev/sdb2
 Ntfsclone image version: 10.1
@@ -638,7 +638,7 @@ Space in use           : 9867 MB (54.5%)
 Offset to image data   : 56 (0x38) bytes
 Restoring NTFS from image ...
 Syncing ...
 -```
 +--------------------------
 Again after restoreonly command is launched, ReaR prompts for restore
  destination. +
@@ -662,25 +662,25 @@ The _BLOCKCLONE_TRY_UNMOUNT_ is important here: it will attempt to unmount the
  run the risk that the data may be inconsistent.
 Global options
 -```
 +--------------------------
 # cat site.conf
 OUTPUT=ISO
 KEEP_OLD_OUTPUT_COPY=1
 BACKUP_URL="nfs://<hostname>/Stations_bkup/rear/"
 -```
 +--------------------------
 Options used for the base OS backup:
 -```
 +--------------------------
 # cat base_system.conf
 this_file_name=$( basename ${BASH_SOURCE[0]} )
 LOGFILE="$LOG_DIR/rear-$HOSTNAME-$WORKFLOW-${this_file_name%.*}.log"
 BACKUP_PROG_EXCLUDE+=( '/products/*' )
 BACKUP_PROG_ARCHIVE="backup-${this_file_name%.*}"
 BACKUP=NETFS
 -```
 +--------------------------
 Options used to take the encrypted filesystem image:
 -```
 +--------------------------
 this_file_name=$( basename ${BASH_SOURCE[0]} )
 LOGFILE="$LOG_DIR/rear-$HOSTNAME-$WORKFLOW-${this_file_name%.*}.log"
 BACKUP=BLOCKCLONE
@@ -694,18 +694,18 @@ BLOCKCLONE_SOURCE_DEV="/dev/vg00/lvol4"
 BLOCKCLONE_ALLOW_MOUNTED="yes"
 BLOCKCLONE_TRY_UNMOUNT="yes"
 -```
 +--------------------------
 ==== Running backup
 Base OS backup:
 -```
 +--------------------------
 # rear -C base_system mkbackup
 -```
 +--------------------------
 Create image of encrypted filesystem:
 -```
 +--------------------------
 # rear -C products_backup mkbackuponly
 -```
 +--------------------------
 ==== Running restore from ReaR restore/recovery system
 First recover the base OS. This will create all the partitions needed, including
@@ -713,7 +713,7 @@ First recover the base OS. This will create all the partitions needed, including
 As illustrated below, you will be prompted to chose a new encryption passphrase. 
  Please provide one, but you need not care about its value as it will get overwritten 
  during the next phase:
 -```
 +--------------------------
 RESCUE pc-pan:~ # rear -C base_system.conf recover
 [...]
 Please enter the password for LUKS device cr_vg00-lvol4 (/dev/mapper/vg00-lvol4):
@@ -724,7 +724,7 @@ Creating filesystem of type xfs with mount point /products on /dev/mapper/cr_vg0
 Mounting filesystem /products
 Disk layout created.
 [...]
 -```
 +--------------------------
 Now we can proceed and restore the encrypted filesystem image. The target filesystem
  will have been mounted by ReaR during the previous phase, but this will be 
@@ -732,12 +732,12 @@ Now we can proceed and restore the encrypted filesystem image. The target filesy
  to "yes". +
 As illustrated below, you will be prompted for the target block device to use.
  Confirm by pressing Enter or type in another value:
 -```
 +--------------------------
 RESCUE pc-pan:~ # rear -C products_backup.conf restoreonly
 [...]
 Restore backup-products_backup.dd.img to device: [/dev/vg00/lvol4]
 [...]
 -```
 +--------------------------
 Please note that the target device will not be re-mounted by the script at the end
  of the restore phase. If needed, this should be done manually. +
 diff --git a/doc/user-guide/16-Rubrik-CDM.adoc b/doc/user-guide/16-Rubrik-CDM.adoc
 index 41f37d20..3ac23b7b 100644
 --- a/doc/user-guide/16-Rubrik-CDM.adoc
 +++ b/doc/user-guide/16-Rubrik-CDM.adoc
@@ -84,7 +84,7 @@ To make CentOS v8.0 work the following line was needed:
 == Test Matrix
 .Test Matrix
 -[%header,format=csv]
 +[options="header",format="csv"]
 |===
 Operating System,DHCP,Static IP,Virtual,Physical,LVM Root Disk,Plain Root Disk,EXT3,EXT4,XFS,BTRFS,Original Cluster,Replication Cluster
 CentOS 7.3,,pass,Pass,,Pass,,,,Pass,,Pass,
--- a/SOURCES/rear-bz1492177-warning.patch
+++ b/SOURCES/rear-bz1492177-warning.patch
--- a/SOURCES/rear-bz1747468.patch
+++ b/SOURCES/rear-bz1747468.patch
@ -1,38 +1,20 @@
 From 5d5d1db3ca621eb80b9481924d1fc470571cfc09 Mon Sep 17 00:00:00 2001
 From: Pavel Cahyna <pcahyna@redhat.com>
 Date: Mon, 30 Aug 2021 12:00:43 +0200
 Subject: [PATCH] Avoid vgcfgrestore on thin volumes/pools
 and any other unsupported volume types.
 vgcfgrestore is not supposed to be able to restore any logical volumes
 that use kernel metadata. All volume types except linear and striped use
 kernel metadata. Main purpose of vgcfgrestore (with mandatory --force
 option) is to let users fix existing thin-pool, not to recreate the pool
 on empty disks. Do not even try vgcfgrestore on VGs that need any kernel
 metadata, because it might lead to an inconsistent state (if there are
 data that the kernel might interpret as LV metadata present on the disks).
 For VGs that have any volume with kernel metadata and are thus
 unsupported by vgcfgrestore, switch automatically to LV creation using
 lvcreate, similarly to MIGRATION_MODE.
 Avoid vgcfgrestore --force entirely, since it should not be needed now.
 This mostly reverts changes in commits
 311bfb3da1d5e47a2ff144123a2457e634f67893 and
 1b779abfbf56693877fe666f56253ec623599674. The former code is preserved
 and gets enabled if FORCE_VGCFGRESTORE=y. This option is on purpose
 undocumented though and may be removed in the future.
 ---
 .../prepare/GNU/Linux/110_include_lvm_code.sh |  8 +++++-
 usr/share/rear/lib/layout-functions.sh        | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
-index 5babce228..54a55e688 100644
+index 7cfdfcf2..1be17ba8 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
@@ -68,9 +68,9 @@ create_lvmgrp() {
     local vg=${vgrp#/dev/}
     cat >> "$LAYOUT_CODE" <<EOF
 -create_volume_group=1
 -create_logical_volumes=1
 -create_thin_volumes_only=0
 +create_volume_group+=( "$vg" )
 +create_logical_volumes+=( "$vg" )
 +create_thin_volumes_only=( \$( RmInArray "$vg" "\${create_thin_volumes_only[@]}" ) )
 EOF
@@ -83,7 +83,7 @@ EOF
     # '--mirrorlog', etc.
     # Also, we likely do not support every layout yet (e.g. 'cachepool').
@ -42,9 +24,14 @@ index 5babce228..54a55e688 100644
         cat >> "$LAYOUT_CODE" <<EOF
 LogPrint "Restoring LVM VG '$vg'"
 if [ -e "$vgrp" ] ; then
-@@ -100,6 +100,9 @@ if lvm vgcfgrestore -f "$VAR_DIR/layout/lvm/${vg}.cfg" $vg >&2 ; then
+@@ -97,9 +97,12 @@ if lvm vgcfgrestore -f "$VAR_DIR/layout/lvm/${vg}.cfg" $vg >&2 ; then
-     create_volume_group=( \$( RmInArray "$vg" "\${create_volume_group[@]}" ) )
+ 
-     create_logical_volumes=( \$( RmInArray "$vg" "\${create_logical_volumes[@]}" ) )
+     LogPrint "Sleeping 3 seconds to let udev or systemd-udevd create their devices..."
     sleep 3 >&2
 -    create_volume_group=0
 -    create_logical_volumes=0
 +    create_volume_group=( \$( RmInArray "$vg" "\${create_volume_group[@]}" ) )
 +    create_logical_volumes=( \$( RmInArray "$vg" "\${create_logical_volumes[@]}" ) )
 +EOF
 +        if is_true "${FORCE_VGCFGRESTORE-no}"; then
@ -52,9 +39,14 @@ index 5babce228..54a55e688 100644
 #
 # It failed ... restore layout using 'vgcfgrestore --force', but then remove Thin volumes, they are broken
 #
-@@ -124,6 +127,9 @@ elif lvm vgcfgrestore --force -f "$VAR_DIR/layout/lvm/${vg}.cfg" $vg >&2 ; then
+@@ -121,9 +124,12 @@ elif lvm vgcfgrestore --force -f "$VAR_DIR/layout/lvm/${vg}.cfg" $vg >&2 ; then
-     create_volume_group=( \$( RmInArray "$vg" "\${create_volume_group[@]}" ) )
+     sleep 3 >&2
-     create_thin_volumes_only+=( "$vg" )
+ 
     # All logical volumes have been created, except Thin volumes and pools
 -    create_volume_group=0
 -    create_thin_volumes_only=1
 +    create_volume_group=( \$( RmInArray "$vg" "\${create_volume_group[@]}" ) )
 +    create_thin_volumes_only+=( "$vg" )
 +EOF
 +        fi
@ -62,11 +54,32 @@ index 5babce228..54a55e688 100644
 #
 # It failed also ... restore using 'vgcreate/lvcreate' commands
 #
@@ -138,7 +144,7 @@ EOF
     local -a devices=($(awk "\$1 == \"lvmdev\" && \$2 == \"$vgrp\" { print \$3 }" "$LAYOUT_FILE"))
 cat >> "$LAYOUT_CODE" <<EOF
 -if [ \$create_volume_group -eq 1 ] ; then
 +if IsInArray $vg "\${create_volume_group[@]}" ; then
     LogPrint "Creating LVM VG '$vg'; Warning: some properties may not be preserved..."
     if [ -e "$vgrp" ] ; then
         rm -rf "$vgrp"
@@ -240,9 +246,9 @@ create_lvmvol() {
     local warnraidline
     if [ $is_thin -eq 0 ] ; then
 -        ifline="if [ \"\$create_logical_volumes\" -eq 1 ] && [ \"\$create_thin_volumes_only\" -eq 0 ] ; then"
 +        ifline="if IsInArray $vg \"\${create_logical_volumes[@]}\" && ! \$IsInArray $vg \"\${create_thin_volumes_only[@]}\" ; then"
     else
 -        ifline="if [ \"\$create_logical_volumes\" -eq 1 ] ; then"
 +        ifline="if IsInArray $vg \"\${create_logical_volumes[@]}\" ; then"
     fi
     if [ $is_raidunknown -eq 1 ]; then
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
-index 249ad0cd6..77107ae63 100644
+index 54ddb50f..ae62d666 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
-@@ -1387,4 +1387,30 @@ delete_dummy_partitions_and_resize_real_ones() {
+@@ -1308,4 +1308,30 @@ delete_dummy_partitions_and_resize_real_ones() {
     last_partition_number=0
 }
--- a/SOURCES/rear-bz1832394.patch
+++ b/SOURCES/rear-bz1832394.patch
@ -0,0 +1,351 @@
 diff --git a/doc/user-guide/06-layout-configuration.adoc b/doc/user-guide/06-layout-configuration.adoc
 index f59384db..88ba0420 100644
 --- a/doc/user-guide/06-layout-configuration.adoc
 +++ b/doc/user-guide/06-layout-configuration.adoc
@@ -630,7 +630,7 @@ lvmvol <volume_group> <name> <size(bytes)> <layout> [key:value ...]
 === LUKS Devices ===
 ----------------------------------
 -crypt /dev/mapper/<name> <device> [cipher=<cipher>] [key_size=<key size>] [hash=<hash function>] [uuid=<uuid>] [keyfile=<keyfile>] [password=<password>]
 +crypt /dev/mapper/<name> <device> [type=<type>] [cipher=<cipher>] [key_size=<key size>] [hash=<hash function>] [uuid=<uuid>] [keyfile=<keyfile>] [password=<password>]
 ----------------------------------
 === DRBD ===
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh
 index 05279bc8..0c662f67 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/160_include_luks_code.sh
@@ -1,35 +1,75 @@
 +
 # Code to recreate and/or open LUKS volumes.
 create_crypt() {
 +    # See the create_device() function in lib/layout-functions.sh what "device type" means:
 +    local device_type="$1"
 +    if ! grep -q "^crypt $device_type " "$LAYOUT_FILE" ; then
 +        LogPrintError "Skip recreating LUKS volume $device_type (no 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the create_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 +    
     local crypt target_device source_device options
 -    read crypt target_device source_device options < <(grep "^crypt $1 " "$LAYOUT_FILE")
 +    local mapping_name option key value
 +    local cryptsetup_options="" keyfile="" password=""
 -    local target_name=${target_device#/dev/mapper/}
 +    read crypt target_device source_device options < <( grep "^crypt $device_type " "$LAYOUT_FILE" )
 +
 +    # Careful! One cannot 'test -b $source_device' here at the time when this code is run
 +    # because the source device is usually a disk partition block device like /dev/sda2
 +    # but disk partition block devices usually do not yet exist (in particular not on a new clean disk)
 +    # because partitions are actually created later when the diskrestore.sh script is run
 +    # but not here when this code is run which only generates the diskrestore.sh script:
 +    if ! test $source_device ; then
 +        LogPrintError "Skip recreating LUKS volume $device_type: No source device (see the 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the create_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 +
 +    mapping_name=${target_device#/dev/mapper/}
 +    if ! test $mapping_name ; then
 +        LogPrintError "Skip recreating LUKS volume $device_type on $source_device: No /dev/mapper/... mapping name (see the 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the create_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 -    local cryptsetup_options="" keyfile="" password=""
 -    local option key value
     for option in $options ; do
 -        key=${option%=*}
 +        # $option is of the form keyword=value and
 +        # we assume keyword has no '=' character but value could be anything that may have a '=' character
 +        # so we split keyword=value at the leftmost '=' character so that
 +        # e.g. keyword=foo=bar gets split into key="keyword" and value="foo=bar":
 +        key=${option%%=*}
         value=${option#*=}
 -
 +        # The "cryptseup luksFormat" command does not require any of the type, cipher, key-size, hash, uuid option values
 +        # because if omitted a cryptseup default value is used so we treat those values as optional.
 +        # Using plain test to ensure the value is a single non empty and non blank word
 +        # without quoting because test " " would return zero exit code
 +        # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
         case "$key" in
 -            cipher)
 -                cryptsetup_options+=" --cipher $value"
 +            (type)
 +                test $value && cryptsetup_options+=" --type $value"
 +                ;;
 +            (cipher)
 +                test $value && cryptsetup_options+=" --cipher $value"
 +                ;;
 +            (key_size)
 +                test $value && cryptsetup_options+=" --key-size $value"
                 ;;
 -            key_size)
 -                cryptsetup_options+=" --key-size $value"
 +            (hash)
 +                test $value && cryptsetup_options+=" --hash $value"
                 ;;
 -            hash)
 -                cryptsetup_options+=" --hash $value"
 +            (uuid)
 +                test $value && cryptsetup_options+=" --uuid $value"
                 ;;
 -            uuid)
 -                cryptsetup_options+=" --uuid $value"
 +            (keyfile)
 +                test $value && keyfile=$value
                 ;;
 -            keyfile)
 -                keyfile=$value
 +            (password)
 +                test $value && password=$value
                 ;;
 -            password)
 -                password=$value
 +            (*)
 +                LogPrintError "Skipping unsupported LUKS cryptsetup option '$key' in 'crypt $target_device $source_device' entry in $LAYOUT_FILE"
                 ;;
         esac
     done
@@ -37,26 +77,25 @@ create_crypt() {
     cryptsetup_options+=" $LUKS_CRYPTSETUP_OPTIONS"
     (
 -    echo "Log \"Creating LUKS device $target_name on $source_device\""
 +    echo "LogPrint \"Creating LUKS volume $mapping_name on $source_device\""
     if [ -n "$keyfile" ] ; then
         # Assign a temporary keyfile at this stage so that original keyfiles do not leak onto the rescue medium.
         # The original keyfile will be restored from the backup and then re-assigned to the LUKS device in the
         # 'finalize' stage.
         # The scheme for generating a temporary keyfile path must be the same here and in the 'finalize' stage.
 -        keyfile="${TMPDIR:-/tmp}/LUKS-keyfile-$target_name"
 +        keyfile="$TMP_DIR/LUKS-keyfile-$mapping_name"
         dd bs=512 count=4 if=/dev/urandom of="$keyfile"
         chmod u=rw,go=- "$keyfile"
 -
         echo "cryptsetup luksFormat --batch-mode $cryptsetup_options $source_device $keyfile"
 -        echo "cryptsetup luksOpen --key-file $keyfile $source_device $target_name"
 +        echo "cryptsetup luksOpen --key-file $keyfile $source_device $mapping_name"
     elif [ -n "$password" ] ; then
         echo "echo \"$password\" | cryptsetup luksFormat --batch-mode $cryptsetup_options $source_device"
 -        echo "echo \"$password\" | cryptsetup luksOpen $source_device $target_name"
 +        echo "echo \"$password\" | cryptsetup luksOpen $source_device $mapping_name"
     else
 -        echo "LogPrint \"Please enter the password for LUKS device $target_name ($source_device):\""
 +        echo "LogUserOutput \"Set the password for LUKS volume $mapping_name (for 'cryptsetup luksFormat' on $source_device):\""
         echo "cryptsetup luksFormat --batch-mode $cryptsetup_options $source_device"
 -        echo "LogPrint \"Please re-enter the password for LUKS device $target_name ($source_device):\""
 -        echo "cryptsetup luksOpen $source_device $target_name"
 +        echo "LogUserOutput \"Enter the password for LUKS volume $mapping_name (for 'cryptsetup luksOpen' on $source_device):\""
 +        echo "cryptsetup luksOpen $source_device $mapping_name"
     fi
     echo ""
     ) >> "$LAYOUT_CODE"
@@ -64,38 +103,61 @@ create_crypt() {
 # Function open_crypt() is meant to be used by the 'mountonly' workflow
 open_crypt() {
 +    # See the do_mount_device() function in lib/layout-functions.sh what "device type" means:
 +    local device_type="$1"
 +    if ! grep -q "^crypt $device_type " "$LAYOUT_FILE" ; then
 +        LogPrintError "Skip opening LUKS volume $device_type (no 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the do_mount_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 +
     local crypt target_device source_device options
 -    read crypt target_device source_device options < <(grep "^crypt $1 " "$LAYOUT_FILE")
 +    local mapping_name option key value
 +    local cryptsetup_options="" keyfile="" password=""
 -    local target_name=${target_device#/dev/mapper/}
 +    read crypt target_device source_device options < <( grep "^crypt $device_type " "$LAYOUT_FILE" )
 +
 +    if ! test -b "$source_device" ; then
 +        LogPrintError "Skip opening LUKS volume $device_type on device '$source_device' that is no block device (see the 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the do_mount_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 +
 +    mapping_name=${target_device#/dev/mapper/}
 +    if ! test $mapping_name ; then
 +        LogPrintError "Skip opening LUKS volume $device_type on $source_device: No /dev/mapper/... mapping name (see the 'crypt $device_type' entry in $LAYOUT_FILE)"
 +        # FIXME: The return code is ignored in the do_mount_device() function in lib/layout-functions.sh:
 +        return 1
 +    fi
 -    local cryptsetup_options="" keyfile="" password=""
 -    local option key value
     for option in $options ; do
 -        key=${option%=*}
 +        # $option is of the form keyword=value and
 +        # we assume keyword has no '=' character but value could be anything that may have a '=' character
 +        # so we split keyword=value at the leftmost '=' character so that
 +        # e.g. keyword=foo=bar gets split into key="keyword" and value="foo=bar":
 +        key=${option%%=*}
         value=${option#*=}
 -
         case "$key" in
 -            keyfile)
 -                keyfile=$value
 +            (keyfile)
 +                test $value && keyfile=$value
                 ;;
 -            password)
 -                password=$value
 +            (password)
 +                test $value && password=$value
                 ;;
         esac
     done
     (
 -    echo "Log \"Opening LUKS device $target_name on $source_device\""
 +    echo "LogPrint \"Opening LUKS volume $mapping_name on $source_device\""
     if [ -n "$keyfile" ] ; then
         # During a 'mountonly' workflow, the original keyfile is supposed to be
         # available at this point.
 -        echo "cryptsetup luksOpen --key-file $keyfile $source_device $target_name"
 +        echo "cryptsetup luksOpen --key-file $keyfile $source_device $mapping_name"
     elif [ -n "$password" ] ; then
 -        echo "echo \"$password\" | cryptsetup luksOpen $source_device $target_name"
 +        echo "echo \"$password\" | cryptsetup luksOpen $source_device $mapping_name"
     else
 -        echo "LogPrint \"Please enter the password for LUKS device $target_name ($source_device):\""
 -        echo "cryptsetup luksOpen $source_device $target_name"
 +        echo "LogUserOutput \"Enter the password for LUKS volume $mapping_name (for 'cryptsetup luksOpen' on $source_device):\""
 +        echo "cryptsetup luksOpen $source_device $mapping_name"
     fi
     echo ""
     ) >> "$LAYOUT_CODE"
 diff --git a/usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh b/usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh
 index c1e1cfd5..afeabf6a 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/260_crypt_layout.sh
@@ -9,6 +9,8 @@ Log "Saving Encrypted volumes."
 REQUIRED_PROGS+=( cryptsetup dmsetup )
 COPY_AS_IS+=( /usr/share/cracklib/\* /etc/security/pwquality.conf )
 +local invalid_cryptsetup_option_value="no"
 +
 while read target_name junk ; do
     # find the target device we're mapping
     if ! [ -e /dev/mapper/$target_name ] ; then
@@ -30,29 +32,96 @@ while read target_name junk ; do
         source_device="$(get_device_name ${slave##*/})"
     done
 -    if ! cryptsetup isLuks $source_device >/dev/null 2>&1; then
 +    if ! blkid -p -o export $source_device >$TMP_DIR/blkid.output ; then
 +        LogPrintError "Error: Cannot get attributes for $target_name ('blkid -p -o export $source_device' failed)"
         continue
     fi
 -    # gather crypt information
 -    cipher=$(cryptsetup luksDump $source_device | grep "Cipher name" | sed -r 's/^.+:\s*(.+)$/\1/')
 -    mode=$(cryptsetup luksDump $source_device | grep "Cipher mode" | cut -d: -f2- | awk '{printf("%s",$1)};')
 -    key_size=$(cryptsetup luksDump $source_device | grep "MK bits" | sed -r 's/^.+:\s*(.+)$/\1/')
 -    hash=$(cryptsetup luksDump $source_device | grep "Hash spec" | sed -r 's/^.+:\s*(.+)$/\1/')
 -    uuid=$(cryptsetup luksDump $source_device | grep "UUID" | sed -r 's/^.+:\s*(.+)$/\1/')
 -    keyfile_option=$([ -f /etc/crypttab ] && awk '$1 == "'"$target_name"'" && $3 != "none" && $3 != "-" && $3 != "" { print "keyfile=" $3; }' /etc/crypttab)
 +    if ! grep -q "TYPE=crypto_LUKS" $TMP_DIR/blkid.output ; then
 +        Log "Skipping $target_name (no 'TYPE=crypto_LUKS' in 'blkid -p -o export $source_device' output)"
 +        continue
 +    fi
 -    # LUKS version 2 is not yet suppported, see https://github.com/rear/rear/issues/2204
 -    # When LUKS version 2 is used the above code fails at least to determine the hash value
 -    # so we use an empty hash value as a simple test if gathering crypt information was successful:
 -    test "$hash" || Error "No hash value for LUKS device '$target_name' at '$source_device' (only LUKS version 1 is supported)"
 +    # Detect LUKS version:
 +    # Remove all non-digits in particular to avoid leading or trailing spaces in the version string
 +    # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
 +    # that could happen if the blkid output contains "VERSION = 2" so that 'cut -d= -f2' results " 2".
 +    version=$( grep "VERSION" $TMP_DIR/blkid.output | cut -d= -f2 | tr -c -d '[:digit:]' )
 +    if ! test "$version" = "1" -o "$version" = "2" ; then
 +        LogPrintError "Error: Unsupported LUKS version for $target_name ('blkid -p -o export $source_device' shows 'VERSION=$version')"
 +        continue
 +    fi
 +    luks_type=luks$version
 -    echo "crypt /dev/mapper/$target_name $source_device cipher=$cipher-$mode key_size=$key_size hash=$hash uuid=$uuid $keyfile_option" >> $DISKLAYOUT_FILE
 -done < <( dmsetup ls --target crypt )
 +    # Gather crypt information:
 +    if ! cryptsetup luksDump $source_device >$TMP_DIR/cryptsetup.luksDump ; then
 +        LogPrintError "Error: Cannot get LUKS$version values for $target_name ('cryptsetup luksDump $source_device' failed)"
 +        continue
 +    fi
 +    uuid=$( grep "UUID" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +    keyfile_option=$( [ -f /etc/crypttab ] && awk '$1 == "'"$target_name"'" && $3 != "none" && $3 != "-" && $3 != "" { print "keyfile=" $3; }' /etc/crypttab )
 +    if test $luks_type = "luks1" ; then
 +        cipher_name=$( grep "Cipher name" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +        cipher_mode=$( grep "Cipher mode" $TMP_DIR/cryptsetup.luksDump | cut -d: -f2- | awk '{printf("%s",$1)};' )
 +        cipher=$cipher_name-$cipher_mode
 +        key_size=$( grep "MK bits" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +        hash=$( grep "Hash spec" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +    elif test $luks_type = "luks2" ; then
 +        cipher=$( grep "cipher:" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +        # More than one keyslot may be defined - use key_size from the first slot.
 +        # Depending on the version the "cryptsetup luksDump" command outputs the key_size value
 +        # as a line like
 +        #         Key:        512 bits
 +        # and/or as a line like
 +        #         Cipher key: 512 bits
 +        # cf. https://github.com/rear/rear/pull/2504#issuecomment-718729198 and subsequent comments
 +        # so we grep for both lines but use only the first match from the first slot:
 +        key_size=$( egrep -m 1 "Key:|Cipher key:" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+) bits$/\1/' )
 +        hash=$( grep "Hash" $TMP_DIR/cryptsetup.luksDump | sed -r 's/^.+:\s*(.+)$/\1/' )
 +    fi
 -# cryptsetup is required in the recovery system if disklayout.conf contains at least one 'crypt' entry
 -# see the create_crypt function in layout/prepare/GNU/Linux/160_include_luks_code.sh
 -# what program calls are written to diskrestore.sh
 -# cf. https://github.com/rear/rear/issues/1963
 -grep -q '^crypt ' $DISKLAYOUT_FILE && REQUIRED_PROGS+=( cryptsetup ) || true
 +    # Basic checks that the cipher key_size hash uuid values exist
 +    # cf. https://github.com/rear/rear/pull/2504#issuecomment-718729198
 +    # because some values are needed during "rear recover"
 +    # to set cryptsetup options in layout/prepare/GNU/Linux/160_include_luks_code.sh
 +    # and it seems cryptsetup fails when options with empty values are specified
 +    # cf. https://github.com/rear/rear/pull/2504#issuecomment-719479724
 +    # For example a LUKS1 crypt entry in disklayout.conf looks like
 +    # crypt /dev/mapper/luks1test /dev/sda7 type=luks1 cipher=aes-xts-plain64 key_size=256 hash=sha256 uuid=1b4198c9-d9b0-4c57-b9a3-3433e391e706 
 +    # and a LUKS1 crypt entry in disklayout.conf looks like
 +    # crypt /dev/mapper/luks2test /dev/sda8 type=luks2 cipher=aes-xts-plain64 key_size=256 hash=sha256 uuid=3e874a28-7415-4f8c-9757-b3f28a96c4d2 
 +    # Only the keyfile_option value is optional and the luks_type value is already tested above.
 +    # Using plain test to ensure a value is a single non empty and non blank word
 +    # without quoting because test " " would return zero exit code
 +    # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
 +    # Do not error out instantly here but only report errors here so the user can see all messages
 +    # and actually error out at the end of this script if there was one actually invalid value:
 +    if ! test $cipher ; then
 +        LogPrint "No 'cipher' value for LUKS$version volume $target_name in $source_device"
 +    fi
 +    if test $key_size ; then
 +        if ! is_positive_integer $key_size ; then
 +            LogPrintError "Error: 'key_size=$key_size' is no positive integer for LUKS$version volume $target_name in $source_device"
 +            invalid_cryptsetup_option_value="yes"
 +        fi
 +    else
 +        LogPrint "No 'key_size' value for LUKS$version volume $target_name in $source_device"
 +    fi
 +    if ! test $hash ; then
 +        LogPrint "No 'hash' value for LUKS$version volume $target_name in $source_device"
 +    fi
 +    if ! test $uuid ; then
 +        # Report a missig uuid value as an error to have the user informed
 +        # but do not error out here because things can be fixed manually during "rear recover"
 +        # cf. https://github.com/rear/rear/pull/2506#issuecomment-721757810
 +        # and https://github.com/rear/rear/pull/2506#issuecomment-722315498
 +        # and https://github.com/rear/rear/issues/2509
 +        LogPrintError "Error: No 'uuid' value for LUKS$version volume $target_name in $source_device (mounting it or booting the recreated system may fail)"
 +    fi
 +
 +    echo "crypt /dev/mapper/$target_name $source_device type=$luks_type cipher=$cipher key_size=$key_size hash=$hash uuid=$uuid $keyfile_option" >> $DISKLAYOUT_FILE
 +
 +done < <( dmsetup ls --target crypt )
 +# Let this script return successfully when invalid_cryptsetup_option_value is not true:
 +is_true $invalid_cryptsetup_option_value && Error "Invalid or empty LUKS cryptsetup option value(s) in $DISKLAYOUT_FILE" || true
--- a/SOURCES/rear-bz1930662.patch
+++ b/SOURCES/rear-bz1930662.patch
@ -0,0 +1,693 @@
 diff --git a/usr/share/rear/backup/NETFS/default/500_make_backup.sh b/usr/share/rear/backup/NETFS/default/500_make_backup.sh
 index 02c204c5..60c80b5f 100644
 --- a/usr/share/rear/backup/NETFS/default/500_make_backup.sh
 +++ b/usr/share/rear/backup/NETFS/default/500_make_backup.sh
@@ -16,6 +16,8 @@ function set_tar_features () {
     FEATURE_TAR_IS_SET=1
 }
 +local backup_prog_rc
 +
 local scheme=$( url_scheme $BACKUP_URL )
 local path=$( url_path $BACKUP_URL )
 local opath=$( backup_path $scheme $path )
 diff --git a/usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh b/usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh
 index c560ec94..1692ba4c 100644
 --- a/usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh
 +++ b/usr/share/rear/backup/RSYNC/GNU/Linux/610_start_selinux.sh
@@ -1,5 +1,7 @@
 # Start SELinux if it was stopped - check presence of  $TMP_DIR/selinux.mode
 +local backup_prog_rc
 +
 [ -f $TMP_DIR/selinux.mode ] && {
 	touch "${TMP_DIR}/selinux.autorelabel"
 	cat $TMP_DIR/selinux.mode > $SELINUX_ENFORCE
@@ -13,19 +15,19 @@
 		ssh $RSYNC_USER@$RSYNC_HOST "chmod $v 755 ${RSYNC_PATH}/${RSYNC_PREFIX}/backup" 2>/dev/null
 		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" \
 		 "$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}/backup/.autorelabel" 2>/dev/null
 -		_rc=$?
 -		if [ $_rc -ne 0 ]; then
 -			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$_rc]}]"
 +		backup_prog_rc=$?
 +		if [ $backup_prog_rc -ne 0 ]; then
 +			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$backup_prog_rc]}]"
 			#StopIfError "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup"
 		fi
 		;;
 	(rsync)
 -		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" ${BACKUP_RSYNC_OPTIONS[@]} \
 +		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" "${BACKUP_RSYNC_OPTIONS[@]}" \
 		 "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/backup/.autorelabel"
 -		_rc=$?
 -		if [ $_rc -ne 0 ]; then
 -			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$_rc]}]"
 +		backup_prog_rc=$?
 +		if [ $backup_prog_rc -ne 0 ]; then
 +			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$backup_prog_rc]}]"
 			#StopIfError "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup"
 		fi
 		;;
 diff --git a/usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh b/usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh
 index cae12e38..9a17d6bb 100644
 --- a/usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh
 +++ b/usr/share/rear/backup/RSYNC/GNU/Linux/620_force_autorelabel.sh
@@ -1,3 +1,5 @@
 +local backup_prog_rc
 +
 [ -f $TMP_DIR/force.autorelabel ] && {
 	> "${TMP_DIR}/selinux.autorelabel"
@@ -11,19 +13,19 @@
 		ssh $RSYNC_USER@$RSYNC_HOST "chmod $v 755 ${RSYNC_PATH}/${RSYNC_PREFIX}/backup" 2>/dev/null
 		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" \
 		 "$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}/backup/.autorelabel" 2>/dev/null
 -		_rc=$?
 -		if [ $_rc -ne 0 ]; then
 -			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$_rc]}]"
 +		backup_prog_rc=$?
 +		if [ $backup_prog_rc -ne 0 ]; then
 +			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$backup_prog_rc]}]"
 			#StopIfError "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup"
 		fi
 		;;
 	(rsync)
 -		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" ${BACKUP_RSYNC_OPTIONS[@]} \
 +		$BACKUP_PROG -a "${TMP_DIR}/selinux.autorelabel" "${BACKUP_RSYNC_OPTIONS[@]}" \
 		 "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/backup/.autorelabel"
 -		_rc=$?
 -		if [ $_rc -ne 0 ]; then
 -			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$_rc]}]"
 +		backup_prog_rc=$?
 +		if [ $backup_prog_rc -ne 0 ]; then
 +			LogPrint "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup [${rsync_err_msg[$backup_prog_rc]}]"
 			#StopIfError "Failed to create .autorelabel on ${RSYNC_PATH}/${RSYNC_PREFIX}/backup"
 		fi
 		;;
@@ -35,8 +37,7 @@
 		# probably using the BACKUP=NETFS workflow instead
 		if [ -d "${opath}" ]; then
 			if [ ! -f "${opath}/selinux.autorelabel" ]; then
 -				> "${opath}/selinux.autorelabel"
 -				StopIfError "Failed to create selinux.autorelabel on ${opath}"
 +				> "${opath}/selinux.autorelabel" || Error "Failed to create selinux.autorelabel on ${opath}"
 			fi
 		fi
 		;;
 diff --git a/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh b/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh
 index 60330007..cedee9ce 100644
 --- a/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh
 +++ b/usr/share/rear/backup/RSYNC/default/200_check_rsync_relative_option.sh
@@ -4,7 +4,7 @@
 # check for the --relative option in BACKUP_RSYNC_OPTIONS array
 # for the default values see the standard definition in conf/default.conf file
 -if ! grep -q relative <<< $(echo ${BACKUP_RSYNC_OPTIONS[@]}); then
 +if ! grep -q relative <<< "${BACKUP_RSYNC_OPTIONS[*]}" ; then
     BACKUP_RSYNC_OPTIONS+=( --relative )
     Log "Added option '--relative' to the BACKUP_RSYNC_OPTIONS array during $WORKFLOW workflow"
 fi
 diff --git a/usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh b/usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh
 index 0d67d362..750a04ca 100644
 --- a/usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh
 +++ b/usr/share/rear/backup/RSYNC/default/500_make_rsync_backup.sh
@@ -2,6 +2,9 @@
 # This file is part of Relax-and-Recover, licensed under the GNU General
 # Public License. Refer to the included COPYING for full text of license.
 +local backup_prog_rc
 +local backup_log_message
 +
 Log "Include list:"
 while read -r ; do
 	Log "  $REPLY"
@@ -11,9 +14,9 @@ while read -r ; do
 	Log " $REPLY"
 done < $TMP_DIR/backup-exclude.txt
 -LogPrint "Creating $BACKUP_PROG archive on '${RSYNC_HOST}:${RSYNC_PATH}'"
 +LogPrint "Creating $BACKUP_PROG backup on '${RSYNC_HOST}:${RSYNC_PATH}'"
 -ProgressStart "Running archive operation"
 +ProgressStart "Running backup operation"
 (
 	case "$(basename $BACKUP_PROG)" in
@@ -37,7 +40,7 @@ ProgressStart "Running archive operation"
 			;;
 		(*)
 -			# no other backup programs foreseen then rsync so far
 +			# no other backup programs foreseen than rsync so far
 			:
 			;;
@@ -96,7 +99,7 @@ case "$(basename $BACKUP_PROG)" in
 			;;
 			esac
 -			ProgressInfo "Archived $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec]"
 +			ProgressInfo "Backed up $((size/1024/1024)) MiB [avg $((size/1024/(SECONDS-starttime))) KiB/sec]"
 		done
 		;;
@@ -113,24 +116,23 @@ ProgressStop
 wait $BackupPID
 transfertime="$((SECONDS-starttime))"
 -_rc="$(cat $TMP_DIR/retval)"
 +backup_prog_rc="$(cat $TMP_DIR/retval)"
 sleep 1
 # everyone should see this warning, even if not verbose
 -test "$_rc" -gt 0 && VERBOSE=1 LogPrint "WARNING !
 -There was an error (${rsync_err_msg[$_rc]}) during archive creation.
 -Please check the archive and see '$RUNTIME_LOGFILE' for more information.
 +test "$backup_prog_rc" -gt 0 && Error "
 +There was an error (${rsync_err_msg[$backup_prog_rc]}) during backup creation.
 +Please check the destination and see '$RUNTIME_LOGFILE' for more information.
 -Since errors are often related to files that cannot be saved by
 -$BACKUP_PROG, we will continue the $WORKFLOW process. However, you MUST
 -verify the backup yourself before trusting it !
 +If the error is related to files that cannot and should not be saved by
 +$BACKUP_PROG, they should be excluded from the backup.
 "
 -_message="$(tail -14 ${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log)"
 -if [ $_rc -eq 0 -a "$_message" ] ; then
 -	LogPrint "$_message in $transfertime seconds."
 +backup_log_message="$(tail -14 ${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log)"
 +if [ $backup_prog_rc -eq 0 -a "$backup_log_message" ] ; then
 +	LogPrint "$backup_log_message in $transfertime seconds."
 elif [ "$size" ]; then
 -	LogPrint "Archived $((size/1024/1024)) MiB in $((transfertime)) seconds [avg $((size/1024/transfertime)) KiB/sec]"
 +	LogPrint "Backed up $((size/1024/1024)) MiB in $((transfertime)) seconds [avg $((size/1024/transfertime)) KiB/sec]"
 fi
 diff --git a/usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh b/usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh
 index 01801a4e..b90d459b 100644
 --- a/usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh
 +++ b/usr/share/rear/backup/RSYNC/default/700_copy_backup_log.sh
@@ -1,6 +1,8 @@
 # copy the backup.log & rear.log file to remote destination with timestamp added
 -Timestamp=$( date +%Y%m%d.%H%M )
 +local timestamp
 +
 +timestamp=$( date +%Y%m%d.%H%M )
 # compress the log file first
 gzip "$TMP_DIR/$BACKUP_PROG_ARCHIVE.log" || Error "Failed to 'gzip $TMP_DIR/$BACKUP_PROG_ARCHIVE.log'"
@@ -10,15 +12,15 @@ case $RSYNC_PROTO in
         # FIXME: Add an explanatory comment why "2>/dev/null" is useful here
         # or remove it according to https://github.com/rear/rear/issues/1395
         $BACKUP_PROG -a "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log.gz" \
 -        "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/${BACKUP_PROG_ARCHIVE}-${Timestamp}.log.gz" 2>/dev/null
 +        "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/${BACKUP_PROG_ARCHIVE}-${timestamp}.log.gz" 2>/dev/null
 -        $BACKUP_PROG -a "$RUNTIME_LOGFILE" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/rear-${Timestamp}.log" 2>/dev/null
 +        $BACKUP_PROG -a "$RUNTIME_LOGFILE" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/rear-${timestamp}.log" 2>/dev/null
         ;;
     (rsync)
 -        $BACKUP_PROG -a "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log.gz" ${BACKUP_RSYNC_OPTIONS[@]} \
 -        "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/${BACKUP_PROG_ARCHIVE}-${Timestamp}.log.gz"
 +        $BACKUP_PROG -a "${TMP_DIR}/${BACKUP_PROG_ARCHIVE}.log.gz" "${BACKUP_RSYNC_OPTIONS[@]}" \
 +        "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/${BACKUP_PROG_ARCHIVE}-${timestamp}.log.gz"
 -        $BACKUP_PROG -a "$RUNTIME_LOGFILE" ${BACKUP_RSYNC_OPTIONS[@]} "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}//rear-${Timestamp}.log"
 +        $BACKUP_PROG -a "$RUNTIME_LOGFILE" "${BACKUP_RSYNC_OPTIONS[@]}" "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}//rear-${timestamp}.log"
         ;;
 esac
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 455aa3ce..0c230f38 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -1106,7 +1106,8 @@ BACKUP_ONLY_EXCLUDE="no"
 MANUAL_INCLUDE=NO
 # Disable SELinux policy during backup with NETFS or RSYNC (default yes)
 BACKUP_SELINUX_DISABLE=1
 -# Enable integrity check of the backup archive (only with BACKUP=NETFS and BACKUP_PROG=tar)
 +# Enable integrity check of the backup archive (full check only with BACKUP=NETFS and BACKUP_PROG=tar,
 +# with BACKUP=rsync or BACKUP_PROG=rsync it only checks whether rsync completed the restore successfully)
 BACKUP_INTEGRITY_CHECK=
 # Define BACKUP_TYPE.
 # By default BACKUP_TYPE is empty which means "rear mkbackup" will create a full backup.
 diff --git a/usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh b/usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh
 index 32ac391d..519febf5 100644
 --- a/usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh
 +++ b/usr/share/rear/output/RSYNC/default/200_make_prefix_dir.sh
@@ -2,21 +2,19 @@
 # RSYNC_PREFIX=$HOSTNAME as set in default.conf
 # create temporary local work-spaces to collect files (we already make the remote backup dir with the correct mode!!)
 -mkdir -p $v -m0750 "${TMP_DIR}/rsync/${RSYNC_PREFIX}" >&2
 -StopIfError "Could not mkdir '${TMP_DIR}/rsync/${RSYNC_PREFIX}'"
 -mkdir -p $v -m0755 "${TMP_DIR}/rsync/${RSYNC_PREFIX}/backup" >&2
 -StopIfError "Could not mkdir '${TMP_DIR}/rsync/${RSYNC_PREFIX}/backup'"
 +mkdir -p $v -m0750 "${TMP_DIR}/rsync/${RSYNC_PREFIX}" >&2 || Error "Could not mkdir '${TMP_DIR}/rsync/${RSYNC_PREFIX}'"
 +mkdir -p $v -m0755 "${TMP_DIR}/rsync/${RSYNC_PREFIX}/backup" >&2 || Error "Could not mkdir '${TMP_DIR}/rsync/${RSYNC_PREFIX}/backup'"
 case $RSYNC_PROTO in
 	(ssh)
 -		$BACKUP_PROG -a $v -r "${TMP_DIR}/rsync/${RSYNC_PREFIX}" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}" >/dev/null 2>&1
 -		StopIfError "Could not create '${RSYNC_PATH}/${RSYNC_PREFIX}' on remote ${RSYNC_HOST}"
 +		$BACKUP_PROG -a $v -r "${TMP_DIR}/rsync/${RSYNC_PREFIX}" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}" >/dev/null 2>&1 \
 +                    || Error "Could not create '${RSYNC_PATH}/${RSYNC_PREFIX}' on remote ${RSYNC_HOST}"
 		;;
 	(rsync)
 -		$BACKUP_PROG -a $v -r "${TMP_DIR}/rsync/${RSYNC_PREFIX}" ${BACKUP_RSYNC_OPTIONS[@]} "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/" >/dev/null
 -		StopIfError "Could not create '${RSYNC_PATH}/${RSYNC_PREFIX}' on remote ${RSYNC_HOST}"
 +		$BACKUP_PROG -a $v -r "${TMP_DIR}/rsync/${RSYNC_PREFIX}" "${BACKUP_RSYNC_OPTIONS[@]}" "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/" >/dev/null \
 +                    || Error "Could not create '${RSYNC_PATH}/${RSYNC_PREFIX}' on remote ${RSYNC_HOST}"
 		;;
 esac
 diff --git a/usr/share/rear/output/RSYNC/default/900_copy_result_files.sh b/usr/share/rear/output/RSYNC/default/900_copy_result_files.sh
 index c7b430d8..96b62da1 100644
 --- a/usr/share/rear/output/RSYNC/default/900_copy_result_files.sh
 +++ b/usr/share/rear/output/RSYNC/default/900_copy_result_files.sh
@@ -5,19 +5,19 @@ LogPrint "Copying resulting files to $OUTPUT_URL location"
 # if called as mkbackuponly then we just don't have any result files.
 if test "$RESULT_FILES" ; then
 -    Log "Copying files '${RESULT_FILES[@]}' to $OUTPUT_URL location"
 -    cp $v "${RESULT_FILES[@]}" "${TMP_DIR}/rsync/${RSYNC_PREFIX}/"
 -    StopIfError "Could not copy files to local rsync location"
 +    Log "Copying files '${RESULT_FILES[*]}' to $OUTPUT_URL location"
 +    cp $v "${RESULT_FILES[@]}" "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" \
 +        || Error "Could not copy files to local rsync location"
 fi
 -echo "$VERSION_INFO" >"${TMP_DIR}/rsync/${RSYNC_PREFIX}/VERSION"
 -StopIfError "Could not create VERSION file on local rsync location"
 +echo "$VERSION_INFO" >"${TMP_DIR}/rsync/${RSYNC_PREFIX}/VERSION" \
 +    || Error "Could not create VERSION file on local rsync location"
 -cp $v $(get_template "RESULT_usage_$OUTPUT.txt") "${TMP_DIR}/rsync/${RSYNC_PREFIX}/README"
 -StopIfError "Could not copy usage file to local rsync location"
 +cp $v $(get_template "RESULT_usage_$OUTPUT.txt") "${TMP_DIR}/rsync/${RSYNC_PREFIX}/README" \
 +    || Error "Could not copy usage file to local rsync location"
 -cat "$RUNTIME_LOGFILE" >"${TMP_DIR}/rsync/${RSYNC_PREFIX}/rear.log"
 -StopIfError "Could not copy $RUNTIME_LOGFILE to local rsync location"
 +cat "$RUNTIME_LOGFILE" >"${TMP_DIR}/rsync/${RSYNC_PREFIX}/rear.log" \
 +    || Error "Could not copy $RUNTIME_LOGFILE to local rsync location"
 case $RSYNC_PROTO in
@@ -25,20 +25,20 @@ case $RSYNC_PROTO in
     Log "$BACKUP_PROG -a ${TMP_DIR}/rsync/${RSYNC_PREFIX}/ ${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/"
     # FIXME: Add an explanatory comment why "2>/dev/null" is useful here
     # or remove it according to https://github.com/rear/rear/issues/1395
 -    $BACKUP_PROG -a "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/" 2>/dev/null
 -    StopIfError "Could not copy '${RESULT_FILES[@]}' to $OUTPUT_URL location"
 +    $BACKUP_PROG -a "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}/${RSYNC_PREFIX}/" 2>/dev/null \
 +        || Error "Could not copy '${RESULT_FILES[*]}' to $OUTPUT_URL location"
     ;;
     (rsync)
 -    Log "$BACKUP_PROG -a ${TMP_DIR}/rsync/${RSYNC_PREFIX}/ ${BACKUP_RSYNC_OPTIONS[@]} ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/"
 +    Log "$BACKUP_PROG -a ${TMP_DIR}/rsync/${RSYNC_PREFIX}/ ${BACKUP_RSYNC_OPTIONS[*]} ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/"
     # FIXME: Add an explanatory comment why "2>/dev/null" is useful here
     # or remove it according to https://github.com/rear/rear/issues/1395
 -    $BACKUP_PROG -a "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" ${BACKUP_RSYNC_OPTIONS[@]} "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/" 2>/dev/null
 -    StopIfError "Could not copy '${RESULT_FILES[@]}' to $OUTPUT_URL location"
 +    $BACKUP_PROG -a "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" "${BACKUP_RSYNC_OPTIONS[@]}" "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/" 2>/dev/null \
 +        || Error "Could not copy '${RESULT_FILES[*]}' to $OUTPUT_URL location"
     ;;
 esac
 # cleanup the temporary space (need it for the log file during backup)
 -rm -rf "${TMP_DIR}/rsync/${RSYNC_PREFIX}/"
 -LogIfError "Could not cleanup temoprary rsync space: ${TMP_DIR}/rsync/${RSYNC_PREFIX}/"
 +rm -rf "${TMP_DIR}/rsync/${RSYNC_PREFIX}/" \
 +    || Log "Could not cleanup temporary rsync space: ${TMP_DIR}/rsync/${RSYNC_PREFIX}/"
 diff --git a/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh b/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh
 index fadf9d72..3c719c44 100644
 --- a/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh
 +++ b/usr/share/rear/prep/NETFS/default/400_automatic_exclude_recreate.sh
@@ -31,7 +31,7 @@ case $scheme in
         backup_directory_mountpoint=$( df -P "$backup_directory" | tail -1 | awk '{print $6}' )
         test "/" = "$backup_directory_mountpoint" && Error "URL '$BACKUP_URL' has the backup directory '$backup_directory' in the '/' filesystem which is forbidden."
         # When the mountpoint of the backup directory is not yet excluded add its mountpoint to the EXCLUDE_RECREATE array:
 -        if ! grep -q "$backup_directory_mountpoint" <<< $( echo ${EXCLUDE_RECREATE[@]} ) ; then
 +        if ! grep -q "$backup_directory_mountpoint" <<< "${EXCLUDE_RECREATE[*]}" ; then
             EXCLUDE_RECREATE+=( "fs:$backup_directory_mountpoint" )
         fi
         ;;
 diff --git a/usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh b/usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh
 index ac26edfa..eb7df29e 100644
 --- a/usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh
 +++ b/usr/share/rear/prep/RSYNC/GNU/Linux/200_selinux_in_use.sh
@@ -33,7 +33,7 @@ case $(basename $BACKUP_PROG) in
 			touch $TMP_DIR/force.autorelabel	# after reboot the restored system do a forced SELinux relabeling
 		else
 			# if --xattrs is already set; no need to do it again
 -			if ! grep -q xattrs <<< $(echo ${BACKUP_RSYNC_OPTIONS[@]}); then
 +			if ! grep -q xattrs <<< "${BACKUP_RSYNC_OPTIONS[*]}" ; then
 				BACKUP_RSYNC_OPTIONS+=( --xattrs )
 			fi
 			RSYNC_SELINUX=1		# variable used in recover mode (means using xattr and not disable SELinux)
 diff --git a/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh b/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh
 index b8535352..c964a148 100644
 --- a/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh
 +++ b/usr/share/rear/prep/RSYNC/default/100_check_rsync.sh
@@ -33,22 +33,20 @@ RSYNC_PORT=873                  # default port (of rsync server)
 RSYNC_PATH=
 -echo $BACKUP_URL | egrep -q '(::)'      # new style '::' means rsync protocol
 -if [[ $? -eq 0 ]]; then
 +if egrep -q '(::)' <<< $BACKUP_URL ; then # new style '::' means rsync protocol
     RSYNC_PROTO=rsync
 else
     RSYNC_PROTO=ssh
 fi
 -echo $host | grep -q '@'
 -if [[ $? -eq 0 ]]; then
 +if grep -q '@' <<< $host ; then
     RSYNC_USER="${host%%@*}"    # grab user name
 else
     RSYNC_USER=root
 fi
 # remove USER@ if present (we don't need it anymore)
 -tmp2="${host#*@}"
 +local tmp2="${host#*@}"
 case "$RSYNC_PROTO" in
@@ -56,8 +54,7 @@ case "$RSYNC_PROTO" in
         # tmp2=witsbebelnx02::backup or tmp2=witsbebelnx02::
         RSYNC_HOST="${tmp2%%::*}"
         # path=/gdhaese1@witsbebelnx02::backup or path=/backup
 -        echo $path | grep -q '::'
 -        if [[ $? -eq 0 ]]; then
 +        if grep -q '::' <<< $path ; then
             RSYNC_PATH="${path##*::}"
         else
             RSYNC_PATH="${path##*/}"
@@ -79,8 +76,7 @@ esac
 # check if host is reachable
 if test "$PING" ; then
 -    ping -c 2 "$RSYNC_HOST" >/dev/null
 -    StopIfError "Backup host [$RSYNC_HOST] not reachable."
 +    ping -c 2 "$RSYNC_HOST" >/dev/null || Error "Backup host [$RSYNC_HOST] not reachable."
 else
     Log "Skipping ping test"
 fi
@@ -89,15 +85,15 @@ fi
 case "$RSYNC_PROTO" in
     (rsync)
 -        Log "Test: $BACKUP_PROG ${BACKUP_RSYNC_OPTIONS[@]} ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/"
 -        $BACKUP_PROG ${BACKUP_RSYNC_OPTIONS[@]} ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/ >/dev/null
 -        StopIfError "Rsync daemon not running on $RSYNC_HOST"
 +        Log "Test: $BACKUP_PROG ${BACKUP_RSYNC_OPTIONS[*]} ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/"
 +        $BACKUP_PROG "${BACKUP_RSYNC_OPTIONS[@]}" ${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/ >/dev/null \
 +            || Error "Rsync daemon not running on $RSYNC_HOST"
         ;;
     (ssh)
         Log "Test: ssh ${RSYNC_USER}@${RSYNC_HOST} /bin/true"
 -        ssh ${RSYNC_USER}@${RSYNC_HOST} /bin/true >/dev/null 2>&1
 -        StopIfError "Secure shell connection not setup properly [$RSYNC_USER@$RSYNC_HOST]"
 +        ssh ${RSYNC_USER}@${RSYNC_HOST} /bin/true >/dev/null 2>&1 \
 +            || Error "Secure shell connection not setup properly [$RSYNC_USER@$RSYNC_HOST]"
         ;;
 esac
 diff --git a/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh b/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh
 index 446dd736..e9103531 100644
 --- a/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh
 +++ b/usr/share/rear/prep/RSYNC/default/150_check_rsync_protocol_version.sh
@@ -2,15 +2,17 @@
 # This file is part of Relax-and-Recover, licensed under the GNU General
 # Public License. Refer to the included COPYING for full text of license.
 # try to grab the rsync protocol version of rsync on the remote server
 +
 +local remote_mountpoint
 +
 if [ -z "$RSYNC_PROTOCOL_VERSION" ]; then
     case $RSYNC_PROTO in
     (ssh)
 -        ssh ${RSYNC_USER}@${RSYNC_HOST} rsync --version >"$TMP_DIR/rsync_protocol" 2>&1
 -        StopIfError "Secure shell connection not setup properly [$RSYNC_USER@$RSYNC_HOST]"
 -        grep -q "protocol version" "$TMP_DIR/rsync_protocol"
 -        if [ $? -eq 0 ]; then
 +        ssh ${RSYNC_USER}@${RSYNC_HOST} rsync --version >"$TMP_DIR/rsync_protocol" 2>&1 \
 +            || Error "Secure shell connection not setup properly [$RSYNC_USER@$RSYNC_HOST]"
 +        if grep -q "protocol version" "$TMP_DIR/rsync_protocol" ; then
             RSYNC_PROTOCOL_VERSION=$(grep 'protocol version' "$TMP_DIR/rsync_protocol" | awk '{print $6}')
         else
             RSYNC_PROTOCOL_VERSION=29   # being conservative (old rsync version < 3.0)
@@ -30,25 +32,21 @@ else
 fi
 -if [ "${RSYNC_USER}" != "root" ]; then
 +if [ "${RSYNC_USER}" != "root" -a $RSYNC_PROTO = "ssh" ]; then
     if [ $RSYNC_PROTOCOL_VERSION -gt 29 ]; then
         if grep -q "no xattrs" "$TMP_DIR/rsync_protocol"; then
             # no xattrs available in remote rsync, so --fake-super is not possible
             Error "rsync --fake-super not possible on system ($RSYNC_HOST) (no xattrs compiled in rsync)"
         else
             # when using --fake-super we must have user_xattr mount options on the remote mntpt
 -            _mntpt=$(ssh ${RSYNC_USER}@${RSYNC_HOST} 'cd ${RSYNC_PATH}; df -P .' 2>/dev/null | tail -1 | awk '{print $6}')
 -            ssh ${RSYNC_USER}@${RSYNC_HOST} "cd ${RSYNC_PATH} && touch .is_xattr_supported && setfattr -n user.comment -v 'File created by ReaR to test if this filesystems supports extended attributes.' .is_xattr_supported && getfattr -n user.comment .is_xattr_supported 1>/dev/null; find .is_xattr_supported -empty -delete"
 -            StopIfError "Remote file system $_mntpt does not have user_xattr mount option set!"
 -            #BACKUP_RSYNC_OPTIONS+=( --xattrs --rsync-path="""rsync --fake-super""" )
 +            remote_mountpoint=$(ssh ${RSYNC_USER}@${RSYNC_HOST} 'cd ${RSYNC_PATH}; df -P .' 2>/dev/null | tail -1 | awk '{print $6}')
 +            ssh ${RSYNC_USER}@${RSYNC_HOST} "cd ${RSYNC_PATH} && touch .is_xattr_supported && setfattr -n user.comment -v 'File created by ReaR to test if this filesystems supports extended attributes.' .is_xattr_supported && getfattr -n user.comment .is_xattr_supported 1>/dev/null; find .is_xattr_supported -empty -delete" \
 +                || Error "Remote file system $remote_mountpoint does not have user_xattr mount option set!"
 +            #BACKUP_RSYNC_OPTIONS+=( --xattrs --rsync-path="rsync --fake-super" )
             # see issue #366 for explanation of removing --xattrs
 -            BACKUP_RSYNC_OPTIONS+=( --rsync-path="""rsync --fake-super""" )
 +            BACKUP_RSYNC_OPTIONS+=( --rsync-path="rsync --fake-super" )
         fi
     else
 -        if [ ${BACKUP_RSYNC_OPTIONS[@]/--fake-super/} != ${BACKUP_RSUNC_OPTIONS[@]} ]; then
 -            Error "rsync --fake-super not possible on system ($RSYNC_HOST) (please upgrade rsync to 3.x)"
 -        else
 -            Log "Warning: rsync --fake-super not possible on system ($RSYNC_HOST) (please upgrade rsync to 3.x)"
 -        fi
 +        Error "rsync --fake-super not possible on system ($RSYNC_HOST) (please upgrade rsync to 3.x)"
     fi
 fi
 diff --git a/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh b/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh
 index 0a9c9648..220ccc57 100644
 --- a/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh
 +++ b/usr/share/rear/restore/DUPLICITY/default/400_restore_duplicity.sh
@@ -5,6 +5,8 @@
 # Restore from remote backup via DUPLICIY over rsync
 if [ "$BACKUP_PROG" = "duplicity" ]; then
 +    local backup_prog_rc
 +    local restore_log_message
     LogPrint "========================================================================"
     LogPrint "Restoring backup with $BACKUP_PROG from '$BACKUP_DUPLICITY_URL'"
@@ -49,7 +51,8 @@ if [ "$BACKUP_PROG" = "duplicity" ]; then
         LogPrint "with CMD: $DUPLICITY_PROG -v 5 $GPG_KEY --force --tempdir=$DUPLICITY_TEMPDIR $BACKUP_DUPLICITY_URL/$HOSTNAME/ $TARGET_FS_ROOT"
         $DUPLICITY_PROG -v 5 $GPG_KEY --force --tempdir="$DUPLICITY_TEMPDIR" $BACKUP_DUPLICITY_URL/$HOSTNAME/ $TARGET_FS_ROOT 0<&6 | tee $TMP_DIR/duplicity-restore.log
     fi
 -    _rc=$?
 +    # FIXME: this collects the exit code from "tee", not from $DUPLICITY_PROG
 +    backup_prog_rc=$?
     transfertime="$((SECONDS-$starttime))"
     sleep 1
@@ -65,20 +68,20 @@ if [ "$BACKUP_PROG" = "duplicity" ]; then
     LogPrint "========================================================================"
 -    if [ "$_rc" -gt 0 ]; then
 +    if [ "$backup_prog_rc" -gt 0 ]; then
         LogPrint "WARNING !
     There was an error while restoring the archive.
     Please check '$RUNTIME_LOGFILE' and $TMP_DIR/duplicity-restore.log for more information.
     You should also manually check the restored system to see whether it is complete.
     "
 -        _message="$(tail -14 ${TMP_DIR}/duplicity-restore.log)"
 +        restore_log_message="$(tail -14 ${TMP_DIR}/duplicity-restore.log)"
         LogPrint "Last 14 Lines of ${TMP_DIR}/duplicity-restore.log:"
 -        LogPrint "$_message"
 +        LogPrint "$restore_log_message"
     fi
 -    if [ $_rc -eq 0 ] ; then
 +    if [ $backup_prog_rc -eq 0 ] ; then
         LogPrint "Restore completed in $transfertime seconds."
     fi
 diff --git a/usr/share/rear/restore/RBME/default/400_restore_backup.sh b/usr/share/rear/restore/RBME/default/400_restore_backup.sh
 index 28a3c354..3e97e16b 100644
 --- a/usr/share/rear/restore/RBME/default/400_restore_backup.sh
 +++ b/usr/share/rear/restore/RBME/default/400_restore_backup.sh
@@ -2,6 +2,8 @@ if [[ -z "$RBME_BACKUP" ]] ; then
     Error "No RBME backup selected (BACKUP_URL?). Aborting."
 fi
 +local backup_prog_rc
 +
 scheme=$(url_scheme "$BACKUP_URL")
 LogPrint "Restoring from backup $RBME_BACKUP."
@@ -43,11 +45,11 @@ transfertime="$((SECONDS-starttime))"
 # harvest return code from background job. The kill -0 $BackupPID loop above should
 # have made sure that this wait won't do any real "waiting" :-)
 wait $BackupPID
 -_rc=$?
 +backup_prog_rc=$?
 sleep 1
 -test "$_rc" -gt 0 && LogPrint "WARNING !
 -There was an error (${rsync_err_msg[$_rc]}) while restoring the archive.
 +test "$backup_prog_rc" -gt 0 && LogPrint "WARNING !
 +There was an error (${rsync_err_msg[$backup_prog_rc]}) while restoring the archive.
 Please check '$RUNTIME_LOGFILE' for more information. You should also
 manually check the restored system to see whether it is complete.
 "
 diff --git a/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh b/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh
 index 53915322..a792f195 100644
 --- a/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh
 +++ b/usr/share/rear/restore/RSYNC/default/200_remove_relative_rsync_option.sh
@@ -4,11 +4,11 @@
 # without the --relative option ; my feeling says it is better to remove it from array BACKUP_RSYNC_OPTIONS
 # If I'm wrong please let us know (use issue mentioned above to comment)
 -if grep -q relative <<< $(echo ${BACKUP_RSYNC_OPTIONS[@]}); then
 +if grep -q -- "--relative" <<< "${BACKUP_RSYNC_OPTIONS[*]}" ; then
     BACKUP_RSYNC_OPTIONS=( $( RmInArray "--relative" "${BACKUP_RSYNC_OPTIONS[@]}" ) )
     Log "Removed option '--relative' from the BACKUP_RSYNC_OPTIONS array during $WORKFLOW workflow"
 fi
 -if grep -q "-R" <<< $(echo ${BACKUP_RSYNC_OPTIONS[@]}); then
 +if grep -q -- "-R" <<< "${BACKUP_RSYNC_OPTIONS[*]}" ; then
     BACKUP_RSYNC_OPTIONS=( $( RmInArray "-R" "${BACKUP_RSYNC_OPTIONS[@]}" ) )
     Log "Removed option '-R' from the BACKUP_RSYNC_OPTIONS array during $WORKFLOW workflow"
 fi
 diff --git a/usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh b/usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh
 index 2a0bf15e..993088be 100644
 --- a/usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh
 +++ b/usr/share/rear/restore/RSYNC/default/400_restore_rsync_backup.sh
@@ -4,10 +4,10 @@ get_size() {
 	echo $( stat --format '%s' "$TARGET_FS_ROOT/$1" )
 }
 -mkdir -p "${TMP_DIR}/rsync/${NETFS_PREFIX}"
 -StopIfError "Could not mkdir '$TMP_DIR/rsync/${NETFS_PREFIX}'"
 +local backup_prog_rc
 +local restore_log_message
 -LogPrint "Restoring $BACKUP_PROG archive from '${RSYNC_HOST}:${RSYNC_PATH}'"
 +LogPrint "Restoring $BACKUP_PROG backup from '${RSYNC_HOST}:${RSYNC_PATH}'"
 ProgressStart "Restore operation"
 (
@@ -33,9 +33,10 @@ ProgressStart "Restore operation"
 			;;
 		(*)
 -			# no other backup programs foreseen then rsync so far
 +			# no other backup programs foreseen than rsync so far
 			:
 			;;
 +
 	esac
 	echo $? >$TMP_DIR/retval
 ) >"${TMP_DIR}/${BACKUP_PROG_ARCHIVE}-restore.log" &
@@ -65,6 +66,7 @@ case "$(basename $BACKUP_PROG)" in
 			ProgressStep
 		done
 		;;
 +
 esac
 ProgressStop
@@ -72,20 +74,28 @@ transfertime="$((SECONDS-starttime))"
 # harvest return code from background job. The kill -0 $BackupPID loop above should
 # have made sure that this wait won't do any real "waiting" :-)
 -wait $BackupPID
 -_rc=$?
 +wait $BackupPID || LogPrintError "Restore job returned a nonzero exit code $?"
 +# harvest the actual return code of rsync. Finishing the pipeline with an error code above is actually unlikely,
 +# because rsync is not the last command in it. But error returns from rsync are common and must be handled.
 +backup_prog_rc="$(cat $TMP_DIR/retval)"
 sleep 1
 -test "$_rc" -gt 0 && LogPrint "WARNING !
 -There was an error (${rsync_err_msg[$_rc]}) while restoring the archive.
 +if test "$backup_prog_rc" -gt 0 ; then
 +    # TODO: Shouldn't we tell the user to check ${TMP_DIR}/${BACKUP_PROG_ARCHIVE}-restore.log as well?
 +    LogPrintError "WARNING !
 +There was an error (${rsync_err_msg[$backup_prog_rc]}) while restoring the backup.
 Please check '$RUNTIME_LOGFILE' for more information. You should also
 manually check the restored system to see whether it is complete.
 "
 +    is_true "$BACKUP_INTEGRITY_CHECK" && Error "Integrity check failed, restore aborted because BACKUP_INTEGRITY_CHECK is enabled"
 +fi
 -_message="$(tail -14 ${TMP_DIR}/${BACKUP_PROG_ARCHIVE}-restore.log)"
 +restore_log_message="$(tail -14 ${TMP_DIR}/${BACKUP_PROG_ARCHIVE}-restore.log)"
 -if [ $_rc -eq 0 -a "$_message" ] ; then
 -        LogPrint "$_message in $transfertime seconds."
 +if [ $backup_prog_rc -eq 0 -a "$restore_log_message" ] ; then
 +        LogPrint "$restore_log_message in $transfertime seconds."
 elif [ "$size" ]; then
         LogPrint "Restored $((size/1024/1024)) MiB in $((transfertime)) seconds [avg $((size/1024/transfertime)) KiB/sec]"
 fi
 +
 +return $backup_prog_rc
 diff --git a/usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh b/usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh
 index 3622884a..890161f1 100644
 --- a/usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh
 +++ b/usr/share/rear/verify/RSYNC/GNU/Linux/600_check_rsync_xattr.sh
@@ -3,8 +3,8 @@
 [[ $RSYNC_SELINUX ]] && {
 	# if --xattrs is already set; no need to do it again
 -	if ! grep -q xattrs <<< $(echo ${BACKUP_RSYNC_OPTIONS[@]}); then
 -		RSYNC_OPTIONS=( "${BACKUP_RSYNC_OPTIONS[@]}" --xattrs )
 +	if ! grep -q xattrs <<< "${BACKUP_RSYNC_OPTIONS[*]}" ; then
 +		BACKUP_RSYNC_OPTIONS+=( --xattrs )
 	fi
 }
 diff --git a/usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh b/usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh
 index 47ed9e02..b2fb72f5 100644
 --- a/usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh
 +++ b/usr/share/rear/verify/RSYNC/default/550_check_remote_backup_archive.sh
@@ -3,12 +3,12 @@
 case $RSYNC_PROTO in
 	(ssh)
 -		ssh ${RSYNC_USER}@${RSYNC_HOST} "ls -ld ${RSYNC_PATH}/${RSYNC_PREFIX}/backup" >/dev/null 2>&1
 -		StopIfError "Archive not found on [$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}]"
 +		ssh ${RSYNC_USER}@${RSYNC_HOST} "ls -ld ${RSYNC_PATH}/${RSYNC_PREFIX}/backup" >/dev/null 2>&1 \
 +		    || Error "Archive not found on [$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}]"
 		;;
 	(rsync)
 -		$BACKUP_PROG "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/backup" >/dev/null 2>&1
 -		StopIfError "Archive not found on [$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}]"
 +		$BACKUP_PROG "${RSYNC_PROTO}://${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PORT}/${RSYNC_PATH}/${RSYNC_PREFIX}/backup" >/dev/null 2>&1 \
 +		    || Error "Archive not found on [$RSYNC_USER@$RSYNC_HOST:${RSYNC_PATH}/${RSYNC_PREFIX}]"
 		;;
 esac
--- a/SOURCES/rear-bz1945869.patch
+++ b/SOURCES/rear-bz1945869.patch
@ -0,0 +1,274 @@
 diff --git a/usr/share/rear/finalize/Linux-i386/670_run_efibootmgr.sh b/usr/share/rear/finalize/Linux-i386/670_run_efibootmgr.sh
 old mode 100644
 new mode 100755
 index cc646359..33d87767
 --- a/usr/share/rear/finalize/Linux-i386/670_run_efibootmgr.sh
 +++ b/usr/share/rear/finalize/Linux-i386/670_run_efibootmgr.sh
@@ -8,6 +8,10 @@ is_true $USING_UEFI_BOOTLOADER || return 0
 # (cf. finalize/Linux-i386/610_EFISTUB_run_efibootmgr.sh): 
 is_true $EFI_STUB && return
 +LogPrint "Creating EFI Boot Manager entries..."
 +
 +local esp_mountpoint esp_mountpoint_inside boot_efi_parts boot_efi_dev
 +
 # When UEFI_BOOTLOADER is not a regular file in the restored target system
 # (cf. how esp_mountpoint is set below) it means BIOS is used
 # (cf. rescue/default/850_save_sysfs_uefi_vars.sh)
@@ -15,64 +19,80 @@ is_true $EFI_STUB && return
 # because when UEFI_BOOTLOADER is empty the test below evaluates to
 #   test -f /mnt/local/
 # which also returns false because /mnt/local/ is a directory
 -# (cf. https://github.com/rear/rear/pull/2051/files#r258826856):
 -test -f "$TARGET_FS_ROOT/$UEFI_BOOTLOADER" || return 0
 +# (cf. https://github.com/rear/rear/pull/2051/files#r258826856)
 +# but using BIOS conflicts with USING_UEFI_BOOTLOADER is true
 +# i.e. we should create EFI Boot Manager entries but we cannot:
 +if ! test -f "$TARGET_FS_ROOT/$UEFI_BOOTLOADER" ; then
 +    LogPrintError "Failed to create EFI Boot Manager entries (UEFI bootloader '$UEFI_BOOTLOADER' not found under target $TARGET_FS_ROOT)"
 +    return 1
 +fi
 # Determine where the EFI System Partition (ESP) is mounted in the currently running recovery system:
 -esp_mountpoint=$( df -P "$TARGET_FS_ROOT/$UEFI_BOOTLOADER" | tail -1 | awk '{print $6}' )
 -# Use TARGET_FS_ROOT/boot/efi as fallback ESP mountpoint:
 -test "$esp_mountpoint" || esp_mountpoint="$TARGET_FS_ROOT/boot/efi"
 +esp_mountpoint=$( filesystem_name "$TARGET_FS_ROOT/$UEFI_BOOTLOADER" )
 +# Use TARGET_FS_ROOT/boot/efi as fallback ESP mountpoint (filesystem_name returns "/"
 +# if mountpoint not found otherwise):
 +if [ "$esp_mountpoint" = "/" ] ; then
 +    esp_mountpoint="$TARGET_FS_ROOT/boot/efi"
 +    LogPrint "Mountpoint of $TARGET_FS_ROOT/$UEFI_BOOTLOADER not found, trying $esp_mountpoint"
 +fi
 # Skip if there is no esp_mountpoint directory (e.g. the fallback ESP mountpoint may not exist).
 # Double quotes are mandatory here because 'test -d' without any (possibly empty) argument results true:
 -test -d "$esp_mountpoint" || return 0
 -
 -BootEfiDev="$( mount | grep "$esp_mountpoint" | awk '{print $1}' )"
 -# /dev/sda1 or /dev/mapper/vol34_part2 or /dev/mapper/mpath99p4
 -Dev=$( get_device_name $BootEfiDev )
 -# 1 (must anyway be a low nr <9)
 -ParNr=$( get_partition_number $Dev )
 -# /dev/sda or /dev/mapper/vol34_part or /dev/mapper/mpath99p or /dev/mmcblk0p
 -Disk=$( echo ${Dev%$ParNr} )
 -
 -# Strip trailing partition remainders like '_part' or '-part' or 'p'
 -# if we have 'mapper' in disk device name:
 -if [[ ${Dev/mapper//} != $Dev ]] ; then
 -    # we only expect mpath_partX or mpathpX or mpath-partX
 -    case $Disk in
 -        (*p)     Disk=${Disk%p} ;;
 -        (*-part) Disk=${Disk%-part} ;;
 -        (*_part) Disk=${Disk%_part} ;;
 -        (*)      Log "Unsupported kpartx partition delimiter for $Dev"
 -    esac
 +if ! test -d "$esp_mountpoint" ; then
 +    LogPrintError "Failed to create EFI Boot Manager entries (no ESP mountpoint directory $esp_mountpoint)"
 +    return 1
 fi
 -# For eMMC devices the trailing 'p' in the Disk value
 -# (as in /dev/mmcblk0p that is derived from /dev/mmcblk0p1)
 -# needs to be stripped (to get /dev/mmcblk0), otherwise the
 -# efibootmgr call fails because of a wrong disk device name.
 -# See also https://github.com/rear/rear/issues/2103
 -if [[ $Disk = *'/mmcblk'+([0-9])p ]] ; then
 -    Disk=${Disk%p}
 -fi
 +# Mount point inside the target system,
 +# accounting for possible trailing slashes in TARGET_FS_ROOT
 +esp_mountpoint_inside="${esp_mountpoint#${TARGET_FS_ROOT%%*(/)}}"
 -# For NVMe devices the trailing 'p' in the Disk value
 -# (as in /dev/nvme0n1p that is derived from /dev/nvme0n1p1)
 -# needs to be stripped (to get /dev/nvme0n1), otherwise the
 -# efibootmgr call fails because of a wrong disk device name.
 -# See also https://github.com/rear/rear/issues/1564
 -if [[ $Disk = *'/nvme'+([0-9])n+([0-9])p ]] ; then
 -    Disk=${Disk%p}
 +boot_efi_parts=$( find_partition "fs:$esp_mountpoint_inside" fs )
 +if ! test "$boot_efi_parts" ; then
 +    LogPrint "Unable to find ESP $esp_mountpoint_inside in layout"
 +    LogPrint "Trying to determine device currently mounted at $esp_mountpoint as fallback"
 +    boot_efi_dev="$( mount | grep "$esp_mountpoint" | awk '{print $1}' )"
 +    if ! test "$boot_efi_dev" ; then
 +        LogPrintError "Cannot create EFI Boot Manager entry (unable to find ESP $esp_mountpoint among mounted devices)"
 +        return 1
 +    fi
 +    if test $(get_component_type "$boot_efi_dev") = part ; then
 +        boot_efi_parts="$boot_efi_dev"
 +    else
 +        boot_efi_parts=$( find_partition "$boot_efi_dev" )
 +    fi
 +    if ! test "$boot_efi_parts" ; then
 +        LogPrintError "Cannot create EFI Boot Manager entry (unable to find partition for $boot_efi_dev)"
 +        return 1
 +    fi
 +    LogPrint "Using fallback EFI boot partition(s) $boot_efi_parts (unable to find ESP $esp_mountpoint_inside in layout)"
 fi
 +local bootloader partition_block_device partition_number disk efipart
 +
 # EFI\fedora\shim.efi
 -BootLoader=$( echo $UEFI_BOOTLOADER | cut -d"/" -f4- | sed -e 's;/;\\;g' )
 -LogPrint "Creating  EFI Boot Manager entry '$OS_VENDOR $OS_VERSION' for '$BootLoader' (UEFI_BOOTLOADER='$UEFI_BOOTLOADER')"
 -Log efibootmgr --create --gpt --disk ${Disk} --part ${ParNr} --write-signature --label \"${OS_VENDOR} ${OS_VERSION}\" --loader \"\\${BootLoader}\"
 -if efibootmgr --create --gpt --disk ${Disk} --part ${ParNr} --write-signature --label "${OS_VENDOR} ${OS_VERSION}" --loader "\\${BootLoader}" ; then
 -    # ok, boot loader has been set-up - tell rear we are done using following var.
 -    NOBOOTLOADER=''
 -    return
 -fi
 +bootloader=$( echo $UEFI_BOOTLOADER | cut -d"/" -f4- | sed -e 's;/;\\;g' )
 +
 +for efipart in $boot_efi_parts ; do
 +    # /dev/sda1 or /dev/mapper/vol34_part2 or /dev/mapper/mpath99p4
 +    partition_block_device=$( get_device_name $efipart )
 +    # 1 or 2 or 4 for the examples above
 +    partition_number=$( get_partition_number $partition_block_device )
 +    if ! disk=$( get_device_from_partition $partition_block_device $partition_number ) ; then
 +        LogPrintError "Cannot create EFI Boot Manager entry for ESP $partition_block_device (unable to find the underlying disk)"
 +        # do not error out - we may be able to locate other disks if there are more of them
 +        continue
 +    fi
 +    LogPrint "Creating  EFI Boot Manager entry '$OS_VENDOR $OS_VERSION' for '$bootloader' (UEFI_BOOTLOADER='$UEFI_BOOTLOADER') "
 +    Log efibootmgr --create --gpt --disk $disk --part $partition_number --write-signature --label \"${OS_VENDOR} ${OS_VERSION}\" --loader \"\\${bootloader}\"
 +    if efibootmgr --create --gpt --disk $disk --part $partition_number --write-signature --label "${OS_VENDOR} ${OS_VERSION}" --loader "\\${bootloader}" ; then
 +        # ok, boot loader has been set-up - continue with other disks (ESP can be on RAID)
 +        NOBOOTLOADER=''
 +    else
 +        LogPrintError "efibootmgr failed to create EFI Boot Manager entry on $disk partition $partition_number (ESP $partition_block_device )"
 +    fi
 +done
 -LogPrintError "efibootmgr failed to create EFI Boot Manager entry for '$BootLoader' (UEFI_BOOTLOADER='$UEFI_BOOTLOADER')"
 +is_true $NOBOOTLOADER || return 0
 +LogPrintError "efibootmgr failed to create EFI Boot Manager entry for '$bootloader' (UEFI_BOOTLOADER='$UEFI_BOOTLOADER')"
 +return 1
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
 index 54ddb50f..cdd81a14 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
@@ -302,12 +302,20 @@ get_child_components() {
     done
 }
 -# Return all ancestors of component $1 [ of type $2 ]
 +# Return all ancestors of component $1 [ of type $2 [ skipping types $3 during resolution ] ]
 get_parent_components() {
 -    declare -a ancestors devlist
 -    declare current child parent
 +    declare -a ancestors devlist ignoretypes
 +    declare current child parent parenttype
     devlist=( "$1" )
 +    if [[ "$3" ]] ; then
 +        # third argument should, if present, be a space-separated list
 +        # of types to ignore when walking up the dependency tree.
 +        # Convert it to array
 +        ignoretypes=( $3 )
 +    else
 +        ignoretypes=()
 +    fi
     while (( ${#devlist[@]} )) ; do
         current=${devlist[0]}
@@ -318,6 +326,13 @@ get_parent_components() {
                 if IsInArray "$parent" "${ancestors[@]}" ; then
                     continue
                 fi
 +                ### ...test if parent is of a correct type if requested...
 +                if [[ ${#ignoretypes[@]} -gt 0 ]] ; then
 +                    parenttype=$(get_component_type "$parent")
 +                    if IsInArray "$parenttype" "${ignoretypes[@]}" ; then
 +                        continue
 +                    fi
 +                fi
                 ### ...and add them to the list
                 devlist+=( "$parent" )
                 ancestors+=( "$parent" )
@@ -345,22 +360,24 @@ get_parent_components() {
 }
 # find_devices <other>
 +# ${2+"$2"} in the following functions ensures that $2 gets passed down quoted if present
 +# and ignored if not present
 # Find the disk device(s) component $1 resides on.
 find_disk() {
 -    get_parent_components "$1" "disk"
 +    get_parent_components "$1" "disk" ${2+"$2"}
 }
 find_multipath() {
 -    get_parent_components "$1" "multipath"
 +    get_parent_components "$1" "multipath" ${2+"$2"}
 }
 find_disk_and_multipath() {
 -    find_disk "$1"
 -    is_true "$AUTOEXCLUDE_MULTIPATH" || find_multipath "$1"
 +    find_disk "$1" ${2+"$2"}
 +    is_true "$AUTOEXCLUDE_MULTIPATH" || find_multipath "$1" ${2+"$2"}
 }
 find_partition() {
 -    get_parent_components "$1" "part"
 +    get_parent_components "$1" "part" ${2+"$2"}
 }
 # The get_partition_number function
@@ -413,6 +430,54 @@ get_partition_number() {
     echo $partition_number
 }
 +# Extract the underlying device name from the full partition device name.
 +# Underlying device may be a disk, a multipath device or other devices that can be partitioned.
 +# Should we use the information in $LAYOUT_DEPS, like get_parent_component does,
 +# instead of string munging?
 +function get_device_from_partition() {
 +    local partition_block_device
 +    local device
 +    local partition_number
 +
 +    partition_block_device=$1
 +    test -b "$partition_block_device" || BugError "get_device_from_partition called with '$partition_block_device' that is no block device"
 +    partition_number=${2-$(get_partition_number $partition_block_device )}
 +    # /dev/sda or /dev/mapper/vol34_part or /dev/mapper/mpath99p or /dev/mmcblk0p
 +    device=${partition_block_device%$partition_number}
 +
 +    # Strip trailing partition remainders like '_part' or '-part' or 'p'
 +    # if we have 'mapper' in disk device name:
 +    if [[ ${partition_block_device/mapper//} != $partition_block_device ]] ; then
 +        # we only expect mpath_partX or mpathpX or mpath-partX
 +        case $device in
 +            (*p)     device=${device%p} ;;
 +            (*-part) device=${device%-part} ;;
 +            (*_part) device=${device%_part} ;;
 +            (*)      Log "Unsupported kpartx partition delimiter for $partition_block_device"
 +        esac
 +    fi
 +
 +    # For eMMC devices the trailing 'p' in the $device value
 +    # (as in /dev/mmcblk0p that is derived from /dev/mmcblk0p1)
 +    # needs to be stripped (to get /dev/mmcblk0), otherwise the
 +    # efibootmgr call fails because of a wrong disk device name.
 +    # See also https://github.com/rear/rear/issues/2103
 +    if [[ $device = *'/mmcblk'+([0-9])p ]] ; then
 +        device=${device%p}
 +    fi
 +
 +    # For NVMe devices the trailing 'p' in the $device value
 +    # (as in /dev/nvme0n1p that is derived from /dev/nvme0n1p1)
 +    # needs to be stripped (to get /dev/nvme0n1), otherwise the
 +    # efibootmgr call fails because of a wrong disk device name.
 +    # See also https://github.com/rear/rear/issues/1564
 +    if [[ $device = *'/nvme'+([0-9])n+([0-9])p ]] ; then
 +        device=${device%p}
 +    fi
 +
 +    test -b "$device" && echo $device
 +}
 +
 # Returns partition start block or 'unknown'
 # sda/sda1 or
 # dm-XX
--- a/SOURCES/rear-bz1958247.patch
+++ b/SOURCES/rear-bz1958247.patch
--- a/SOURCES/rear-bz1983013.patch
+++ b/SOURCES/rear-bz1983013.patch
@ -0,0 +1,68 @@
 diff --git a/usr/share/rear/conf/Linux-ppc64.conf b/usr/share/rear/conf/Linux-ppc64.conf
 index 7e20ddc7..d7774062 100644
 --- a/usr/share/rear/conf/Linux-ppc64.conf
 +++ b/usr/share/rear/conf/Linux-ppc64.conf
@@ -1,18 +1,26 @@
 -REQUIRED_PROGS+=( sfdisk )
 +REQUIRED_PROGS+=( sfdisk ofpathname )
 PROGS+=(
 mkofboot
 ofpath
 ybin
 yabootconfig
 -bootlist
 pseries_platform
 nvram
 -ofpathname
 bc
 agetty
 )
 +if grep -q "emulated by qemu" /proc/cpuinfo ; then
 +    # Qemu/KVM virtual machines don't need bootlist - don't complain if
 +    # it is missing
 +    PROGS+=( bootlist )
 +else
 +    # PowerVM environment, we need to run bootlist, otherwise
 +    # we can't make the system bpotable. Be strict about requiring it
 +    REQUIRED_PROGS+=( bootlist )
 +fi
 +
 COPY_AS_IS+=(
 /usr/lib/yaboot/yaboot
 /usr/lib/yaboot/ofboot
 diff --git a/usr/share/rear/conf/Linux-ppc64le.conf b/usr/share/rear/conf/Linux-ppc64le.conf
 index d00154a2..df8066ea 100644
 --- a/usr/share/rear/conf/Linux-ppc64le.conf
 +++ b/usr/share/rear/conf/Linux-ppc64le.conf
@@ -1,10 +1,8 @@
 REQUIRED_PROGS+=( sfdisk )
 PROGS+=(
 -bootlist
 pseries_platform
 nvram
 -ofpathname
 bc
 agetty
 )
@@ -17,4 +15,18 @@ agetty
 if [[ $(awk '/platform/ {print $NF}' < /proc/cpuinfo) != PowerNV ]] ; then
     # No firmware files when ppc64le Linux is not run in BareMetal Mode (PowerNV):
     test "${FIRMWARE_FILES[*]}" || FIRMWARE_FILES=( 'no' )
 +    # grub2-install for powerpc-ieee1275 calls ofpathname, so without it,
 +    # the rescue system can't make the recovered system bootable
 +    REQUIRED_PROGS+=( ofpathname )
 +    if grep -q "emulated by qemu" /proc/cpuinfo ; then
 +        # Qemu/KVM virtual machines don't need bootlist - don't complain if
 +        # it is missing
 +        PROGS+=( bootlist )
 +    else
 +        # PowerVM environment, we need to run bootlist, otherwise
 +        # we can't make the system bpotable. Be strict about requiring it
 +        REQUIRED_PROGS+=( bootlist )
 +    fi
 +else
 +    PROGS+=( ofpathname bootlist )
 fi
--- a/SOURCES/rear-bz1993296.patch
+++ b/SOURCES/rear-bz1993296.patch
@ -0,0 +1,34 @@
 From 4233fe30b315737ac8c4d857e2b04e021c2e2886 Mon Sep 17 00:00:00 2001
 From: Pavel Cahyna <pcahyna@redhat.com>
 Date: Mon, 16 Aug 2021 10:10:38 +0300
 Subject: [PATCH] Revert the main part of PR #2299
 multipath -l is very slow with many multipath devices. As it will be
 called for every multipath device, it leads to quadratic time complexity
 in the number of multipath devices. For thousands of devices, ReaR can
 take hours to scan and exclude them. We therefore have to comment
 multipath -l out, as it is a huge performance regression, and find
 another solution to bug #2298.
 ---
 usr/share/rear/lib/layout-functions.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
 index cdd81a14..8c8be74b 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
@@ -771,7 +771,10 @@ function is_multipath_path {
     # so that no "multipath -l" output could clutter the log (the "multipath -l" output is irrelevant here)
     # in contrast to e.g. test "$( multipath -l )" that would falsely succeed with blank output
     # and the output would appear in the log in 'set -x' debugscript mode:
 -    multipath -l | grep -q '[[:alnum:]]' || return 1
 +    #
 +    # Unfortunately, multipat -l is quite slow with many multipath devices
 +    # and becomes a performance bottleneck, so we must comment it out for now.
 +    #multipath -l | grep -q '[[:alnum:]]' || return 1
     # Check if a block device should be a path in a multipath device:
     multipath -c /dev/$1 &>/dev/null
 }
 -- 
 2.26.3
--- a/SOURCES/rear-bz2035939.patch
+++ b/SOURCES/rear-bz2035939.patch
@ -0,0 +1,56 @@
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 0c230f38..f231bf3d 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -2707,6 +2707,15 @@ WARN_MISSING_VOL_ID=1
 USE_CFG2HTML=
 # The SKIP_CFG2HTML variable is no longer supported since ReaR 1.18
 +# IP addresses that are present on the system but must be excluded when
 +# building the network configuration used in recovery mode; this is typically
 +# used when floating IP addresses are used on the system
 +EXCLUDE_IP_ADDRESSES=()
 +
 +# Network interfaces that are present on the system but must be excluded when
 +# building the network configuration used in recovery mode
 +EXCLUDE_NETWORK_INTERFACES=()
 +
 # Simplify bonding setups by configuring always the first active device of a
 # bond, except when mode is 4 (IEEE 802.3ad policy)
 SIMPLIFY_BONDING=no
 diff --git a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh
 index f806bfbf..2385f5b6 100644
 --- a/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh
 +++ b/usr/share/rear/rescue/GNU/Linux/310_network_devices.sh
@@ -355,6 +355,11 @@ function is_interface_up () {
     local network_interface=$1
     local sysfspath=/sys/class/net/$network_interface
 +    if IsInArray "$network_interface" "${EXCLUDE_NETWORK_INTERFACES[@]}"; then
 +        LogPrint "Excluding '$network_interface' per EXCLUDE_NETWORK_INTERFACES directive."
 +        return 1
 +    fi
 +
     local state=$( cat $sysfspath/operstate )
     if [ "$state" = "down" ] ; then
         return 1
@@ -403,11 +408,19 @@ function ipaddr_setup () {
     if [ -n "$ipaddrs" ] ; then
         # If some IP is found for the network interface, then use them
         for ipaddr in $ipaddrs ; do
 +            if IsInArray "${ipaddr%%/*}" "${EXCLUDE_IP_ADDRESSES[@]}"; then
 +                LogPrint "Excluding IP address '$ipaddr' per EXCLUDE_IP_ADDRESSES directive even through it's defined in mapping file '$CONFIG_DIR/mappings/ip_addresses'."
 +                continue
 +            fi
             echo "ip addr add $ipaddr dev $mapped_as"
         done
     else
         # Otherwise, collect IP addresses for the network interface on the system
         for ipaddr in $( ip a show dev $network_interface scope global | grep "inet.*\ " | tr -s " " | cut -d " " -f 3 ) ; do
 +            if IsInArray "${ipaddr%%/*}" "${EXCLUDE_IP_ADDRESSES[@]}"; then
 +                LogPrint "Excluding IP address '$ipaddr' per EXCLUDE_IP_ADDRESSES directive."
 +                continue
 +            fi
             echo "ip addr add $ipaddr dev $mapped_as"
         done
     fi
--- a/SOURCES/rear-bz2048454.patch
+++ b/SOURCES/rear-bz2048454.patch
@ -0,0 +1,78 @@
 diff --git a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
 index 35be1721..d3c9ae86 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
@@ -103,12 +103,7 @@ local lvs_exit_code
         pdev=$( get_device_name $pdev )
         # Output lvmdev entry to DISKLAYOUT_FILE:
 -        # With the above example the output is:
 -        # lvmdev /dev/system /dev/sda1 7wwpcO-KmNN-qsTE-7sp7-JBJS-vBdC-Zyt1W7 41940992
 -        echo "lvmdev /dev/$vgrp $pdev $uuid $size"
 -
 -        # After the 'lvmdev' line was written to disklayout.conf so that the user can inspect it
 -        # check that the required positional parameters in the 'lvmdev' line are non-empty
 +        # Check that the required positional parameters in the 'lvmdev' line are non-empty
         # because an empty positional parameter would result an invalid 'lvmdev' line
         # which would cause invalid parameters are 'read' as input during "rear recover"
         # cf. "Verifying ... 'lvm...' entries" in layout/save/default/950_verify_disklayout_file.sh
@@ -117,13 +112,24 @@ local lvs_exit_code
         # so that this also checks that the variables do not contain blanks or more than one word
         # because blanks (actually $IFS characters) are used as field separators in disklayout.conf
         # which means the positional parameter values must be exactly one non-empty word.
 -        # Two separated simple 'test $vgrp && test $pdev' commands are used here because
 -        # 'test $vgrp -a $pdev' does not work when $vgrp is empty or only blanks
 -        # because '-a' has two different meanings: "EXPR1 -a EXPR2" and "-a FILE" (see "help test")
 -        # so that when $vgrp is empty 'test $vgrp -a $pdev' tests if file $pdev exists
 -        # which is usually true because $pdev is usually a partition device node (e.g. /dev/sda1)
 -        # so that when $vgrp is empty 'test $vgrp -a $pdev' would falsely succeed:
 -        test $vgrp && test $pdev || Error "LVM 'lvmdev' entry in $DISKLAYOUT_FILE where volume_group or device is empty or more than one word"
 +        test $pdev || Error "Cannot make 'lvmdev' entry in disklayout.conf (PV device '$pdev' empty or more than one word)"
 +        if ! test $vgrp ; then
 +            # Valid $pdev but invalid $vgrp (empty or more than one word):
 +            # When $vgrp is empty it means it is a PV that is not part of a VG so the PV exists but it is not used.
 +            # PVs that are not part of a VG are documented as comment in disklayout.conf but they are not recreated
 +            # because they were not used on the original system so there is no need to recreate them by "rear recover"
 +            # (the user can manually recreate them later in his recreated system when needed)
 +            # cf. https://github.com/rear/rear/issues/2596
 +            DebugPrint "Skipping PV $pdev that is not part of a valid VG (VG '$vgrp' empty or more than one word)"
 +            echo "# Skipping PV $pdev that is not part of a valid VG (VG '$vgrp' empty or more than one word):"
 +            contains_visible_char "$vgrp" || vgrp='<missing_VG>'
 +            echo "# lvmdev /dev/$vgrp $pdev $uuid $size"
 +            # Continue with the next line in the output of "lvm pvdisplay -c"
 +            continue
 +        fi
 +        # With the above example the output is:
 +        # lvmdev /dev/system /dev/sda1 7wwpcO-KmNN-qsTE-7sp7-JBJS-vBdC-Zyt1W7 41940992
 +        echo "lvmdev /dev/$vgrp $pdev $uuid $size"
     done
     # Check the exit code of "lvm pvdisplay -c"
@@ -161,8 +167,15 @@ local lvs_exit_code
         # lvmgrp /dev/system 4096 5119 20967424
         echo "lvmgrp /dev/$vgrp $extentsize $nrextents $size"
 -        # Check that the required positional parameters in the 'lvmgrp' line are non-empty
 -        # cf. the code above to "check that the required positional parameters in the 'lvmdev' line are non-empty":
 +        # Check that the required positional parameters in the 'lvmgrp' line are non-empty.
 +        # The tested variables are intentionally not quoted here, cf. the code above to
 +        # "check that the required positional parameters in the 'lvmdev' line are non-empty".
 +        # Two separated simple 'test $vgrp && test $extentsize' commands are used here because
 +        # 'test $vgrp -a $extentsize' does not work when $vgrp is empty or only blanks
 +        # because '-a' has two different meanings: "EXPR1 -a EXPR2" and "-a FILE" (see "help test")
 +        # so with empty $vgrp it becomes 'test -a $extentsize' that tests if a file $extentsize exists
 +        # which is unlikely to be true but it is not impossible that a file $extentsize exists
 +        # so when $vgrp is empty (or blanks) 'test $vgrp -a $extentsize' might falsely succeed:
         test $vgrp && test $extentsize || Error "LVM 'lvmgrp' entry in $DISKLAYOUT_FILE where volume_group or extentsize is empty or more than one word"
     done
@@ -305,7 +318,8 @@ local lvs_exit_code
             fi
             already_processed_lvs+=( "$vg/$lv" )
             # Check that the required positional parameters in the 'lvmvol' line are non-empty
 -            # cf. the code above to "check that the required positional parameters in the 'lvmdev' line are non-empty":
 +            # cf. the code above to "check that the required positional parameters in the 'lvmdev' line are non-empty"
 +            # and the code above to "check that the required positional parameters in the 'lvmgrp' line are non-empty":
             test $vg && test $lv && test $size && test $layout || Error "LVM 'lvmvol' entry in $DISKLAYOUT_FILE where volume_group or name or size or layout is empty or more than one word"
         fi
--- a/SOURCES/rear-bz2049091.patch
+++ b/SOURCES/rear-bz2049091.patch
@ -0,0 +1,25 @@
 diff --git a/usr/share/rear/layout/save/default/335_remove_excluded_multipath_vgs.sh b/usr/share/rear/layout/save/default/335_remove_excluded_multipath_vgs.sh
 index 040e9eec..e731c994 100644
 --- a/usr/share/rear/layout/save/default/335_remove_excluded_multipath_vgs.sh
 +++ b/usr/share/rear/layout/save/default/335_remove_excluded_multipath_vgs.sh
@@ -19,9 +19,9 @@ while read lvmdev name mpdev junk ; do
     # Remember, multipath devices from a volume group that is "excluded" should be 'commented out'
     device=$(echo $mpdev | cut -c1-45)
     while read LINE ; do
 -        # Now we need to comment all lines that contain "$devices" in the LAYOUT_FILE
 +        # Now we need to comment all lines that contain "$device" in the LAYOUT_FILE
         sed -i "s|^$LINE|\#$LINE|" "$LAYOUT_FILE"
 -    done < <(grep "$device" $LAYOUT_FILE | grep -v "^#")
 +    done < <(grep " $device " $LAYOUT_FILE | grep -v "^#")
     Log "Excluding multipath device $device"
 done < <(grep "^#lvmdev" $LAYOUT_FILE)
@@ -31,7 +31,7 @@ done < <(grep "^#lvmdev" $LAYOUT_FILE)
 while read LINE ; do
     # multipath /dev/mapper/360060e8007e2e3000030e2e300002065 /dev/sdae,/dev/sdat,/dev/sdbi,/dev/sdp
     device=$(echo $LINE | awk '{print $2}' | cut -c1-45)
 -    num=$(grep "$device" $LAYOUT_FILE | grep -v "^#" | wc -l)
 +    num=$(grep " $device " $LAYOUT_FILE | grep -v "^#" | wc -l)
     if [ $num -lt 2 ] ; then
         # If the $device is only seen once (in a uncommented line) then the multipath is not in use
         sed -i "s|^$LINE|\#$LINE|" "$LAYOUT_FILE"
--- a/SOURCES/rear-bz2083272.patch
+++ b/SOURCES/rear-bz2083272.patch
@ -0,0 +1,171 @@
 commit 3d1bcf1b50ca8201a3805bc7cab6ca69c14951a1
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Thu May 5 12:11:55 2022 +0200
    Merge pull request #2795 from pcahyna/recover-check-sums
    Verify file hashes at the end of recover after file restore from backup
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index f231bf3d..881a0af0 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -313,8 +313,30 @@ CDROM_SIZE=20
 # which exits with non-zero exit code when the disk layout or those files changed
 # (cf. https://github.com/rear/rear/issues/1134) but the checklayout workflow
 # does not automatically recreate the rescue/recovery system.
 +# Files matching FILES_TO_PATCH_PATTERNS are added to this list automatically.
 CHECK_CONFIG_FILES=( '/etc/drbd/' '/etc/drbd.conf' '/etc/lvm/lvm.conf' '/etc/multipath.conf' '/etc/rear/' '/etc/udev/udev.conf' )
 +# FILES_TO_PATCH_PATTERNS is a space-separated list of shell glob patterns.
 +# Files that match are eligible for a final migration of UUIDs and other
 +# identifiers after recovery (if the layout recreation process has led
 +# to a change of an UUID or a device name and a corresponding change needs
 +# to be performed on restored configuration files ).
 +# See finalize/GNU/Linux/280_migrate_uuid_tags.sh
 +# The [] around the first letter make sure that shopt -s nullglob removes this file from the list if it does not exist
 +
 +FILES_TO_PATCH_PATTERNS="[b]oot/{grub.conf,menu.lst,device.map} [e]tc/grub.* \
 +                         [b]oot/grub/{grub.conf,grub.cfg,menu.lst,device.map} \
 +                         [b]oot/grub2/{grub.conf,grub.cfg,menu.lst,device.map} \
 +                         [e]tc/sysconfig/grub [e]tc/sysconfig/bootloader \
 +                         [e]tc/lilo.conf [e]tc/elilo.conf \
 +                         [e]tc/yaboot.conf \
 +                         [e]tc/mtab [e]tc/fstab \
 +                         [e]tc/mtools.conf \
 +                         [e]tc/smartd.conf [e]tc/sysconfig/smartmontools \
 +                         [e]tc/sysconfig/rawdevices \
 +                         [e]tc/security/pam_mount.conf.xml \
 +                         [b]oot/efi/*/*/grub.cfg"
 +
 ##
 # Relax-and-Recover recovery system update during "rear recover"
 #
 diff --git a/usr/share/rear/finalize/GNU/Linux/250_migrate_disk_devices_layout.sh b/usr/share/rear/finalize/GNU/Linux/250_migrate_disk_devices_layout.sh
 index 1a91a0e3..e869e5e9 100644
 --- a/usr/share/rear/finalize/GNU/Linux/250_migrate_disk_devices_layout.sh
 +++ b/usr/share/rear/finalize/GNU/Linux/250_migrate_disk_devices_layout.sh
@@ -29,19 +29,9 @@ LogPrint "The original restored files get saved in $save_original_file_dir (in $
 local symlink_target=""
 local restored_file=""
 -# the funny [] around the first letter make sure that shopt -s nullglob removes this file from the list if it does not exist
 -# the files without a [] are mandatory, like fstab FIXME: but below there is [e]tc/fstab not etc/fstab - why?
 -
 -for restored_file in [b]oot/{grub.conf,menu.lst,device.map} [e]tc/grub.* [b]oot/grub/{grub.conf,menu.lst,device.map} \
 -                     [b]oot/grub2/{grub.conf,grub.cfg,menu.lst,device.map} \
 -                     [e]tc/sysconfig/grub [e]tc/sysconfig/bootloader \
 -                     [e]tc/lilo.conf \
 -                     [e]tc/yaboot.conf \
 -                     [e]tc/mtab [e]tc/fstab \
 -                     [e]tc/mtools.conf \
 -                     [e]tc/smartd.conf [e]tc/sysconfig/smartmontools \
 -                     [e]tc/sysconfig/rawdevices \
 -                     [e]tc/security/pam_mount.conf.xml [b]oot/efi/*/*/grub.cfg
 +# The variable expansion is deliberately not quoted in order to perform
 +# pathname expansion on the variable value.
 +for restored_file in $FILES_TO_PATCH_PATTERNS
 do
     # Silently skip directories and file not found:
     test -f "$restored_file" || continue
 diff --git a/usr/share/rear/finalize/GNU/Linux/280_migrate_uuid_tags.sh b/usr/share/rear/finalize/GNU/Linux/280_migrate_uuid_tags.sh
 index 074689a1..d994ce8e 100644
 --- a/usr/share/rear/finalize/GNU/Linux/280_migrate_uuid_tags.sh
 +++ b/usr/share/rear/finalize/GNU/Linux/280_migrate_uuid_tags.sh
@@ -23,18 +23,9 @@ LogPrint "Migrating filesystem UUIDs in certain restored files in $TARGET_FS_ROO
 local symlink_target=""
 local restored_file=""
 -# the funny [] around the first letter make sure that shopt -s nullglob removes this file from the list if it does not exist
 -# the files without a [] are mandatory, like fstab FIXME: but below there is [e]tc/fstab not etc/fstab - why?
 -for restored_file in [b]oot/{grub.conf,menu.lst,device.map} [e]tc/grub.* \
 -                     [b]oot/grub/{grub.conf,grub.cfg,menu.lst,device.map} \
 -                     [b]oot/grub2/{grub.conf,grub.cfg,menu.lst,device.map} \
 -                     [e]tc/sysconfig/grub [e]tc/sysconfig/bootloader \
 -                     [e]tc/lilo.conf [e]tc/elilo.conf \
 -                     [e]tc/mtab [e]tc/fstab \
 -                     [e]tc/mtools.conf \
 -                     [e]tc/smartd.conf [e]tc/sysconfig/smartmontools \
 -                     [e]tc/sysconfig/rawdevices \
 -                     [e]tc/security/pam_mount.conf.xml [b]oot/efi/*/*/grub.cfg
 +# The variable expansion is deliberately not quoted in order to perform
 +# pathname expansion on the variable value.
 +for restored_file in $FILES_TO_PATCH_PATTERNS
 do
     # Silently skip directories and file not found:
     test -f "$restored_file" || continue
 diff --git a/usr/share/rear/finalize/default/060_compare_files.sh b/usr/share/rear/finalize/default/060_compare_files.sh
 new file mode 100644
 index 00000000..6947fda9
 --- /dev/null
 +++ b/usr/share/rear/finalize/default/060_compare_files.sh
@@ -0,0 +1,6 @@
 +if [ -e $VAR_DIR/layout/config/files.md5sum ] ; then
 +    if ! chroot $TARGET_FS_ROOT md5sum -c --quiet < $VAR_DIR/layout/config/files.md5sum 1>> >( tee -a "$RUNTIME_LOGFILE" 1>&7 ) 2>> >( tee -a "$RUNTIME_LOGFILE" 1>&8 ) ; then
 +        LogPrintError "Error: Restored files do not match the recreated system in $TARGET_FS_ROOT"
 +        return 1
 +    fi
 +fi
 diff --git a/usr/share/rear/layout/save/default/490_check_files_to_patch.sh b/usr/share/rear/layout/save/default/490_check_files_to_patch.sh
 new file mode 100644
 index 00000000..ee717063
 --- /dev/null
 +++ b/usr/share/rear/layout/save/default/490_check_files_to_patch.sh
@@ -0,0 +1,43 @@
 +# FILES_TO_PATCH_PATTERNS is a space-separated list of shell glob patterns.
 +# Files that match are eligible for a final migration of UUIDs and other
 +# identifiers after recovery (if the layout recreation process has led
 +# to a change of an UUID or a device name and a corresponding change needs
 +# to be performed on restored configuration files ).
 +# See finalize/GNU/Linux/280_migrate_uuid_tags.sh
 +# We should add all such files to CHECK_CONFIG_FILES - if they change,
 +# we risk inconsistencies between the restored files and recreated layout,
 +# or failures of UUID migration.
 +
 +local file final_file symlink_target
 +
 +# The patterns are relative to /, change directory there
 +# so that the shell finds the files during pathname expansion
 +pushd / >/dev/null
 +# The variable expansion is deliberately not quoted in order to perform
 +# pathname expansion on the variable value.
 +for file in $FILES_TO_PATCH_PATTERNS ; do
 +    final_file="/$file"
 +    IsInArray "$final_file" "${CHECK_CONFIG_FILES[@]}" && continue
 +    # Symlink handling (partially from 280_migrate_uuid_tags.sh):
 +    # avoid dead symlinks, and symlinks to files on dynamic filesystems
 +    # ( /proc etc.) - they are expected to change and validating
 +    # their checksums has no sense
 +    if test -L "$final_file" ; then
 +        if symlink_target="$( readlink -e "$final_file" )" ; then
 +            # If the symlink target contains /proc/ /sys/ /dev/ or /run/ we skip it because then
 +            # the symlink target is considered to not be a restored file that needs to be patched
 +            # and thus we don't need to generate and check its hash, either
 +            # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
 +            if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
 +                Log "Skip adding symlink $final_file target $symlink_target on /proc/ /sys/ /dev/ or /run/ to CHECK_CONFIG_FILES"
 +                continue
 +            fi
 +            Debug "Adding symlink $final_file with target $symlink_target to CHECK_CONFIG_FILES"
 +        else
 +            LogPrint "Skip adding dead symlink $final_file to CHECK_CONFIG_FILES"
 +            continue
 +        fi
 +    fi
 +    CHECK_CONFIG_FILES+=( "$final_file" )
 +done
 +popd >/dev/null
 diff --git a/usr/share/rear/layout/save/default/600_snapshot_files.sh b/usr/share/rear/layout/save/default/600_snapshot_files.sh
 index 0ebf197c..3ac6b07e 100644
 --- a/usr/share/rear/layout/save/default/600_snapshot_files.sh
 +++ b/usr/share/rear/layout/save/default/600_snapshot_files.sh
@@ -3,7 +3,8 @@ if [ "$WORKFLOW" = "checklayout" ] ; then
     return 0
 fi
 -config_files=()
 +local obj
 +local config_files=()
 for obj in "${CHECK_CONFIG_FILES[@]}" ; do
     if [ -d "$obj" ] ; then
         config_files+=( $( find "$obj" -type f ) )
--- a/SOURCES/rear-bz2091163.patch
+++ b/SOURCES/rear-bz2091163.patch
@ -1,35 +1,5 @@
 From 29e739ae7c0651f8f77c60846bfbe2b6c91baa29 Mon Sep 17 00:00:00 2001
 From: Pavel Cahyna <pcahyna@redhat.com>
 Date: Sat, 31 Dec 2022 17:40:39 +0100
 Subject: [PATCH] Protect against colons in pvdisplay output
 LVM can be configured to show device names under /dev/disk/by-path
 in command output. These names often contain colons that separate fields
 like channel and target (for example /dev/disk/by-path/pci-*-scsi-0:0:1:0-*,
 similarly the pci-* part, which contains colon-separated PCI bus and
 device numbers). Since the "pvdisplay -c" output also uses colons as
 field separators and does not escape embedded colons in any way,
 embedded colons break parsing of this output.
 As a fix, use the pipe character '|' as the field separator in pvdisplay
 output. (This would break if a PV device has a '|' in its name, but this
 is very much less likely than having a ':' .)
 Also, configure explicitly what fields to output - "pvdisplay -c"
 prints many fields, but I have not found documentation about what fields
 is it using exactly, so one had to guess what the output means. Using
 "pvdisplay -C" and selecting the fields explicitly is much clearer.
 This also changes the PV size field to match documentation, the comment
 says that size is in bytes, but it actually was not in bytes. As nothing
 is actually using the PV size field, this inconsistency has not caused
 any problem in practice, and no code needs adjusting for the change.
 ---
 .../layout/save/GNU/Linux/220_lvm_layout.sh   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)
 diff --git a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
-index e01dbf465..7400c586e 100644
+index d3c9ae86..f21845df 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
@@ -70,14 +70,20 @@ local lvs_exit_code
--- a/SOURCES/rear-bz2104005.patch
+++ b/SOURCES/rear-bz2104005.patch
@ -0,0 +1,21 @@
 commit 40ec3bf072a51229e81bfbfa7cedb8a7c7902dbd
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Fri Jun 24 15:11:27 2022 +0200
    Merge pull request #2827 from rear/jsmeix-fail-safe-yes-pipe-lvcreate
    and commit b3fd58fc871e00bd713a0cb081de54d746ffffb3 from pull request #2839
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 index 1be17ba8..d34ab335 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
@@ -263,7 +263,7 @@ $ifline
     LogPrint "Creating LVM volume '$vg/$lvname'; Warning: some properties may not be preserved..."
     $warnraidline
 -    lvm lvcreate $lvopts $vg <<<y
 +    lvm lvcreate -y $lvopts $vg
 fi
 EOF
--- a/SOURCES/rear-bz2111049.patch
+++ b/SOURCES/rear-bz2111049.patch
@ -0,0 +1,37 @@
 commit 1447530f502305ed08149d9b2a56a51fb91af875
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Wed May 25 13:51:14 2022 +0200
    Merge pull request #2808 from rear/jsmeix-exclude-watchdog
    Exclude dev/watchdog* from the ReaR recovery system:
    In default.conf add dev/watchdog* to COPY_AS_IS_EXCLUDE
    because watchdog functionality is not wanted in the recovery system
    because we do not want any automated reboot functionality
    while disaster recovery happens via "rear recover",
    see https://github.com/rear/rear/pull/2808
    Furthermore having a copy of dev/watchdog*
    during "rear mkrescue" in ReaR's build area
    may even trigger a system crash that is caused by a
    buggy TrendMicro ds_am module touching dev/watchdog
    in ReaR's build area (/var/tmp/rear.XXX/rootfs),
    see https://github.com/rear/rear/issues/2798
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 881a0af0..cb14da8b 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -1414,7 +1414,12 @@ COPY_AS_IS=( $SHARE_DIR $VAR_DIR )
 # We let them being recreated by device mapper in the recovery system during the recovery process.
 # Copying them into the recovery system would let "rear recover" avoid the migration process.
 # See https://github.com/rear/rear/pull/1393 for details.
 -COPY_AS_IS_EXCLUDE=( $VAR_DIR/output/\* dev/.udev dev/shm dev/shm/\* dev/oracleasm dev/mapper )
 +# /dev/watchdog /dev/watchdog\* functionality is not wanted in the ReaR rescue/recovery system
 +# because we do not want any automated reboot while disaster recovery happens via "rear recover".
 +# Furthermore having dev/watchdog* during "rear mkrescue" may even trigger a system "crash" that is
 +# caused by TrendMicro ds_am module touching dev/watchdog in ReaR's build area (/var/tmp/rear.XXX/rootfs).
 +# See https://github.com/rear/rear/issues/2798
 +COPY_AS_IS_EXCLUDE=( $VAR_DIR/output/\* dev/.udev dev/shm dev/shm/\* dev/oracleasm dev/mapper dev/watchdog\* )
 # Array of user names that are trusted owners of files where RequiredSharedObjects calls ldd (cf. COPY_AS_IS)
 # and where a ldd test is run inside the recovery system that tests all binaries for 'not found' libraries.
 # The default is 'root' plus those standard system users that have a 'bin' or 'sbin' or 'root' home directory
--- a/SOURCES/rear-bz2111059.patch
+++ b/SOURCES/rear-bz2111059.patch
@ -0,0 +1,105 @@
 commit 552dd6bfb20fdb3dc712b5243656d147392c27c3
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Thu Jun 2 15:25:52 2022 +0200
    Merge pull request #2811 from rear/jsmeix-RECOVERY_COMMANDS
    Add PRE_RECOVERY_COMMANDS and POST_RECOVERY_COMMANDS
    as alternative to PRE_RECOVERY_SCRIPT and POST_RECOVERY_SCRIPT
    see the description in default.conf how to use them and how they work.
    See https://github.com/rear/rear/pull/2811 and see also
    https://github.com/rear/rear/pull/2735 therein in particular
    https://github.com/rear/rear/pull/2735#issuecomment-1134686196
    Additionally use LogPrint to show the user the executed commands,
    see https://github.com/rear/rear/pull/2789
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index cb14da8b..b14525da 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -3117,14 +3117,37 @@ ELILO_BIN=
 ################ ---- custom scripts
 #
 # NOTE: The scripts can be defined as an array to better handly spaces in parameters.
 -# The scripts are called like this: eval "${PRE_RECOVERY_SCRIPT[@]}"
 +# The scripts are called like this:
 +#   eval "${PRE_RECOVERY_SCRIPT[@]}"
 +#
 +# Alternatively, commands can be executed by using the corresponding
 +# PRE_RECOVERY_COMMANDS and POST_RECOVERY_COMMANDS array variables
 +# which evaluate like this:
 +#   for command in "${PRE_RECOVERY_COMMANDS[@]}" ; do
 +#     eval "$command"
 +#   done
 +#
 +# Using PRE_RECOVERY_COMMANDS and POST_RECOVERY_COMMANDS
 +# is simpler when multiple commands should be executed.
 +# For example,
 +#   PRE_RECOVERY_SCRIPT=( 'echo Hello' ';' 'sleep 3' )
 +# can be rewritten as
 +#   PRE_RECOVERY_COMMANDS=( 'echo Hello' 'sleep 3' )
 +# or
 +#   PRE_RECOVERY_COMMANDS=( 'echo Hello' )
 +#   PRE_RECOVERY_COMMANDS+=( 'sleep 3' )
 +
 +# Those get called at the very beginning of "rear recover".
 +# The PRE_RECOVERY_COMMANDS are called directly before the PRE_RECOVERY_SCRIPT.
 +# Nothing was recreated and you have only the plain ReaR rescue/recovery system:
 +PRE_RECOVERY_COMMANDS=()
 +PRE_RECOVERY_SCRIPT=
 -# Call this after Relax-and-Recover did everything in the recover workflow.
 -# Use $TARGET_FS_ROOT (by default '/mnt/local') to refer to the recovered system.
 +# Those get called at the very end of "rear recover".
 +# The POST_RECOVERY_COMMANDS are called directly after the POST_RECOVERY_SCRIPT.
 +# Use $TARGET_FS_ROOT (by default '/mnt/local') to access the recreated target system.
 POST_RECOVERY_SCRIPT=
 -
 -# Call this before Relax-and-Recover starts to do anything in the recover workflow. You have the rescue system but nothing else
 -PRE_RECOVERY_SCRIPT=
 +POST_RECOVERY_COMMANDS=()
 # PRE/POST Backup scripts will provide the ability to run certain tasks before and after a ReaR backup.
 # for example:
 diff --git a/usr/share/rear/setup/default/010_pre_recovery_script.sh b/usr/share/rear/setup/default/010_pre_recovery_script.sh
 index 005107cc..8b4e4a36 100644
 --- a/usr/share/rear/setup/default/010_pre_recovery_script.sh
 +++ b/usr/share/rear/setup/default/010_pre_recovery_script.sh
@@ -1,4 +1,14 @@
 +
 +# The PRE_RECOVERY_COMMANDS are called directly before the PRE_RECOVERY_SCRIPT
 +# so PRE_RECOVERY_COMMANDS can also be used to prepare things for the PRE_RECOVERY_SCRIPT:
 +
 +local command
 +for command in "${PRE_RECOVERY_COMMANDS[@]}" ; do
 +    LogPrint "Running PRE_RECOVERY_COMMANDS '$command'"
 +    eval "$command"
 +done
 +
 if test "$PRE_RECOVERY_SCRIPT" ; then
 -	Log "Running PRE_RECOVERY_SCRIPT '${PRE_RECOVERY_SCRIPT[@]}'"
 -	eval "${PRE_RECOVERY_SCRIPT[@]}"
 +    LogPrint "Running PRE_RECOVERY_SCRIPT '${PRE_RECOVERY_SCRIPT[@]}'"
 +    eval "${PRE_RECOVERY_SCRIPT[@]}"
 fi
 diff --git a/usr/share/rear/wrapup/default/500_post_recovery_script.sh b/usr/share/rear/wrapup/default/500_post_recovery_script.sh
 index 77751800..866c9368 100644
 --- a/usr/share/rear/wrapup/default/500_post_recovery_script.sh
 +++ b/usr/share/rear/wrapup/default/500_post_recovery_script.sh
@@ -1,4 +1,14 @@
 +
 +# The POST_RECOVERY_COMMANDS are called directly after the POST_RECOVERY_SCRIPT
 +# so POST_RECOVERY_COMMANDS can also be used to clean up things after the POST_RECOVERY_SCRIPT:
 +
 if test "$POST_RECOVERY_SCRIPT" ; then
 -	Log "Running POST_RECOVERY_SCRIPT '${POST_RECOVERY_SCRIPT[@]}'"
 -	eval "${POST_RECOVERY_SCRIPT[@]}"
 +    LogPrint "Running POST_RECOVERY_SCRIPT '${POST_RECOVERY_SCRIPT[@]}'"
 +    eval "${POST_RECOVERY_SCRIPT[@]}"
 fi
 +
 +local command
 +for command in "${POST_RECOVERY_COMMANDS[@]}" ; do
 +    LogPrint "Running POST_RECOVERY_COMMANDS '$command'"
 +    eval "$command"
 +done
--- a/SOURCES/rear-bz2119501.patch
+++ b/SOURCES/rear-bz2119501.patch
@ -7,8 +7,8 @@ index 5bace664..cf960be8 100644
 # and https://github.com/rear/rear/pull/1734
 +# Some broken symlinks are expected. The 'build' and 'source' symlinks in kernel modules point to kernel sources
-+# and are broken until one installs the kernel-debug-devel or kernel-devel packages (on Fedora) and even then
+# and are broken untol one installs the kernel-debug-devel or kernel-devel packages (on Fedora) and even then
-+# the targets are not included in the rescue system by default.
+# the targets are jot included in the rescue system by default.
 +# Do not warn about those, it is just noise.
 +local irrelevant_symlinks=( '*/lib/modules/*/build' '*/lib/modules/*/source' )
 +function symlink_is_irrelevant () {
--- a/SOURCES/rear-bz2120736.patch
+++ b/SOURCES/rear-bz2120736.patch
--- a/SOURCES/rear-bz2130945.patch
+++ b/SOURCES/rear-bz2130945.patch
@ -0,0 +1,20 @@
 diff --git a/usr/share/rear/finalize/Fedora/i386/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/550_rebuild_initramfs.sh
 similarity index 100%
 rename from usr/share/rear/finalize/Fedora/i386/550_rebuild_initramfs.sh
 rename to usr/share/rear/finalize/Fedora/550_rebuild_initramfs.sh
 diff --git a/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh
 deleted file mode 120000
 index 22eede59..00000000
 --- a/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh
 +++ /dev/null
@@ -1 +0,0 @@
 -../i386/550_rebuild_initramfs.sh
 \ No newline at end of file
 diff --git a/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh
 deleted file mode 120000
 index 22eede59..00000000
 --- a/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh
 +++ /dev/null
@@ -1 +0,0 @@
 -../i386/550_rebuild_initramfs.sh
 \ No newline at end of file
--- a/SOURCES/rear-bz2131946.patch
+++ b/SOURCES/rear-bz2131946.patch
@ -0,0 +1,129 @@
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/131_include_filesystem_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/131_include_filesystem_code.sh
 index 172ac032..9cff63a0 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/131_include_filesystem_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/131_include_filesystem_code.sh
@@ -143,9 +143,9 @@ function create_fs () {
             # unless the user has explicitly specified XFS filesystem options:
             local xfs_opts
             local xfs_device_basename="$( basename $device )"
 -            local xfs_info_filename="$LAYOUT_XFS_OPT_DIR/$xfs_device_basename.xfs"
 +            local xfs_info_filename="$LAYOUT_XFS_OPT_DIR_RESTORE/$xfs_device_basename.xfs"
             # Only uppercase letters and digits are used to ensure mkfs_xfs_options_variable_name is a valid bash variable name
 -            # even in case of complicated device nodes e.g. things like /dev/mapper/SIBM_2810XIV_78033E7012F-part3 
 +            # even in case of complicated device nodes e.g. things like /dev/mapper/SIBM_2810XIV_78033E7012F-part3
             # cf. current_orig_device_basename_alnum_uppercase in layout/prepare/default/300_map_disks.sh
             local xfs_device_basename_alnum_uppercase="$( echo $xfs_device_basename | tr -d -c '[:alnum:]' | tr '[:lower:]' '[:upper:]' )"
             # cf. predefined_input_variable_name in the function UserInput in lib/_input-output-functions.sh
 diff --git a/usr/share/rear/layout/prepare/default/010_prepare_files.sh b/usr/share/rear/layout/prepare/default/010_prepare_files.sh
 index 85964712..7a980e63 100644
 --- a/usr/share/rear/layout/prepare/default/010_prepare_files.sh
 +++ b/usr/share/rear/layout/prepare/default/010_prepare_files.sh
@@ -5,6 +5,7 @@ LAYOUT_DEPS="$VAR_DIR/layout/diskdeps.conf"
 LAYOUT_TODO="$VAR_DIR/layout/disktodo.conf"
 LAYOUT_CODE="$VAR_DIR/layout/diskrestore.sh"
 LAYOUT_XFS_OPT_DIR="$VAR_DIR/layout/xfs"
 +LAYOUT_XFS_OPT_DIR_RESTORE="$LAYOUT_XFS_OPT_DIR/restore"
 FS_UUID_MAP="$VAR_DIR/layout/fs_uuid_mapping"
 LUN_WWID_MAP="$VAR_DIR/layout/lun_wwid_mapping"
 diff --git a/usr/share/rear/layout/prepare/default/319_rename_xfs_configs.sh b/usr/share/rear/layout/prepare/default/319_rename_xfs_configs.sh
 new file mode 100644
 index 00000000..406afa61
 --- /dev/null
 +++ b/usr/share/rear/layout/prepare/default/319_rename_xfs_configs.sh
@@ -0,0 +1,83 @@
 +# Cleanup directory which hold XFS configuration file for `rear recover'.
 +# This will avoid possible mess in LAYOUT_XFS_OPT_DIR_RESTORE if `rear recover'
 +# would be launched multiple times, where user will choose different disk
 +# mapping each time.
 +# Removing and creating LAYOUT_XFS_OPT_DIR_RESTORE will ensure that ReaR will
 +# have only current files available during current session.
 +rm -rf "$LAYOUT_XFS_OPT_DIR_RESTORE"
 +mkdir -p "$LAYOUT_XFS_OPT_DIR_RESTORE"
 +
 +local excluded_configs=()
 +
 +# Read $MAPPING_FILE (disk_mappings) to discover final disk mapping.
 +# Once mapping is known, configuration files can be renamed.
 +# (e.g. sds2.xfs to sdb2.xfs, ...)
 +while read source target junk ; do
 +    # Disks in MAPPING_FILE are listed with full device path. Since XFS config
 +    # files are created in format e.g. sda2.xfs strip prefixed path to have
 +    # only short device name available.
 +    base_source=$(basename "$source")
 +    base_target=$(basename "$target")
 +
 +    # Check if XFS configuration file for whole device (unpartitioned)
 +    # is available (sda, sdb, ...). If so, rename and copy it to
 +    # LAYOUT_XFS_OPT_DIR_RESTORE.
 +    if [ -e "$LAYOUT_XFS_OPT_DIR/$base_source.xfs" ]; then
 +        Log "Migrating XFS configuration file $base_source.xfs to $base_target.xfs"
 +        cp "$v" "$LAYOUT_XFS_OPT_DIR/$base_source.xfs" \
 +         "$LAYOUT_XFS_OPT_DIR_RESTORE/$base_target.xfs"
 +
 +        # Replace old device name in meta-data= option in XFS
 +        # configuration file as well.
 +        sed -i s#"meta-data=${source}\(\s\)"#"meta-data=${target}\1"# \
 +          "$LAYOUT_XFS_OPT_DIR_RESTORE/$base_target.xfs"
 +
 +        # Mark XFS config file as processed to avoid copying it again later.
 +        # More details on why are configs excluded can be found near the
 +        # end of this script (near `tar' command).
 +        excluded_configs+=("--exclude=$base_source.xfs")
 +    fi
 +
 +    # Find corresponding partitions to source disk in LAYOUT_FILE
 +    # and migrate/rename them too if necessary.
 +    while read _ layout_device _ _ _ _ layout_partition; do
 +        if [[ "$source" = "$layout_device" ]]; then
 +            base_src_layout_partition=$(basename "$layout_partition")
 +            base_dst_layout_partition=${base_src_layout_partition//$base_source/$base_target}
 +            dst_layout_partition=${layout_partition//$base_source/$base_target}
 +
 +            if [ -e "$LAYOUT_XFS_OPT_DIR/$base_src_layout_partition.xfs" ]; then
 +                Log "Migrating XFS configuration $base_src_layout_partition.xfs to $base_dst_layout_partition.xfs"
 +                cp "$v" "$LAYOUT_XFS_OPT_DIR/$base_src_layout_partition.xfs" \
 +                 "$LAYOUT_XFS_OPT_DIR_RESTORE/$base_dst_layout_partition.xfs"
 +
 +                # Replace old device name in meta-data= option in XFS
 +                # configuration file as well.
 +                sed -i s#"meta-data=${layout_partition}\(\s\)"#"meta-data=${dst_layout_partition}\1"# \
 +                  "$LAYOUT_XFS_OPT_DIR_RESTORE/$base_dst_layout_partition.xfs"
 +
 +                # Mark XFS config file as processed to avoid copying it again later.
 +                # More details on why are configs excluded can be found near the
 +                # end of this script (near `tar' command).
 +                excluded_configs+=("--exclude=$base_src_layout_partition.xfs")
 +            fi
 +        fi
 +    done < <( grep -E "^part " "$LAYOUT_FILE" )
 +done < <( grep -v '^#' "$MAPPING_FILE" )
 +
 +pushd "$LAYOUT_XFS_OPT_DIR" >/dev/null
 +# Copy remaining files
 +# We need to copy remaining files into LAYOUT_XFS_OPT_DIR_RESTORE which will
 +# serve as base dictionary where ReaR will look for XFS config files.
 +# It is necessary to copy only files that were not previously processed,
 +# because in LAYOUT_XFS_OPT_DIR they are still listed with
 +# original name and copy to LAYOUT_XFS_OPT_DIR_RESTORE could overwrite
 +# XFS configs already migrated.
 +# e.g. with following disk mapping situation:
 +# /dev/sda2 => /dev/sdb2
 +# /dev/sdb2 => /dev/sda2
 +# Files in LAYOUT_XFS_OPT_DIR_RESTORE would be overwritten by XFS configs with
 +# wrong names.
 +# tar is used to take advantage of its exclude feature.
 +tar cf - --exclude=restore "${excluded_configs[@]}" . | tar xfp - -C "$LAYOUT_XFS_OPT_DIR_RESTORE"
 +popd >/dev/null
 diff --git a/usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh b/usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh
 index 7895e4ee..fc0fa8fc 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/100_create_layout_file.sh
@@ -10,6 +10,7 @@ mkdir -p $v $VAR_DIR/layout/config
 # We need directory for XFS options only if XFS is in use:
 if test "$( mount -t xfs )" ; then
     LAYOUT_XFS_OPT_DIR="$VAR_DIR/layout/xfs"
 +    rm -rf $LAYOUT_XFS_OPT_DIR
     mkdir -p $v $LAYOUT_XFS_OPT_DIR
 fi
--- a/SOURCES/rear-device-shrinking-bz2223895.patch
+++ b/SOURCES/rear-device-shrinking-bz2223895.patch
@ -1,5 +1,4 @@
-commit 41c2d9b1fbcece4b0890ab92e9f5817621917ad3 (from 23977a19101b6e6eaeebbe8ce013332ddf9ea517)
+commit 4f03a10d4866efc9b6920a3878e6397d170742f9
 Merge: 23977a19 686012cb
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Thu Jul 20 15:11:52 2023 +0200
@ -13,10 +12,10 @@ Date:   Thu Jul 20 15:11:52 2023 +0200
    cf. https://github.com/rear/rear/pull/3027
 diff --git a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
-index e8f2be20..2169efaa 100644
+index ec55f331..0e402b01 100644
 --- a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
 +++ b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
-@@ -110,9 +110,13 @@ done >$copy_as_is_exclude_file
+@@ -92,9 +92,13 @@ done >$copy_as_is_exclude_file
 # COPY_AS_IS+=( /path/to/directory/* )
 # which are used in our scripts and by users in their etc/rear/local.conf
 # cf. https://github.com/rear/rear/pull/2405#issuecomment-633512932
--- a/SOURCES/rear-luks-key-bz2228779.patch
+++ b/SOURCES/rear-luks-key-bz2228779.patch
@ -0,0 +1,25 @@
 commit 2aa7b47354bdf5863071c8b479d29c99aad05ecb
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Fri Jul 24 13:02:45 2020 +0200
    Update 240_reassign_luks_keyfiles.sh
    Use ReaR specific TMP_DIR (not TMPDIR or hardcoded /tmp)
 diff --git a/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh b/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
 index d989c3fb..358f3950 100644
 --- a/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
 +++ b/usr/share/rear/finalize/GNU/Linux/240_reassign_luks_keyfiles.sh
@@ -24,9 +24,9 @@ awk '
 while read target_name source_device original_keyfile; do
     Log "Re-assigning keyfile $original_keyfile to LUKS device $target_name ($source_device)"
 -    # The scheme for generating a temporary keyfile path must be the same here and in the 'layout/prepare' stage.
 -    temp_keyfile="${TMPDIR:-/tmp}/LUKS-keyfile-$target_name"
 -    [ -f "$temp_keyfile" ] || BugError "temporary keyfile $temp_keyfile not found"
 +    # The scheme for generating a temporary keyfile path must be the same here and in the 'layout/prepare' stage:
 +    temp_keyfile="$TMP_DIR/LUKS-keyfile-$target_name"
 +    test -f "$temp_keyfile" || BugError "temporary LUKS keyfile $temp_keyfile not found"
     target_keyfile="$TARGET_FS_ROOT/$original_keyfile"
--- a/SOURCES/rear-pr2675.patch
+++ b/SOURCES/rear-pr2675.patch
@ -0,0 +1,60 @@
 diff --git a/usr/share/rear/lib/framework-functions.sh b/usr/share/rear/lib/framework-functions.sh
 index 4878216b..e919bdbf 100644
 --- a/usr/share/rear/lib/framework-functions.sh
 +++ b/usr/share/rear/lib/framework-functions.sh
@@ -121,7 +121,7 @@ function cleanup_build_area_and_end_program () {
             sleep 2
             umount_mountpoint_lazy $BUILD_DIR/outputfs
         fi
 -        remove_temporary_mountpoint '$BUILD_DIR/outputfs' || BugError "Directory $BUILD_DIR/outputfs not empty, can not remove"
 +        remove_temporary_mountpoint "$BUILD_DIR/outputfs" || BugError "Directory $BUILD_DIR/outputfs not empty, can not remove"
         rmdir $v $BUILD_DIR >&2
     fi
     Log "End of program reached"
 diff --git a/usr/share/rear/lib/global-functions.sh b/usr/share/rear/lib/global-functions.sh
 index c1a11615..0f8f362d 100644
 --- a/usr/share/rear/lib/global-functions.sh
 +++ b/usr/share/rear/lib/global-functions.sh
@@ -317,7 +317,20 @@ function url_path() {
 ### Returns true if one can upload files to the URL
 function scheme_accepts_files() {
 -    local scheme=$1
 +    # Be safe against 'set -eu' which would exit 'rear' with "bash: $1: unbound variable"
 +    # when scheme_accepts_files is called without an argument
 +    # by bash parameter expansion with using an empty default value if $1 is unset or null.
 +    # Bash parameter expansion with assigning a default value ${1:=} does not work
 +    # (then it would still exit with "bash: $1: cannot assign in this way")
 +    # but using a default value is practicable here because $1 is used only once
 +    # cf. https://github.com/rear/rear/pull/2675#discussion_r705018956
 +    local scheme=${1:-}
 +    # Return false if scheme is empty or blank (e.g. when OUTPUT_URL is unset or empty or blank)
 +    # cf. https://github.com/rear/rear/issues/2676
 +    # and https://github.com/rear/rear/issues/2667#issuecomment-914447326
 +    # also return false if scheme is more than one word (so no quoted "$scheme" here)
 +    # cf. https://github.com/rear/rear/pull/2675#discussion_r704401462
 +    test $scheme || return 1
     case $scheme in
         (null|tape|obdr)
             # tapes do not support uploading arbitrary files, one has to handle them
@@ -341,7 +354,10 @@ function scheme_accepts_files() {
 ### Returning true does not imply that the URL is currently mounted at a filesystem and usable,
 ### only that it can be mounted (use mount_url() first)
 function scheme_supports_filesystem() {
 -    local scheme=$1
 +    # Be safe against 'set -eu' exit if scheme_supports_filesystem is called without argument
 +    local scheme=${1:-}
 +    # Return false if scheme is empty or blank or more than one word, cf. scheme_accepts_files() above
 +    test $scheme || return 1
     case $scheme in
         (null|tape|obdr|rsync|fish|ftp|ftps|hftp|http|https|sftp)
             return 1
@@ -560,7 +576,7 @@ function umount_url() {
     RemoveExitTask "perform_umount_url '$url' '$mountpoint' lazy"
 -    remove_temporary_mountpoint '$mountpoint' && RemoveExitTask "remove_temporary_mountpoint '$mountpoint'"
 +    remove_temporary_mountpoint "$mountpoint" && RemoveExitTask "remove_temporary_mountpoint '$mountpoint'"
     return 0
 }
--- a/SOURCES/rear-restore-hybrid-bootloader-RHEL-16864.patch
+++ b/SOURCES/rear-restore-hybrid-bootloader-RHEL-16864.patch
@ -1,85 +1,5 @@
 commit 096bfde5e234f5a803bae74f24e3821798022c7c
 Merge: 625775fc 1df15b03
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Tue Feb 6 18:37:52 2024 +0100
    Merge pull request #3136 from pcahyna/no-recovery-bootdisk
    Include GRUB tools unconditionally and don't create $VAR_DIR/recovery/bootdisk in prep
 diff --git a/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh b/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
 index fcf0a5ff..7d494281 100644
 --- a/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
 +++ b/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
@@ -1,8 +1,6 @@
 #
 # GRUB2 has much more commands than the legacy grub command, including modules
 -test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 -
 # cf. https://github.com/rear/rear/issues/2137
 # s390 zlinux does not use grub 
 # *********************************************************************************
@@ -11,19 +9,8 @@ test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 # *********************************************************************************
 [ "$ARCH" == "Linux-s390"  ] && return 0
 -# Because usr/sbin/rear sets 'shopt -s nullglob' the 'echo -n' command
 -# outputs nothing if nothing matches the bash globbing pattern '/boot/grub*'
 -local grubdir="$( echo -n /boot/grub* )"
 -# Use '/boot/grub' as fallback if nothing matches '/boot/grub*'
 -test -d "$grubdir" || grubdir='/boot/grub'
 -
 -# Check if we're using grub or grub2 before doing something.
 -if has_binary grub-probe ; then
 -    grub-probe -t device $grubdir >$VAR_DIR/recovery/bootdisk 2>/dev/null || return 0
 -elif has_binary grub2-probe ; then
 -    grub2-probe -t device $grubdir >$VAR_DIR/recovery/bootdisk 2>/dev/null || return 0
 -fi
 -
 +# It is safe to assume that we are using GRUB and try to add these files to the rescue image
 +# even if the assumption is wrong.
 # Missing programs in the PROGS array are ignored:
 PROGS+=( grub-bios-setup      grub2-bios-setup
          grub-install         grub2-install
 # https://github.com/rear/rear/pull/3145
 diff --git a/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh b/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
 index b4ab3786..4451f53d 100644
 --- a/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
 +++ b/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
@@ -1,8 +1,6 @@
 #
 #  s390 zIPL boot loader and grubby for configuring boot loader`
 -test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 -
 # See the code in prep/GNU/Linux/300_include_grub_tools.sh
 # that sets grubdir via
 #   local grubdir="$( echo -n /boot/grub* )"
@@ -21,7 +19,7 @@ local bootdir="/boot/"
 #   findmnt returns --> /dev/dasda3[/@/.snapshots/1/snapshot]
 #   use 300_include_grub_tools.sh instead of this file (grub2-probe)
 if has_binary findmnt ; then
 -    findmnt -no SOURCE --target $bootdir >$VAR_DIR/recovery/bootdisk || return 0
 +    findmnt -no SOURCE --target $bootdir > /dev/null || return 0
 fi
 # Missing programs in the PROGS array are ignored:
 diff --git a/usr/share/rear/prep/default/320_include_uefi_env.sh b/usr/share/rear/prep/default/320_include_uefi_env.sh
 index ea86af4c..93e59eae 100644
 --- a/usr/share/rear/prep/default/320_include_uefi_env.sh
 +++ b/usr/share/rear/prep/default/320_include_uefi_env.sh
@@ -87,7 +87,3 @@ fi
 DebugPrint "Found EFI system partition ${esp_proc_mounts_line[0]} on ${esp_proc_mounts_line[1]} type ${esp_proc_mounts_line[2]}"
 USING_UEFI_BOOTLOADER=1
 LogPrint "Using UEFI Boot Loader for Linux (USING_UEFI_BOOTLOADER=1)"
 -
 -# Remember the ESP device node in VAR_DIR/recovery/bootdisk:
 -echo "${esp_proc_mounts_line[0]}" >$VAR_DIR/recovery/bootdisk
 -
 diff --git a/usr/share/rear/finalize/Linux-i386/630_install_grub.sh b/usr/share/rear/finalize/Linux-i386/630_install_grub.sh
-index f3d9a820..a0e87e1d 100644
+index f3d9a8204..a0e87e1db 100644
 --- a/usr/share/rear/finalize/Linux-i386/630_install_grub.sh
 +++ b/usr/share/rear/finalize/Linux-i386/630_install_grub.sh
@@ -1,22 +1,18 @@
@ -173,10 +93,10 @@ index f3d9a820..a0e87e1d 100644
         part=$( echo $bootparts | cut -d' ' -f1 )
 diff --git a/usr/share/rear/finalize/Linux-i386/660_install_grub2.sh b/usr/share/rear/finalize/Linux-i386/660_install_grub2.sh
-index d1c36bd3..af3d8a92 100644
+index 58163d622..f42b5bfbe 100644
 --- a/usr/share/rear/finalize/Linux-i386/660_install_grub2.sh
 +++ b/usr/share/rear/finalize/Linux-i386/660_install_grub2.sh
-@@ -45,6 +45,37 @@
+@@ -38,6 +38,37 @@
 # so that after "rear recover" finished he can manually install the bootloader
 # as appropriate for his particular system.
@ -214,7 +134,7 @@ index d1c36bd3..af3d8a92 100644
 # Skip if another bootloader was already installed:
 # In this case NOBOOTLOADER is not true,
 # cf. finalize/default/050_prepare_checks.sh
-@@ -52,12 +83,16 @@ is_true $NOBOOTLOADER || return 0
+@@ -45,12 +76,16 @@ is_true $NOBOOTLOADER || return 0
 # For UEFI systems with grub2 we should use efibootmgr instead,
 # cf. finalize/Linux-i386/670_run_efibootmgr.sh
@ -233,7 +153,7 @@ index d1c36bd3..af3d8a92 100644
 LogPrint "Installing GRUB2 boot loader..."
-@@ -101,7 +136,7 @@ if test "$GRUB2_INSTALL_DEVICES" ; then
+@@ -94,7 +129,7 @@ if test "$GRUB2_INSTALL_DEVICES" ; then
         else
             LogPrint "Installing GRUB2 on $grub2_install_device (specified in GRUB2_INSTALL_DEVICES)"
         fi
@ -242,7 +162,7 @@ index d1c36bd3..af3d8a92 100644
             LogPrintError "Failed to install GRUB2 on $grub2_install_device"
             grub2_install_failed="yes"
         fi
-@@ -145,8 +180,8 @@ fi
+@@ -138,8 +173,8 @@ fi
 grub2_installed_disks=()
 for disk in $disks ; do
     # Installing GRUB2 on an LVM PV will wipe the metadata so we skip those:
@ -253,7 +173,7 @@ index d1c36bd3..af3d8a92 100644
     # Use first boot partition by default:
     part=$( echo $bootparts | cut -d' ' -f1 )
-@@ -165,6 +200,8 @@ for disk in $disks ; do
+@@ -158,6 +193,8 @@ for disk in $disks ; do
     # Install GRUB2 on the boot disk if one was found:
     if test "$bootdisk" ; then
@ -262,7 +182,7 @@ index d1c36bd3..af3d8a92 100644
         # Continue with the next possible boot disk when GRUB2 was already installed on the current one.
         # When there are more disks like /dev/sda and /dev/sdb it can happen that
         # for /dev/sda bootdisk=/dev/sda and GRUB2 gets installed on /dev/sda and
-@@ -172,7 +209,7 @@ for disk in $disks ; do
+@@ -165,7 +202,7 @@ for disk in $disks ; do
         # so we avoid that GRUB2 gets needlessly installed two times on the same device:
         IsInArray "$bootdisk" "${grub2_installed_disks[@]}" && continue
         LogPrint "Found possible boot disk $bootdisk - installing GRUB2 there"
@ -271,7 +191,7 @@ index d1c36bd3..af3d8a92 100644
             grub2_installed_disks+=( "$bootdisk" )
             # In contrast to the above behaviour when GRUB2_INSTALL_DEVICES is specified
             # consider it here as a successful bootloader installation when GRUB2
-@@ -181,11 +218,14 @@ for disk in $disks ; do
+@@ -174,11 +211,14 @@ for disk in $disks ; do
             # Continue with the next possible boot disk:
             continue
         fi
@ -289,7 +209,7 @@ index d1c36bd3..af3d8a92 100644
 return 1
 diff --git a/usr/share/rear/finalize/default/050_prepare_checks.sh b/usr/share/rear/finalize/default/050_prepare_checks.sh
-index 1679c9a4..57b44bca 100644
+index 1679c9a41..57b44bca4 100644
 --- a/usr/share/rear/finalize/default/050_prepare_checks.sh
 +++ b/usr/share/rear/finalize/default/050_prepare_checks.sh
@@ -10,10 +10,18 @@
@ -313,7 +233,7 @@ index 1679c9a4..57b44bca 100644
 # The output is stored in an artificial bash array so that $BOOTLOADER is the first word:
 test -s $bootloader_file && BOOTLOADER=( $( grep -v '^[[:space:]]*#' $bootloader_file ) )
 diff --git a/usr/share/rear/layout/save/default/445_guess_bootloader.sh b/usr/share/rear/layout/save/default/445_guess_bootloader.sh
-index 06de7648..0233b0eb 100644
+index fd5267dcf..b9e636a02 100644
 --- a/usr/share/rear/layout/save/default/445_guess_bootloader.sh
 +++ b/usr/share/rear/layout/save/default/445_guess_bootloader.sh
@@ -1,7 +1,15 @@
@ -353,7 +273,7 @@ index 06de7648..0233b0eb 100644
 -        # cf. https://github.com/rear/rear/issues/2137
 -        for known_bootloader in GRUB2 GRUB ELILO LILO ZIPL ; do
 -            if grep -q -i "$known_bootloader" $bootloader_area_strings_file ; then
-                LogPrint "Using guessed bootloader '$known_bootloader' for 'rear recover' (found in first bytes on $disk_device with GPT BIOS boot partition)"
+-                LogPrint "Using guessed bootloader '$known_bootloader' (found in first bytes on $disk_device with GPT BIOS boot partition)"
 -                echo "$known_bootloader" >$bootloader_file
 -                return
 -            fi
@ -370,7 +290,6 @@ index 06de7648..0233b0eb 100644
 -    for known_bootloader in GRUB2-EFI EFI GRUB2 GRUB ELILO LILO ZIPL ; do
 +    for known_bootloader in GRUB2 GRUB LILO ZIPL ; do
         if grep -q -i "$known_bootloader" $bootloader_area_strings_file ; then
 -            LogPrint "Using guessed bootloader '$known_bootloader' for 'rear recover' (found in first bytes on $disk_device)"
 +            # If we find "GRUB" (which means GRUB Legacy)
 +            # do not unconditionally trust that because https://github.com/rear/rear/pull/589
 +            # reads (excerpt):
@ -389,7 +308,7 @@ index 06de7648..0233b0eb 100644
 +                known_bootloader=GRUB2
 +                LogPrint "GRUB found in first bytes on $disk_device and GRUB 2 is installed, using GRUB2 as a guessed bootloader for 'rear recover'"
 +            else
-+                LogPrint "Using guessed bootloader '$known_bootloader' for 'rear recover' (found in first bytes on $disk_device)"
+             LogPrint "Using guessed bootloader '$known_bootloader' (found in first bytes on $disk_device)"
 +            fi
             echo "$known_bootloader" >$bootloader_file
             return
@ -422,11 +341,11 @@ index 06de7648..0233b0eb 100644
 # Error out when no bootloader was specified or could be autodetected:
 Error "Cannot autodetect what is used as bootloader, see default.conf about 'BOOTLOADER'"
 diff --git a/usr/share/rear/lib/bootloader-functions.sh b/usr/share/rear/lib/bootloader-functions.sh
-index a8ee92a9..2d6955cc 100644
+index 5402f1da0..7aa40a589 100644
 --- a/usr/share/rear/lib/bootloader-functions.sh
 +++ b/usr/share/rear/lib/bootloader-functions.sh
-@@ -529,6 +529,53 @@ function get_root_disk_UUID {
+@@ -491,6 +491,53 @@ function get_root_disk_UUID {
-     ( set -o pipefail ; mount | grep ' on / ' | awk '{print $1}' | xargs blkid -s UUID -o value || Error "Failed to get root disk UUID" )
+     echo $(mount | grep ' on / ' | awk '{print $1}' | xargs blkid -s UUID -o value)
 }
 +# Detect whether actually GRUB 2 is installed and that test is to
@ -476,11 +395,11 @@ index a8ee92a9..2d6955cc 100644
 +    fi
 +}
 +
- # Output GRUB2 configuration on stdout:
+ # Create configuration grub
- # $1 is the kernel file with appropriate path for GRUB2 to load the kernel from within GRUB2's root filesystem
+ function create_grub2_cfg {
- # $2 is the initrd file with appropriate path for GRUB2 to load the initrd from within GRUB2's root filesystem
+     root_uuid=$(get_root_disk_UUID)
 diff --git a/usr/share/rear/lib/checklayout-workflow.sh b/usr/share/rear/lib/checklayout-workflow.sh
-index 94b70fc0..744ca0be 100644
+index 94b70fc06..744ca0be1 100644
 --- a/usr/share/rear/lib/checklayout-workflow.sh
 +++ b/usr/share/rear/lib/checklayout-workflow.sh
@@ -15,6 +15,10 @@ function WORKFLOW_checklayout () {
@ -495,10 +414,10 @@ index 94b70fc0..744ca0be 100644
     # otherwise 'rear checklayout' would always detect a changed layout with BACKUP_URL=file:///...
     # because during 'rear mkrescue/mkbackup' such a component was automatically excluded this way
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
-index cb33ac28..2f53d4fa 100644
+index 4f5b8f6f8..f5fc7538e 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
-@@ -526,6 +526,33 @@ get_component_type() {
+@@ -520,6 +520,33 @@ get_component_type() {
     grep -E "^[^ ]+ $1 " $LAYOUT_TODO | cut -d " " -f 3
 }
@ -532,7 +451,7 @@ index cb33ac28..2f53d4fa 100644
 # Function returns 0 when v1 is greater or equal than v2
 version_newer() {
   local v1list=( ${1//[-.]/ } )
-@@ -760,17 +787,17 @@ blkid_label_of_device() {
+@@ -794,17 +821,17 @@ blkid_label_of_device() {
     echo "$label"
 }
@ -554,9 +473,9 @@ index cb33ac28..2f53d4fa 100644
 +    return 1
 }
- function is_multipath_used {
+ function is_multipath_path {
 diff --git a/usr/share/rear/lib/savelayout-workflow.sh b/usr/share/rear/lib/savelayout-workflow.sh
-index 69cda58e..27bb0a1a 100644
+index 69cda58e9..27bb0a1ad 100644
 --- a/usr/share/rear/lib/savelayout-workflow.sh
 +++ b/usr/share/rear/lib/savelayout-workflow.sh
@@ -10,6 +10,10 @@ if [[ "$VERBOSE" ]]; then
@ -570,3 +489,81 @@ index 69cda58e..27bb0a1a 100644
     #DISKLAYOUT_FILE=$VAR_DIR/layout/disklayout.conf # defined in default.conf now (issue #678)
     SourceStage "layout/save"
 }
 diff --git a/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh b/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
 index fcf0a5ff6..7d494281a 100644
 --- a/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
 +++ b/usr/share/rear/prep/GNU/Linux/300_include_grub_tools.sh
@@ -1,8 +1,6 @@
 #
 # GRUB2 has much more commands than the legacy grub command, including modules
 -test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 -
 # cf. https://github.com/rear/rear/issues/2137
 # s390 zlinux does not use grub 
 # *********************************************************************************
@@ -11,19 +9,8 @@ test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 # *********************************************************************************
 [ "$ARCH" == "Linux-s390"  ] && return 0
 -# Because usr/sbin/rear sets 'shopt -s nullglob' the 'echo -n' command
 -# outputs nothing if nothing matches the bash globbing pattern '/boot/grub*'
 -local grubdir="$( echo -n /boot/grub* )"
 -# Use '/boot/grub' as fallback if nothing matches '/boot/grub*'
 -test -d "$grubdir" || grubdir='/boot/grub'
 -
 -# Check if we're using grub or grub2 before doing something.
 -if has_binary grub-probe ; then
 -    grub-probe -t device $grubdir >$VAR_DIR/recovery/bootdisk 2>/dev/null || return 0
 -elif has_binary grub2-probe ; then
 -    grub2-probe -t device $grubdir >$VAR_DIR/recovery/bootdisk 2>/dev/null || return 0
 -fi
 -
 +# It is safe to assume that we are using GRUB and try to add these files to the rescue image
 +# even if the assumption is wrong.
 # Missing programs in the PROGS array are ignored:
 PROGS+=( grub-bios-setup      grub2-bios-setup
          grub-install         grub2-install
 diff --git a/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh b/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
 index 084ea3104..4451f53d0 100644
 --- a/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
 +++ b/usr/share/rear/prep/Linux-s390/305_include_s390_tools.sh
@@ -1,10 +1,13 @@
 #
 #  s390 zIPL boot loader and grubby for configuring boot loader`
 -test -d $VAR_DIR/recovery || mkdir -p $VAR_DIR/recovery
 -
 -local bootdir="$( echo -n /boot/ )"
 -test -d "$bootdir" || $bootdir='/boot/'
 +# See the code in prep/GNU/Linux/300_include_grub_tools.sh
 +# that sets grubdir via
 +#   local grubdir="$( echo -n /boot/grub* )"
 +# where 'shopt -s nullglob' results nothing when nothing matches
 +# but that is not needed here to set a fixed bootdir="/boot"
 +# cf. https://github.com/rear/rear/issues/1040#issuecomment-1034890880
 +local bootdir="/boot/"
 # cf. https://github.com/rear/rear/issues/2137
 # findmnt is used the same as grub-probe to find the device where /boot is mounted
@@ -16,7 +19,7 @@ test -d "$bootdir" || $bootdir='/boot/'
 #   findmnt returns --> /dev/dasda3[/@/.snapshots/1/snapshot]
 #   use 300_include_grub_tools.sh instead of this file (grub2-probe)
 if has_binary findmnt ; then
 -    findmnt -no SOURCE --target $bootdir >$VAR_DIR/recovery/bootdisk || return 0
 +    findmnt -no SOURCE --target $bootdir > /dev/null || return 0
 fi
 # Missing programs in the PROGS array are ignored:
 diff --git a/usr/share/rear/prep/default/320_include_uefi_env.sh b/usr/share/rear/prep/default/320_include_uefi_env.sh
 index ea86af4ca..93e59eae5 100644
 --- a/usr/share/rear/prep/default/320_include_uefi_env.sh
 +++ b/usr/share/rear/prep/default/320_include_uefi_env.sh
@@ -87,7 +87,3 @@ fi
 DebugPrint "Found EFI system partition ${esp_proc_mounts_line[0]} on ${esp_proc_mounts_line[1]} type ${esp_proc_mounts_line[2]}"
 USING_UEFI_BOOTLOADER=1
 LogPrint "Using UEFI Boot Loader for Linux (USING_UEFI_BOOTLOADER=1)"
 -
 -# Remember the ESP device node in VAR_DIR/recovery/bootdisk:
 -echo "${esp_proc_mounts_line[0]}" >$VAR_DIR/recovery/bootdisk
 -
--- a/SOURCES/rear-save-lvm-poolmetadatasize-RHEL-6984.patch
+++ b/SOURCES/rear-save-lvm-poolmetadatasize-RHEL-6984.patch
@ -1,14 +1,16 @@
-commit f6af518baf3b5a4dc06bf8cfea262e627eee3e07
+From e7b84271536782fbc8673ef4573e155e1dfa850e Mon Sep 17 00:00:00 2001
-Merge: ed4c78d5 75a86fc3
+From: pcahyna <pcahyna@users.noreply.github.com>
-Author: pcahyna <pcahyna@users.noreply.github.com>
+Date: Wed, 1 Nov 2023 12:53:33 +0100
-Date:   Wed Nov 1 12:53:33 2023 +0100
+Subject: [PATCH] Merge pull request #3061 from
 pcahyna/save-lvm-poolmetadatasize
-    Merge pull request #3061 from pcahyna/save-lvm-poolmetadatasize
+Save LVM pool metadata volume size in disk layout
-    
+---
-    Save LVM pool metadata volume size in disk layout
+ .../layout/save/GNU/Linux/220_lvm_layout.sh   | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)
 diff --git a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
-index 7400c586..b12cff1f 100644
+index f21845df9..42f0e4126 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/220_lvm_layout.sh
@@ -18,7 +18,7 @@ local already_processed_lvs=()
@ -43,7 +45,7 @@ index 7400c586..b12cff1f 100644
     # Get the volume group configuration:
     # Format: lvmgrp <volume_group> <extentsize> [<size(extents)>] [<size(bytes)>]
-@@ -200,18 +200,18 @@ local lvs_exit_code
+@@ -200,17 +200,17 @@ local lvs_exit_code
     # Specify the fields for the lvs command depending on whether or not the 'lv_layout' field is supported:
     if is_true $lv_layout_supported ; then
@ -59,29 +61,14 @@ index 7400c586..b12cff1f 100644
 -    # with lvs_fields="origin,lv_name,vg_name,lv_size,lv_layout,pool_lv,chunk_size,stripes,stripe_size,seg_size"
 +    # with lvs_fields="origin,lv_name,vg_name,lv_size,lv_layout,pool_lv,chunk_size,stripes,stripe_size,seg_size,lv_metadata_size"
     # i.e. when the 'lv_layout' field is supported:
-    #   :home:system:6148849664:linear::0:1:0:6148849664
+-    #   :root:system:19927138304:linear::0:1:0:19927138304
-    #   :root:system:14050918400:linear::0:1:0:14050918400
+-    #   :swap:system:1535115264:linear::0:1:0:1535115264
-    #   :swap:system:1262485504:linear::0:1:0:1262485504
+    #   :root:system:19927138304:linear::0:1:0:19927138304:
-+    #   :home:system:6148849664:linear::0:1:0:6148849664:
+    #   :swap:system:1535115264:linear::0:1:0:1535115264:
-+    #   :root:system:14050918400:linear::0:1:0:14050918400:
+     # There are two leading blanks in the output (at least on SLES12-SP4 with LVM 2.02.180).
-+    #   :swap:system:1262485504:linear::0:1:0:1262485504:
+     lvm lvs --separator=':' --noheadings --units b --nosuffix -o $lvs_fields | while read line ; do
     # There are two leading blanks in the output (at least on SLES12-SP4 with LVM 2.02.180 and SLES15-SP3 with LVM 2.03.05).
     # The 'lvs' output lines ordering does not match the ordering of the LVs kernel device nodes /dev/dm-N
     #   # lsblk -ipbo NAME,KNAME,TYPE,FSTYPE,SIZE,MOUNTPOINT /dev/sda2
@@ -251,9 +251,9 @@ local lvs_exit_code
     # that the recreated system did not boot (boot screen showed GRUB but there it hung with constant 100% CPU usage)
     # so automatically shrinking only the biggest LVs avoids that a relatively small 'swap' LV gets shrinked.
     # With 'sort -n -t ':' -k 4' the above 'lvs' output lines become
 -    #   :swap:system:1262485504:linear::0:1:0:1262485504
 -    #   :home:system:6148849664:linear::0:1:0:6148849664
 -    #   :root:system:14050918400:linear::0:1:0:14050918400
 +    #   :swap:system:1262485504:linear::0:1:0:1262485504:
 +    #   :home:system:6148849664:linear::0:1:0:6148849664:
 +    #   :root:system:14050918400:linear::0:1:0:14050918400:
     # so only the 'root' LV may get automatically shrinked if needed.
     lvm lvs --separator=':' --noheadings --units b --nosuffix -o $lvs_fields | sort -n -t ':' -k 4 | while read line ; do
-@@ -304,14 +304,23 @@ local lvs_exit_code
+@@ -261,14 +261,23 @@ local lvs_exit_code
         # With the above example segmentsize=19927138304 and segmentsize=1535115264
         segmentsize="$( echo "$line" | awk -F ':' '{ print $10 }' )"
@ -110,3 +97,6 @@ index 7400c586..b12cff1f 100644
         [ $chunksize -eq 0 ] || kval="${kval:+$kval }chunksize:${chunksize}b"
         [ $stripesize -eq 0 ] || kval="${kval:+$kval }stripesize:${stripesize}b"
         [ $segmentsize -eq $size ] || infokval="${infokval:+$infokval }segmentsize:${segmentsize}b"
 -- 
 2.43.0
--- a/SOURCES/rear-sfdc02772301.patch
+++ b/SOURCES/rear-sfdc02772301.patch
@ -0,0 +1,38 @@
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 9ada92c3..455aa3ce 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -1813,7 +1813,7 @@ OBDR_BLOCKSIZE=2048
 # BACKUP=NBU stuff (Symantec/Veritas NetBackup)
 ##
 #
 -COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt )
 +COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt /opt/VRTSpbx /etc/vx/VxICS /etc/vx/vrtslog.conf )
 COPY_AS_IS_EXCLUDE_NBU=( /usr/openv/netbackup/logs "/usr/openv/netbackup/bin/bpjava*" /usr/openv/netbackup/bin/xbp /usr/openv/netbackup/bin/private /usr/openv/lib/java /usr/openv/lib/shared/vddk /usr/openv/netbackup/baremetal )
 # See https://github.com/rear/rear/issues/2105 why /usr/openv/netbackup/sec/at/lib/ is needed:
 NBU_LD_LIBRARY_PATH="/usr/openv/lib:/usr/openv/netbackup/sec/at/lib/"
 diff --git a/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh b/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh
 index cd48b8d9..ae5a3ccc 100644
 --- a/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh
 +++ b/usr/share/rear/rescue/NBU/default/450_prepare_netbackup.sh
@@ -7,6 +7,12 @@
 [[ $NBU_version -lt 7 ]] && return	# NBU is using xinetd when version <7.x
 +if [ -e "/etc/init.d/vxpbx_exchanged" ]; then
 +	cp $v /etc/init.d/vxpbx_exchanged $ROOTFS_DIR/etc/scripts/system-setup.d/vxpbx_exchanged.real
 +	chmod $v +x $ROOTFS_DIR/etc/scripts/system-setup.d/vxpbx_exchanged.real
 +	echo "( /etc/scripts/system-setup.d/vxpbx_exchanged.real start )" > $ROOTFS_DIR/etc/scripts/system-setup.d/89-vxpbx_exchanged.sh
 +fi
 +
 if [ -e "/etc/init.d/netbackup" ]; then
 	cp $v /etc/init.d/netbackup $ROOTFS_DIR/etc/scripts/system-setup.d/netbackup.real
 	chmod $v +x $ROOTFS_DIR/etc/scripts/system-setup.d/netbackup.real
 diff --git a/usr/share/rear/skel/NBU/usr/openv/tmp/.gitignore b/usr/share/rear/skel/NBU/usr/openv/tmp/.gitignore
 new file mode 100644
 index 00000000..d6b7ef32
 --- /dev/null
 +++ b/usr/share/rear/skel/NBU/usr/openv/tmp/.gitignore
@@ -0,0 +1,2 @@
 +*
 +!.gitignore
--- a/SOURCES/rear-skip-invalid-drives-RHEL-22863.patch
+++ b/SOURCES/rear-skip-invalid-drives-RHEL-22863.patch
@ -0,0 +1,60 @@
 diff --git a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
 index da6ce64c4..ab14ec83f 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
@@ -395,6 +395,10 @@ Log "Saving disk partitions."
             elif [[ ! ($blockd = *rpmb || $blockd = *[0-9]boot[0-9]) ]]; then # Silently skip Replay Protected Memory Blocks and others  
                 devname=$(get_device_name $disk)
                 devsize=$(get_disk_size ${disk#/sys/block/})
 +                if ! validation_error=$(is_disk_valid $devname) ; then
 +                    LogPrintError "Ignoring $blockd: $validation_error"
 +                    continue
 +                fi
                 disktype=$(parted -s $devname print | grep -E "Partition Table|Disk label" | cut -d ":" -f "2" | tr -d " ")
                 if [ "$disktype" != "dasd" ]; then
                     echo "# Disk $devname"
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
 index f5fc7538e..90b16cb20 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
@@ -834,6 +834,40 @@ is_disk_a_pv() {
     return 1
 }
 +# Check whether disk is suitable for being added to layout
 +# Can be used to skip obviously unsuitable/broken devices
 +# (missing device node, zero size, device can't be opened).
 +# Should not be used to skip potential mapping targets before layout restoration
 +# - an invalid disk may become valid later, for example if it is a DASD that needs
 +# low-level formatting (see 090_include_dasd_code.sh and 360_generate_dasd_format_code.sh),
 +# unformatted DASDs show zero size.
 +# Returns 0 if the device is ok
 +# Returns nonzero code if it should be skipped, and a text describing the error
 +# (without the device name) on stdout
 +# usage example:
 +# local err
 +# if ! err=$(is_disk_valid /dev/sda); then
 +
 +function is_disk_valid {
 +    local disk="$1"
 +    local size
 +
 +    if ! test -b "$disk" ; then
 +        echo "$disk is not a block device"
 +        return 1
 +    fi
 +    # capture stdout in a variable and redirect stderr to stdout - the error message
 +    # will be our output
 +    if { size=$(blockdev --getsize64 "$disk") ; } 2>&1 ; then
 +        if ! test "$size" -gt 0 2>/dev/null ; then
 +            echo "$disk has invalid size $size"
 +            return 1
 +        fi
 +    else
 +        return 1
 +    fi
 +}
 +
 function is_multipath_path {
     # Return 'false' if there is no device as argument:
     test "$1" || return 1
--- a/SOURCES/rear-skip-useless-xfs-mount-options-RHEL-10478.patch
+++ b/SOURCES/rear-skip-useless-xfs-mount-options-RHEL-10478.patch
@ -1,16 +1,5 @@
 commit ed4c78d5fe493ea368989d0086a733653692f5cb
 Merge: 3c9398bb 0cdcab02
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Mon Oct 30 18:31:01 2023 +0100
    Merge pull request #3058 from pcahyna/skip-useless-xfs-mount-options
    Skip useless xfs mount options when mounting during recovery
    Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/133_include_mount_filesystem_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/133_include_mount_filesystem_code.sh
-index d5707779..f7115f55 100644
+index d57077791..87ab5d691 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/133_include_mount_filesystem_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/133_include_mount_filesystem_code.sh
@@ -29,6 +29,7 @@ mount_fs() {
@ -21,23 +10,7 @@ index d5707779..f7115f55 100644
                 value=${value//nodev/dev}
                 # btrfs mount options like subvolid=259 or subvol=/@/.snapshots/1/snapshot
                 # from the old system cannot work here for recovery because btrfs subvolumes
-@@ -36,13 +37,8 @@ mount_fs() {
+@@ -147,6 +148,27 @@ mount_fs() {
                 # so that those mount options are removed here. All btrfs subvolume handling
                 # happens in the btrfs_subvolumes_setup_SLES function in 136_include_btrfs_subvolumes_SLES_code.sh
                 # or in the btrfs_subvolumes_setup_generic function in 135_include_btrfs_subvolumes_generic_code.sh
 -                # First add a comma at the end so that it is easier to remove a mount option at the end:
 -                value=${value/%/,}
 -                # Remove all subvolid= and subvol= mount options (the extglob shell option is enabled in rear):
 -                value=${value//subvolid=*([^,]),/}
 -                value=${value//subvol=*([^,]),/}
 -                # Remove all commas at the end:
 -                mountopts=${value/%,/}
 +                # Remove all subvolid= and subvol= mount options:
 +                mountopts="$( remove_mount_options_values $value subvolid subvol )"
                 ;;
         esac
     done
@@ -147,6 +143,27 @@ mount_fs() {
             echo "mount $mountopts,remount,user_xattr $device $TARGET_FS_ROOT$mountpoint"
             ) >> "$LAYOUT_CODE"
             ;;
@ -66,10 +39,10 @@ index d5707779..f7115f55 100644
             (
             echo "mkdir -p $TARGET_FS_ROOT$mountpoint"
 diff --git a/usr/share/rear/lib/filesystems-functions.sh b/usr/share/rear/lib/filesystems-functions.sh
-index f459c204..f0547706 100644
+index afdd3f24c..658d757f4 100644
 --- a/usr/share/rear/lib/filesystems-functions.sh
 +++ b/usr/share/rear/lib/filesystems-functions.sh
-@@ -256,3 +256,40 @@ function total_target_fs_used_disk_space() {
+@@ -239,3 +239,40 @@ function xfs_parse
   # Output xfs options for further use
   echo "$xfs_opts"
 }
--- a/SOURCES/rear-uefi-usb-secureboot-bz2196445.patch
+++ b/SOURCES/rear-uefi-usb-secureboot-bz2196445.patch
@ -1,5 +1,4 @@
-commit 46b29195bff7f93cf5bd4c2dd83d69e5676800cb
+commit 4af486794d45adbda7567361d8dcc658599dcd2c
 Merge: 2611da2b efb37fb9
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Tue Aug 8 14:44:16 2023 +0200
@ -16,18 +15,14 @@ Date:   Tue Aug 8 14:44:16 2023 +0200
    instead of let ReaR make its own EFI binary via build_bootx86_efi()
    see https://github.com/rear/rear/pull/3031
    Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 diff --git a/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh b/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh
-index 8ad4d97e..123442cc 100644
+index f4659306..fd631c44 100644
 --- a/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh
 +++ b/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh
-@@ -51,8 +51,44 @@ mkdir -p $efi_dst || Error "Failed to create directory '$efi_dst'"
+@@ -29,6 +29,44 @@ mount $EFI_PART $EFI_MPT || Error "Failed to mount EFI partition '$EFI_PART' at
- # "cp: failed to preserve ownership for '/tmp/rear-efi.XXXXXXXXXX/EFI/BOOT/kernel': Operation not permitted"
+ mkdir -p $EFI_DST || Error "Failed to create directory '$EFI_DST'"
- # because it copies to a VFAT filesystem on the EFI partition (see format/USB/default/300_format_usb_disk.sh)
+ 
- # cf. https://github.com/rear/rear/issues/2683
+ # Copy boot loader
 -# Copy boot loader:
 -cp -L $v "$UEFI_BOOTLOADER" "$efi_dst/BOOTX64.efi" || Error "Failed to copy UEFI_BOOTLOADER '$UEFI_BOOTLOADER' to $efi_dst/BOOTX64.efi"
 +# The SECURE_BOOT_BOOTLOADER related code below is based on the code in output/ISO/Linux-i386/250_populate_efibootimg.sh
 +# because I <jsmeix@suse.de> noticed that Secure Boot works with ISO at least for me, cf.
 +# https://github.com/rear/rear/pull/3025#issuecomment-1635876186
@ -51,7 +46,7 @@ index 8ad4d97e..123442cc 100644
 +    # then Shim (usually shim.efi) must be copied as EFI/BOOT/BOOTX64.efi
 +    # and Shim's second stage bootloader must be also copied where Shim already is.
 +    DebugPrint "Using '$SECURE_BOOT_BOOTLOADER' as first stage Secure Boot bootloader BOOTX64.efi"
-+    cp -L $v "$SECURE_BOOT_BOOTLOADER" "$efi_dst/BOOTX64.efi" || Error "Failed to copy SECURE_BOOT_BOOTLOADER '$SECURE_BOOT_BOOTLOADER' to $efi_dst/BOOTX64.efi"
+    cp -L $v "$SECURE_BOOT_BOOTLOADER" "$EFI_DST/BOOTX64.efi" || Error "Failed to copy SECURE_BOOT_BOOTLOADER '$SECURE_BOOT_BOOTLOADER' to $EFI_DST/BOOTX64.efi"
 +    # When Shim is used, its second stage bootloader can be actually anything
 +    # named grub*.efi (second stage bootloader is Shim compile time option), see
 +    # http://www.rodsbooks.com/efi-bootloaders/secureboot.html#initial_shim
@ -62,27 +57,26 @@ index 8ad4d97e..123442cc 100644
 +    # cf. https://github.com/rear/rear/issues/1921
 +    test "$second_stage_UEFI_bootloader_files" || Error "Could not find second stage Secure Boot bootloader $uefi_bootloader_dirname/grub*.efi"
 +    DebugPrint "Using second stage Secure Boot bootloader files: $second_stage_UEFI_bootloader_files"
-+    cp -L $v $second_stage_UEFI_bootloader_files $efi_dst/ || Error "Failed to copy second stage Secure Boot bootloader files"
+    cp -L $v $second_stage_UEFI_bootloader_files $EFI_DST/ || Error "Failed to copy second stage Secure Boot bootloader files"
 +else
-+    cp -L $v "$UEFI_BOOTLOADER" "$efi_dst/BOOTX64.efi" || Error "Failed to copy UEFI_BOOTLOADER '$UEFI_BOOTLOADER' to $efi_dst/BOOTX64.efi"
+    cp -L $v "$UEFI_BOOTLOADER" "$EFI_DST/BOOTX64.efi" || Error "Failed to copy UEFI_BOOTLOADER '$UEFI_BOOTLOADER' to $EFI_DST/BOOTX64.efi"
 +fi
- # Copy kernel:
+ cp $v $UEFI_BOOTLOADER "$EFI_DST/BOOTX64.efi" || Error "Failed to copy UEFI_BOOTLOADER '$UEFI_BOOTLOADER' to $EFI_DST/BOOTX64.efi"
- cp -L $v "$KERNEL_FILE" "$efi_dst/kernel" || Error "Failed to copy KERNEL_FILE '$KERNEL_FILE' to $efi_dst/kernel"
+ 
- # Copy initrd:
+ # Copy kernel
-@@ -101,8 +137,14 @@ EOF
+@@ -93,7 +131,14 @@ EOF
-             [[ -z "$GRUB2_SEARCH_ROOT_COMMAND" ]] && GRUB2_SEARCH_ROOT_COMMAND="search --no-floppy --set=root --label $efi_label"
+                 create_grub2_cfg ${EFI_DIR}/kernel ${EFI_DIR}/$REAR_INITRD_FILENAME > ${EFI_DST}/grub.cfg
-             # Create config for GRUB 2
+ 
-             create_grub2_cfg $efi_dir/kernel $efi_dir/$REAR_INITRD_FILENAME > $efi_dst/grub.cfg
+                 # Create bootloader, this overwrite BOOTX64.efi copied in previous step ...
-            # Create bootloader, this overwrite BOOTX64.efi copied in previous step ...
+-                build_bootx86_efi ${EFI_DST}/BOOTX64.efi ${EFI_DST}/grub.cfg "/boot" "$UEFI_BOOTLOADER"
-            build_bootx86_efi $efi_dst/BOOTX64.efi $efi_dst/grub.cfg "/boot" "$UEFI_BOOTLOADER"
+                # Create BOOTX86.efi but only if we are NOT secure booting.
-+            # Create BOOTX86.efi but only if we are NOT secure booting.
+                # We are not able to create signed boot loader
-+            # We are not able to create signed boot loader
+                # so we need to reuse existing one.
-+            # so we need to reuse existing one.
+                # See issue #1374
-+            # See issue #1374
+                # build_bootx86_efi () can be safely used for other scenarios.
-+            # build_bootx86_efi () can be safely used for other scenarios.
+                if ! test -f "$SECURE_BOOT_BOOTLOADER" ; then
-+            if ! test -f "$SECURE_BOOT_BOOTLOADER" ; then
+                    build_bootx86_efi ${EFI_DST}/BOOTX64.efi ${EFI_DST}/grub.cfg "/boot" "$UEFI_BOOTLOADER"
-+                build_bootx86_efi $efi_dst/BOOTX64.efi $efi_dst/grub.cfg "/boot" "$UEFI_BOOTLOADER"
+                fi
-+            fi
+             ;;
-         ;;
+             *)
-         (*)
+                 BugError "Neither grub 0.97 nor 2.0"
             Error "GRUB version '$grub_version' is neither '0' (legacy GRUB) nor '2' (GRUB 2)"
--- a/SOURCES/rear-usb-uefi-part-size-bz2228402.patch
+++ b/SOURCES/rear-usb-uefi-part-size-bz2228402.patch
@ -0,0 +1,41 @@
 commit 1cd41052f7a7cd42ea14ea53b7280c73624aba3f
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Mon Mar 21 12:14:21 2022 +0100
    Merge pull request #2774 from rear/jsmeix-1024-USB_UEFI_PART_SIZE
    In default.conf increase USB_UEFI_PART_SIZE to 1024 MiB,
    cf. https://github.com/rear/rear/pull/1205
    in particular to also make things work by default when additional
    third-party kernel modules and firmware (e.g. from Nvidia) are used,
    cf. https://github.com/rear/rear/issues/2770#issuecomment-1068935688
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 8faa56aa..17a764cb 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -872,13 +872,20 @@ USB_PARTITION_ALIGN_BLOCK_SIZE="8"
 # in MiB when formatting a medium by the format workflow.
 # If USB_UEFI_PART_SIZE is empty or invalid (i.e. not an unsigned integer larger than 0)
 # the user must interactively enter a valid value while running the format workflow.
 -# The default value of 400 MiB should be sufficiently big and it is in compliance
 -# with the 8 MiB partition alignment default value ( 400 = 8 * 50 )
 -# and even with a 16 MiB partition alignment value ( 400 = 16 * 25 )
 +# The default value of 1024 MiB should be sufficiently big
 # cf. https://github.com/rear/rear/pull/1205
 +# in particular when third-party kernel modules and firmware (e.g. from Nvidia) are used
 +# cf. https://github.com/rear/rear/issues/2770#issuecomment-1068935688
 +# and 1024 MiB is in compliance with the 8 MiB partition alignment value ( 1024 = 8 * 128 )
 +# and also with higher 2^n MiB partition alignment values.
 +# Furthermore the default value of 1024 MiB results that the FAT filesystem of the ESP
 +# will be in compliance with that the ESP should officially use a FAT32 filesystem
 +# because mkfs.vfat automatically makes a FAT32 filesystem starting at 512 MiB
 +# (a FAT16 ESP works in most cases but causes issues with certain UEFI firmware)
 +# cf. https://github.com/rear/rear/issues/2575
 # The value of USB_UEFI_PART_SIZE will be rounded to the nearest
 # USB_PARTITION_ALIGN_BLOCK_SIZE chunk:
 -USB_UEFI_PART_SIZE="400"
 +USB_UEFI_PART_SIZE="1024"
 #
 # Default boot option (i.e. what gets booted automatically after some timeout)
 # when EXTLINUX boots the USB stick or USB disk or other disk device on BIOS systems.
--- a/SOURCES/rear-vg-command-not-found-bz2121476.patch
+++ b/SOURCES/rear-vg-command-not-found-bz2121476.patch
@ -0,0 +1,21 @@
 commit ead05a460d3b219372f47be888ba6011c7fd3318
 Author: Pavel Cahyna <pcahyna@redhat.com>
 Date:   Tue Aug 22 12:32:04 2023 +0200
    Fix downstream only bug
    \$IsInArray -> IsInArray - it is a shell function, not a variable.
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 index d34ab335..a65a9c8e 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
@@ -246,7 +246,7 @@ create_lvmvol() {
     local warnraidline
     if [ $is_thin -eq 0 ] ; then
 -        ifline="if IsInArray $vg \"\${create_logical_volumes[@]}\" && ! \$IsInArray $vg \"\${create_thin_volumes_only[@]}\" ; then"
 +        ifline="if IsInArray $vg \"\${create_logical_volumes[@]}\" && ! IsInArray $vg \"\${create_thin_volumes_only[@]}\" ; then"
     else
         ifline="if IsInArray $vg \"\${create_logical_volumes[@]}\" ; then"
     fi
--- a/SOURCES/s390-no-clobber-disks.patch
+++ b/SOURCES/s390-no-clobber-disks.patch
@ -1,38 +1,14 @@
 commit 015c1ffd9fa96b01882b068714d3bc3aae3b5168
 Merge: 02dad206 20cc0137
 Author: Schlomo Schapiro <schlomo+github@schapiro.org>
 Date:   Tue Feb 28 22:46:13 2023 +0100
    Merge pull request #2943 from pcahyna/s390-layout-format
    s390x (IBM Z) disk formatting fixes
    Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 diff --git a/packaging/rpm/rear.spec b/packaging/rpm/rear.spec
 index eba48198..fb943019 100644
 --- a/packaging/rpm/rear.spec
 +++ b/packaging/rpm/rear.spec
@@ -29,8 +29,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 # Of course the rear bash scripts can be installed on any architecture just as any binaries can be installed on any architecture.
 # But the meaning of architecture dependent packages should be on what architectures they will work.
 # Therefore only those architectures that are actually supported are explicitly listed.
 -# This avoids that rear can be "just installed" on architectures that are actually not supported (e.g. ARM or IBM z Systems):
 -ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
 +# This avoids that rear can be "just installed" on architectures that are actually not supported (e.g. ARM):
 +ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 s390x
 # Furthermore for some architectures it requires architecture dependent packages (like syslinux for x86 and x86_64)
 # so that rear must be architecture dependent because ifarch conditions never match in case of "BuildArch: noarch"
 # see the GitHub issue https://github.com/rear/rear/issues/629
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
-index fe34636f..50baaf82 100644
+index 23a83b71..0d13b487 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
-@@ -486,6 +486,17 @@ test "$MIGRATION_MODE" || MIGRATION_MODE=''
+@@ -416,6 +416,18 @@ test "$RECOVERY_UPDATE_URL" || RECOVERY_UPDATE_URL=""
- # Currently by default no disk is wiped to avoid issues until this feature was more tested:
+ #   export MIGRATION_MODE='true'
- DISKS_TO_BE_WIPED='false'
+ # directly before he calls "rear recover":
- 
+ test "$MIGRATION_MODE" || MIGRATION_MODE=''
-+##
+####
 +
 +####
 +# Formatting DASDs (S/390 specific)
 +# DASD (Direct Access Storage Device) denotes a disk drive on the S/390 architecture.
 +# DASDs need to be formatted before use (even before creating a partition table on them).
@ -41,11 +17,10 @@ index fe34636f..50baaf82 100644
 +# This can be suppressed by setting FORMAT_DASDS="false". It can be useful when one intends
 +# to use already formatted DASDs as recovery target.
 +FORMAT_DASDS=""
-+##
+####
-+
+ 
 ##
 # Resizing partitions in MIGRATION_MODE during "rear recover"
 #
 diff --git a/usr/share/rear/layout/prep-for-mount/Linux-s390/205_s390_enable_disk.sh b/usr/share/rear/layout/prep-for-mount/Linux-s390/205_s390_enable_disk.sh
 new file mode 120000
 index 00000000..5f7a2ac0
@ -55,7 +30,7 @@ index 00000000..5f7a2ac0
 +../../prepare/Linux-s390/205_s390_enable_disk.sh
 \ No newline at end of file
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh
-index 84a7cd33..acc65adf 100644
+index 13c69ce8..2a2bc33f 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/100_include_partition_code.sh
@@ -24,6 +24,7 @@ fi
@ -65,8 +40,8 @@ index 84a7cd33..acc65adf 100644
 +    local blocksize layout dasdtype dasdcyls junk2
     read component disk size label junk < <(grep "^disk $1 " "$LAYOUT_FILE")
-     cat >> "$LAYOUT_CODE" <<EOF
+     ### Disks should be block devices.
-@@ -57,7 +58,8 @@ sync
+@@ -67,7 +68,8 @@ sync
 EOF
@ -76,7 +51,7 @@ index 84a7cd33..acc65adf 100644
     cat >> "$LAYOUT_CODE" <<EOF
 # Make sure device nodes are visible (eg. in RHEL4)
-@@ -83,6 +85,11 @@ create_partitions() {
+@@ -93,6 +95,11 @@ create_partitions() {
     ### List partition types/names to detect disk label type.
     local -a names=()
     local part disk size pstart name junk
@ -88,17 +63,16 @@ index 84a7cd33..acc65adf 100644
     while read part disk size pstart name junk ; do
         names+=( $name )
         case $name in
-@@ -217,12 +224,12 @@ EOF
+@@ -227,10 +234,12 @@ EOF
             if [[ "$end" ]] ; then
                 end=$( mathlib_calculate "$end - 1" )
             fi
 -            if [[ "$ARCH" == "Linux-s390" ]] ; then
-+            if [[ "$ARCH" == "Linux-s390" && "$label" == dasd ]] ; then
+-                # if dasd disk is LDL formated, then do not partition it, because it is partitioned and can take only partition
-                 # LDL formatted disks are already partitioned and should not be partitioned with parted or fdasd , it will fail
+-                if [[ ! "${listDasdLdl[@]}" =~ "$device" ]] ; then
 -                # the listDasdLdl array contains devices such as /dev/dasdb that are formatted as LDL
 -                # listDasdLdl is set in layout/prepare/Linux-s390/205_s390_enable_disk.sh 
 -                if ! IsInArray "$device" "${listDasdLdl[@]}" ; then
 -                    echo "not LDL dasd formated disk, create a partition"
 +            if [[ "$ARCH" == "Linux-s390" && "$label" == dasd ]] ; then
 +                # LDL formatted disks are already partitioned and should not be partitioned with parted or fdasd , it will fail
 +                if [ "$layout" == LDL ]; then
 +                    Debug "$device: LDL formatted DASD, do not create a partition"
 +                else
@ -130,7 +104,7 @@ index 00000000..fc5be463
 +    echo "dasdfmt -b $blocksize -d $layout -y $device"
 +}
 diff --git a/usr/share/rear/layout/prepare/Linux-s390/205_s390_enable_disk.sh b/usr/share/rear/layout/prepare/Linux-s390/205_s390_enable_disk.sh
-index 0ff2fd58..0f6946a9 100644
+index c4037e02..0f6946a9 100644
 --- a/usr/share/rear/layout/prepare/Linux-s390/205_s390_enable_disk.sh
 +++ b/usr/share/rear/layout/prepare/Linux-s390/205_s390_enable_disk.sh
@@ -2,45 +2,36 @@
@ -156,7 +130,7 @@ index 0ff2fd58..0f6946a9 100644
 -            # LDL formatted disks are already partitioned and should not be partitioned with parted or fdasd , it will fail
 -            # this var, listDasdLdl, is used by 100_include_partition_code.sh to exclude writing partition code to diskrestore.sh for LDL disks
 -            listDasdLdl+=( $device )
-            LogPrint "LDL disk '$device' will not be partitioned (LDL disks are already partitioned)"
+-            LogPrint "LDL disk added to listDasdLdl:" ${listDasdLdl[@]}
 -        fi
 -        LogPrint 'dasdfmt:' $device ', blocksize:' $blocksize ', layout:' $layout
 -        # dasd format
@ -551,12 +525,12 @@ index 7a980e63..4191be33 100644
 LUN_WWID_MAP="$VAR_DIR/layout/lun_wwid_mapping"
 diff --git a/usr/share/rear/layout/prepare/default/250_compare_disks.sh b/usr/share/rear/layout/prepare/default/250_compare_disks.sh
-index 260ab178..0931b183 100644
+index c459b928..751433ba 100644
 --- a/usr/share/rear/layout/prepare/default/250_compare_disks.sh
 +++ b/usr/share/rear/layout/prepare/default/250_compare_disks.sh
-@@ -58,7 +58,9 @@ local more_than_one_same_orig_size=''
+@@ -54,7 +54,9 @@ local more_than_one_same_orig_size=''
 # Cf. the "Compare disks one by one" code below:
 while read disk dev size junk ; do
     old_disks_and_sizes+=( "$dev $size" )
     if IsInArray "$size" "${original_system_used_disk_sizes[@]}" ; then
 -        more_than_one_same_orig_size='true'
 +        if ! has_mapping_hint "$dev" ; then
@ -565,7 +539,7 @@ index 260ab178..0931b183 100644
     else
         original_system_used_disk_sizes+=( "$size" )
     fi
-@@ -143,8 +145,8 @@ fi
+@@ -109,14 +111,17 @@ fi
 # No further disk comparisons are needed when MIGRATION_MODE is already set true above:
 if ! is_true "$MIGRATION_MODE" ; then
     # Compare original disks and their possible target disk one by one:
@ -576,28 +550,22 @@ index 260ab178..0931b183 100644
         Log "Comparing $dev"
         if test -e "/sys/block/$dev" ; then
             Log "Device /sys/block/$dev exists"
-@@ -156,6 +158,14 @@ if ! is_true "$MIGRATION_MODE" ; then
+             newsize=$( get_disk_size $dev )
-                 else
+             if test "$newsize" -eq "$size" ; then
-                     LogPrint "Device $dev has expected (same) size $size bytes (will be used for '$WORKFLOW')"
+                 LogPrint "Device $dev has expected (same) size $size bytes (will be used for '$WORKFLOW')"
                 fi
 +            elif test "$( get_mapping_hint $devnode )" == "$devnode" ; then
 +                Debug "Found identical mapping hint ${devnode} -> ${devnode}"
-+                if is_write_protected "/sys/block/$dev"; then
+                LogPrint "Device $dev found according to mapping hints (will be used for '$WORKFLOW')"
 +                    LogPrint "Device $dev is designated as write-protected (needs manual configuration)"
 +                    MIGRATION_MODE='true'
 +                else
 +                    LogPrint "Device $dev found according to mapping hints (will be used for '$WORKFLOW')"
 +                fi
             else
                 LogPrint "Device $dev has size $newsize bytes but $size bytes is expected (needs manual configuration)"
                 MIGRATION_MODE='true'
 diff --git a/usr/share/rear/layout/prepare/default/300_map_disks.sh b/usr/share/rear/layout/prepare/default/300_map_disks.sh
-index 3353daea..d7b45a84 100644
+index 2e90768c..468aa35c 100644
 --- a/usr/share/rear/layout/prepare/default/300_map_disks.sh
 +++ b/usr/share/rear/layout/prepare/default/300_map_disks.sh
-@@ -121,7 +121,14 @@ while read keyword orig_device orig_size junk ; do
+@@ -112,7 +112,14 @@ while read keyword orig_device orig_size junk ; do
-     # considered again during the subsequent "same size" tests:
+     # Continue with next original device when it is already used as source in the mapping file:
-     excluded_target_device_names=()
+     is_mapping_source "$orig_device" && continue
     # First, try to find if there is a current disk with same name and same size as the original:
 -    sysfs_device_name="$( get_sysfs_name "$orig_device" )"
 +    # (possibly influenced by mapping hints if known)
@ -611,44 +579,30 @@ index 3353daea..d7b45a84 100644
     current_device="/sys/block/$sysfs_device_name"
     if test -e $current_device ; then
         current_size=$( get_disk_size $sysfs_device_name )
-@@ -129,23 +136,28 @@ while read keyword orig_device orig_size junk ; do
+@@ -122,11 +129,16 @@ while read keyword orig_device orig_size junk ; do
-         # its matching actual block device (e.g. /dev/sda) must be determined:
+         # Continue with next one if the current one is already used as target in the mapping file:
-         preferred_target_device_name="$( get_device_name $current_device )"
+         is_mapping_target "$preferred_target_device_name" && continue
         # Use the current one if it is of same size as the old one:
 -        if test "$orig_size" -eq "$current_size" ; then
 +        if has_mapping_hint "$orig_device" || test "$orig_size" -eq "$current_size" ; then
-             # Ensure the target device is really a block device on the replacement hardware.
+             # Ensure the determined target device is really a block device:
             # Here the target device has same name as the original device which was a block device on the original hardware
             # but it might perhaps happen that this device name is not a block device on the replacement hardware:
             if test -b "$preferred_target_device_name" ; then
 +                if has_mapping_hint "$orig_device" ; then
 +                    mapping_reason="determined by mapping hint"
 +                else
 +                    mapping_reason="same name and same size $current_size"
 +                fi
-                 # Do not map if the current one is already used as target in the mapping file:
+                 add_mapping "$orig_device" "$preferred_target_device_name"
-                 if is_mapping_target "$preferred_target_device_name" ; then
+-                LogPrint "Using $preferred_target_device_name (same name and same size) for recreating $orig_device"
-                    DebugPrint "Cannot use $preferred_target_device_name (same name and same size) for recreating $orig_device ($preferred_target_device_name already exists as target in $MAPPING_FILE)"
+                LogPrint "Using $preferred_target_device_name ($mapping_reason) for recreating $orig_device"
-+                    DebugPrint "Cannot use $preferred_target_device_name ($mapping_reason) for recreating $orig_device ($preferred_target_device_name already exists as target in $MAPPING_FILE)"
+                 # Continue with next original device in the LAYOUT_FILE:
-                     excluded_target_device_names+=( "$preferred_target_device_name" )
+                 continue
-                 else
+             fi
                     # Ensure the determined target device is not write-protected:
                     if is_write_protected "$preferred_target_device_name" ; then
 -                        DebugPrint "Cannot use $preferred_target_device_name (same name and same size) for recreating $orig_device ($preferred_target_device_name is write-protected)"
 +                        DebugPrint "Cannot use $preferred_target_device_name ($mapping_reason) for recreating $orig_device ($preferred_target_device_name is write-protected)"
                         excluded_target_device_names+=( "$preferred_target_device_name" )
                     else
                         add_mapping "$orig_device" "$preferred_target_device_name"
 -                        LogPrint "Using $preferred_target_device_name (same name and same size $current_size) for recreating $orig_device"
 +                        LogPrint "Using $preferred_target_device_name ($mapping_reason) for recreating $orig_device"
                         # Continue with next original device because the current one is now mapped:
                         continue
                     fi
 diff --git a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
-index 52a4b142..a3e21c48 100644
+index 3ab7357d..da6ce64c 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
-@@ -377,18 +377,27 @@ Log "Saving disks and their partitions"
+@@ -362,18 +362,27 @@ Log "Saving disk partitions."
             if [[ $blockd == dasd* && "$ARCH" == "Linux-s390" ]] ; then
                 devname=$(get_device_name $disk)
@ -687,10 +641,10 @@ index 52a4b142..a3e21c48 100644
             fi
             #FIXME: exclude *rpmb (Replay Protected Memory Block) for nvme*, mmcblk* and uas
-@@ -412,11 +421,38 @@ Log "Saving disks and their partitions"
+@@ -387,11 +396,38 @@ Log "Saving disk partitions."
-                 # which can happen when /dev/sdX is an empty SD card slot without medium,
+                 devname=$(get_device_name $disk)
-                 # see https://github.com/rear/rear/issues/2810
+                 devsize=$(get_disk_size ${disk#/sys/block/})
-                 test $disktype || LogPrintError "No partition label type for 'disk $devname' (may cause 'rear recover' failure)"
+                 disktype=$(parted -s $devname print | grep -E "Partition Table|Disk label" | cut -d ":" -f "2" | tr -d " ")
 -
 -                echo "# Disk $devname"
 -                echo "# Format: disk <devname> <size(bytes)> <partition label type>"
@ -732,10 +686,10 @@ index 52a4b142..a3e21c48 100644
                 echo "# Format: part <device> <partition size(bytes)> <partition start(bytes)> <partition type|name> <flags> /dev/<partition>"
                 extract_partitions "$devname"
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
-index cb33ac28..6dd43313 100644
+index 91c5ff73..4f5b8f6f 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
-@@ -87,6 +87,12 @@ abort_recreate() {
+@@ -93,6 +93,12 @@ abort_recreate() {
     restore_original_file "$LAYOUT_FILE"
 }
@ -748,7 +702,7 @@ index cb33ac28..6dd43313 100644
 # Test and log if a component $1 (type $2) needs to be recreated.
 create_component() {
     local device="$1"
-@@ -734,6 +740,46 @@ get_block_size() {
+@@ -722,6 +728,46 @@ get_block_size() {
     fi
 }
--- a/SPECS/rear.spec
+++ b/SPECS/rear.spec
@ -0,0 +1,493 @@
 %define debug_package %{nil}
 Summary:    Relax-and-Recover is a Linux disaster recovery and system migration tool
 Name:       rear
 Version:    2.6
 Release:    12%{?dist}
 License:    GPLv3
 Group:      Applications/File
 URL:        http://relax-and-recover.org/
 Source0:    https://github.com/rear/rear/archive/%{version}.tar.gz#/rear-%{version}.tar.gz
 Patch4:  rear-bz1492177-warning.patch
 Patch29: rear-bz1832394.patch
 Patch30: rear-sfdc02772301.patch
 Patch31: rear-bz1945869.patch
 Patch32: rear-bz1958247.patch
 Patch33: rear-bz1930662.patch
 Patch34: rear-asciidoc.patch
 Patch35: rear-bz1983013.patch
 Patch36: rear-bz1993296.patch
 Patch37: rear-bz1747468.patch
 Patch38: rear-bz2049091.patch
 Patch39: rear-pr2675.patch
 Patch40: rear-bz2048454.patch
 Patch41: rear-bz2035939.patch
 Patch42: rear-bz2083272.patch
 Patch43: rear-bz2111049.patch
 Patch44: rear-bz2104005.patch
 Patch48: rear-bz2111059.patch
 Patch49: pxe-rsync-output.patch
 Patch50: rear-bz2119501.patch
 Patch51: rear-bz2120736.patch
 Patch52: rear-bz2091163.patch
 Patch53: rear-bz2130945.patch
 Patch54: rear-bz2131946.patch
 Patch56: s390-no-clobber-disks.patch
 Patch58: rear-device-shrinking-bz2223895.patch
 Patch59: rear-usb-uefi-part-size-bz2228402.patch
 Patch60: rear-luks-key-bz2228779.patch
 Patch61: rear-uefi-usb-secureboot-bz2196445.patch
 Patch62: rear-vg-command-not-found-bz2121476.patch
 Patch64: rear-save-lvm-poolmetadatasize-RHEL-6984.patch
 Patch65: rear-skip-useless-xfs-mount-options-RHEL-10478.patch
 # make initrd accessible only by root
 # https://github.com/rear/rear/commit/89b61793d80bc2cb2abe47a7d0549466fb087d16
 Patch111: rear-CVE-2024-23301.patch
 # Support saving and restoring hybrid BIOS/UEFI bootloader setup and clean up bootloader detection
 # https://github.com/rear/rear/pull/3145
 Patch113: rear-restore-hybrid-bootloader-RHEL-16864.patch
 # Skip invalid disk drives (zero sized, no media) when saving layout
 # https://github.com/rear/rear/commit/808b15a677191aac62faadd1bc71885484091316
 Patch115: rear-skip-invalid-drives-RHEL-22863.patch
 ### Dependencies on all distributions
 BuildRequires:   asciidoc
 Requires:   binutils
 Requires:   ethtool
 Requires:   gzip
 Requires:   iputils
 Requires:   parted
 Requires:   tar
 Requires:   openssl
 Requires:   gawk
 Requires:   attr
 Requires:   bc
 Requires:   file
 Requires:   dhcp-client
 ### If you require NFS, you may need the below packages
 #Requires:  nfsclient portmap rpcbind
 ### We drop LSB requirements because it pulls in too many dependencies
 ### The OS is hardcoded in /etc/rear/os.conf instead
 #Requires:  redhat-lsb
 ### Required for Bacula/MySQL support
 #Requires:  bacula-mysql
 ### Required for OBDR
 #Requires:  lsscsi sg3_utils
 ### Optional requirement
 #Requires:  cfg2html
 %ifarch x86_64 i686
 Requires: syslinux
 %endif
 %ifarch x86_64 i686 aarch64
 # We need mkfs.vfat for recreating EFI System Partition
 Recommends: dosfstools
 %endif
 %ifarch ppc ppc64
 Requires:   yaboot
 %endif
 %ifarch ppc ppc64 ppc64le
 # Called by grub2-install (except on PowerNV)
 Requires:   /usr/sbin/ofpathname
 # Needed to make PowerVM LPARs bootable
 Requires:   /usr/sbin/bootlist
 %endif
 %ifarch s390x
 # Contain many utilities for working with DASDs
 Requires:   s390utils-base
 Requires:   s390utils-core
 %endif
 Requires:   crontabs
 Requires:   iproute
 # No ISO image support on s390x (may change when we add support for LPARs)
 %ifnarch s390x
 Requires:   xorriso
 %endif
 # mingetty is not available anymore with RHEL 7 (use agetty instead via systemd)
 # Note that CentOS also has rhel defined so there is no need to use centos
 %if 0%{?rhel} && 0%{?rhel} > 6
 Requires:   util-linux
 %else
 Requires:   mingetty
 Requires:   util-linux
 %endif
 ### The rear-snapshot package is no more
 #Obsoletes: rear-snapshot
 %description
 Relax-and-Recover is the leading Open Source disaster recovery and system
 migration solution. It comprises of a modular
 frame-work and ready-to-go workflows for many common situations to produce
 a bootable image and restore from backup using this image. As a benefit,
 it allows to restore to different hardware and can therefore be used as
 a migration tool as well.
 Currently Relax-and-Recover supports various boot media (incl. ISO, PXE,
 OBDR tape, USB or eSATA storage), a variety of network protocols (incl.
 sftp, ftp, http, nfs, cifs) as well as a multitude of backup strategies
 (incl.  IBM TSM, HP DataProtector, Symantec NetBackup, EMC NetWorker,
 Bacula, Bareos, BORG, Duplicity, rsync).
 Relax-and-Recover was designed to be easy to set up, requires no maintenance
 and is there to assist when disaster strikes. Its setup-and-forget nature
 removes any excuse for not having a disaster recovery solution implemented.
 Professional services and support are available.
 %pre
 if [ $1 -gt 1 ] ; then
 # during upgrade remove obsolete directories
 %{__rm} -rf %{_datadir}/rear/output/NETFS
 fi
 %prep
 %setup 
 %patch4 -p1
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
 %patch44 -p1
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
 %patch56 -p1
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
 %patch64 -p1
 %patch65 -p1
 %patch111 -p1
 %patch113 -p1
 %patch115 -p1
 echo "30 1 * * * root test -f /var/lib/rear/layout/disklayout.conf && /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
 ### Add a specific os.conf so we do not depend on LSB dependencies
 %{?fedora:echo -e "OS_VENDOR=Fedora\nOS_VERSION=%{?fedora}" >etc/rear/os.conf}
 %{?rhel:echo -e "OS_VENDOR=RedHatEnterpriseServer\nOS_VERSION=%{?rhel}" >etc/rear/os.conf}
 %build
 # asciidoc writes a timestamp to files it produces, based on the last
 # modified date of the source file, but is sensible to the timezone.
 # This makes the results differ according to the timezone of the build machine
 # and spurious changes will be seen.
 # Set the timezone to UTC as a workaround.
 # https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc
 TZ=UTC %{__make} -C doc
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
 %{__install} -Dp -m0644 rear.cron %{buildroot}%{_sysconfdir}/cron.d/rear
 %files
 %defattr(-, root, root, 0755)
 %doc MAINTAINERS COPYING README.adoc doc/*.txt doc/user-guide/relax-and-recover-user-guide.html
 %doc %{_mandir}/man8/rear.8*
 %config(noreplace) %{_sysconfdir}/cron.d/rear
 %config(noreplace) %{_sysconfdir}/rear/
 %config(noreplace) %{_sysconfdir}/rear/cert/
 %{_datadir}/rear/
 %{_localstatedir}/lib/rear/
 %{_sbindir}/rear
 %changelog
 * Wed Feb 21 2024 Pavel Cahyna <pcahyna@redhat.com> - 2.6-12
 - Skip invalid disk drives when saving layout PR 3047
 - Support saving and restoring hybrid BIOS/UEFI bootloader, PRs 3145 3136
 - make initrd accessible only by root (CVE-2024-23301), PR 3123
 - Backport PR 3061 to save LVM pool metadata volume size in disk layout
  and restore it
 - Backport PR 3058 to skip useless xfs mount options when mounting
  during recovery, prevents mount errors like "logbuf size must be greater
  than or equal to log stripe size"
 * Tue Aug 22 2023 Pavel Cahyna <pcahyna@redhat.com> - 2.6-10
 - Apply PR 3027 to ensure correct creation of the rescue environment
  when a file is shrinking while being read
 - Backport PR 2774 to increase USB_UEFI_PART_SIZE to 1024 MiB
 - Apply upstream patch for temp dir usage with LUKS to ensure
  that during recovery an encrypted disk can be unlocked using a keyfile
 - Backport upstream PR 3031: Secure Boot support for OUTPUT=USB
 - Correct a mistake done when backporting PR 2691
 * Wed Feb 22 2023 Pavel Cahyna <pcahyna@redhat.com> - 2.6-9
 - Backport PR2943 to fix s390x dasd formatting
 - Require s390utils-{core,base} on s390x
 * Sun Jan 15 2023 Pavel Cahyna <pcahyna@redhat.com> - 2.6-8
 - Apply PR2903 to protect against colons in pvdisplay output
 - Apply PR2873 to fix initrd regeneration on s390x
 - Apply PR2431 to migrate XFS configuration files
 * Wed Aug 24 2022 Pavel Cahyna <pcahyna@redhat.com> - 2.6-7
 - Avoid stderr message about irrelevant broken links
 - Changes for NetBackup (NBU) 9.x support
 * Tue Aug  9 2022 Pavel Cahyna <pcahyna@redhat.com> - 2.6-6
 - Restore usr/share/rear/output/PXE/default/820_copy_to_net.sh
  removed in 2.4-19 with rsync refactor.
  It is still needed to use a rsync OUTPUT_URL when OUTPUT=PXE and BACKUP=RSYNC
 * Mon Aug  8 2022 Pavel Cahyna <pcahyna@redhat.com> - 2.6-5
 - Apply PR2795 to detect changes in system files between backup
  and rescue image
 - Apply PR2808 to exclude dev/watchdog* from recovery system
 - Backport upstream PRs 2827 and 2839 to pass -y to lvcreate instead of one "y"
  on stdin
 - Apply PR2811 to add the PRE/POST_RECOVERY_COMMANDS directives
 - Recommend dosfstools on x86 and aarch64, needed for EFI System Partition
 * Sun Feb 27 2022 Pavel Cahyna <pcahyna@redhat.com> - 2.6-4
 - Apply PR2675 to fix leftover temp dir bug (introduced in backported PR2625)
 - Apply PR2603 to ignore unused PV devices
 - Apply upstream PR2750 to avoid exclusion of wanted multipath devices
 - Remove unneeded xorriso dep on s390x (no ISO image support there)
 - Apply upstream PR2736 to add the EXCLUDE_{IP_ADDRESSES,NETWORK_INTERFACES}
  options
 * Mon Aug 30 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.6-3
 - Add patch for better handling of thin pools and other LV types not supported
  by vgcfgrestore
  Resolves: rhbz1747468
 * Mon Aug 16 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.6-2
 - Fix multipath performance regression in 2.6, introduced by upstream PR #2299.
  Resolves: rhbz1993296
 * Sat Aug  7 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.6-1
 - Rebase to upstream release 2.6 and drop unneded patches.
  Add S/390 support.
  Resolves: rhbz1983003, rhbz1988493, rhbz1868421
 - Add missing dependencies on dhcp-client (see #1926451), file
 - Patch documents to be compatible with asciidoc,
  we don't have asciidoctor
 - On POWER add bootlist & ofpathname to the list of required programs
  conditionally (bootlist only if running under PowerVM, ofpathname
  always except on PowerNV) - upstream PR2665, add them to package
  dependencies
  Resolves: rhbz1983013
 * Tue May 11 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.4-19
 - Backport PR2608:
  Fix setting boot path in case of UEFI partition (ESP) on MD RAID
  Resolves: rhbz1945869
 - Backport PR2625
  Prevents accidental backup removal in case of errors
  Resolves: rhbz1958247
 - Fix rsync error and option handling
  Fixes metadata storage when rsync user is not root
  Resolves: rhbz1930662
 * Mon Jan 11 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4-18
 - Fix typo in default.conf
  Resolves: #1882060
 - Modify the cron command to avoid an e-mail with error message after
  ReaR is installed but not properly configured when the cron command
  is triggered for the first time
  Resolves: #1729499
 - Backport upstream code related to LUKS2 support
  Resolves: #1832394
 - Changes for NetBackup (NBU) support, upstream PR2544
  Resolves: #1898080
 * Mon Aug 10 2020 Pavel Cahyna <pcahyna@redhat.com> - 2.4-17
 - Update the Rubrik patch to include complete PR2445
  Resolves: rhbz1867696
 * Thu Jun 04 2020 Václav Doležal <vdolezal@redhat.com> - 2.4-16
 - Apply upstream PR2373: Skip Longhorn Engine replica devices
  Resolves: rhbz1843809
 * Mon Jun 01 2020 Václav Doležal <vdolezal@redhat.com> - 2.4-15
 - Apply upstream PR2346: Have '-iso-level 3' option also for ppc64le
  Resolves: rhbz1729502
 * Mon Jun 01 2020 Václav Doležal <vdolezal@redhat.com> - 2.4-14
 - Backport remaining Rubrik related patches.
  Related: rhbz1743303
 * Thu May 21 2020 Václav Doležal <vdolezal@redhat.com> - 2.4-13
 - Backport upstream PR #2249 to add support for Rubrik backup method.
  Resolves: rhbz1743303
 * Mon Dec 16 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-12
 - Backport upstream PR #2293 to use grub-mkstandalone instead of
  grub-mkimage for UEFI (ISO image and GRUB_RESCUE image generation).
  Avoids hardcoded module lists or paths and so is more robust.
  Fixes an issue where the generated ISO image had no GRUB2 modules and
  was therefore unbootable. The backport does not add new config settings.
  Resolves: rhbz1737042
 * Mon Nov 18 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-11
 - Apply upstream PR2122: add additional NBU library path to fix support for
  NetBackup 8.
  Resolves: rhbz1747393
 - Apply upstream PR2021: Be safe against empty docker_root_dir (issue 1989)
  Resolves: rhbz1729493, where ReaR can not create a backup in rescue mode,
  because it thinks that the Docker daemon is running and hits the problem
  with empty docker_root_dir.
 - Apply upstream PR2223 and commit 36cf20e to avoid an empty string in the
  list of users to clone, which can lead to bash overflow with lots of users
  and groups per user and to wrong passwd/group files in the rescue system.
  Resolves: rhbz1729495
 - Backport of Upstream fix for issue 2035: /run is not mounted in the rescue
  chroot, which causes LVM to hang, especially if rebuilding initramfs.
  Resolves: rhbz1757488
 - Backport upstream PR 2218: avoid keeping build dir on errors
  by default when used noninteractively
  Resolves: rhbz1729501
 - Apply upstream PR2173 - Cannot restore using Bacula method
  due to "bconsole" not showing its prompt
  Resolves: rhbz1726992
 - Backport fix for upstream issue 2187 (disklayout.conf file contains
  duplicate lines, breaking recovery in migration mode or when
  thin pools are used). PR2194, 2196.
  Resolves: rhbz1732308
 * Tue Jun  4 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-10
 - Apply upstream patch PR1993
  Automatically exclude $BUILD_DIR from the backup
  Resolves: rhbz1677733
 * Mon Jun  3 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-9
 - Update fix for bz#1657725. Previous fix was not correct, bootlist was still
  invoked only with one partition argument due to incorrect array expansion.
  See upstream PR2096, 2097, 2098.
 * Tue May 28 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-8
 - Apply upstream PR2065 (record permanent MAC address for team members)
  Resolves: rhbz1685178
 * Tue May 28 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-7
 - Apply upstream PR2034 (multipath optimizations for lots of devices)
 * Mon Jan 14 2019 Pavel Cahyna <pcahyna@redhat.com> - 2.4-6
 - Require xorriso instead of genisoimage, it is now the preferred method
  and supports files over 4GB in size.
 - Apply upstream PR2004 (support for custom network interface naming)
 - Backport upstream PR2001 (UEFI support broken on Fedora 29 and RHEL 8)
 * Thu Dec 13 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.4-4
 - Backport fixes for upstream bugs 1974 and 1975
 - Backport fix for upstream bug 1913 (backup succeeds in case of tar error)
 - Backport fix for upstream bug 1926 (support for LACP bonding and teaming)
 - Apply upstream PR1954 (record permanent MAC address for bond members)
 * Thu Aug 09 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.4-3
 - Merge some spec changes from Fedora.
 - Apply upstream patch PR1887
  LPAR/PPC64 bootlist is incorrectly set when having multiple 'prep' partitions
 - Apply upstream patch PR1885
  Partition information recorded is unexpected when disk has 4K block size
 * Wed Jul 18 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.4-2
 - Build and install the HTML user guide. #1418459
 * Wed Jun 27 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.4-1
 - Rebase to version 2.4, drop patches integrated upstream
  Resolves #1534646 #1484051 #1498828 #1571266 #1496518
 * Wed Feb 14 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.00-6
 - Ensure that NetBackup is started automatically upon recovery (PR#1544)
  Also do not kill daemons spawned by sysinit.service at the service's end
  (PR#1610, applies to NetBackup and also to dhclient)
  Resolves #1506231
 - Print a warning if grub2-mkimage is about to fail and suggest what to do.
  bz#1492177
 - Update the patch for #1388653 to the one actually merged upstream (PR1418)
 * Fri Jan 12 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.00-5
 - cd to the correct directory before md5sum to fix BACKUP_INTEGRITY_CHECK.
  Upstream PR#1685, bz1532676
 * Mon Oct 23 2017 Pavel Cahyna <pcahyna@redhat.com> - 2.00-4
 - Retry get_disk_size to fix upstream #1370, bz1388653
 * Wed Sep 13 2017 Pavel Cahyna <pcahyna@redhat.com> - 2.00-3
 - Fix rear mkrescue on systems w/o UEFI. Upstream PR#1481 issue#1478
 - Resolves: #1479002
 * Wed May 17 2017 Jakub Mazanek <jmazanek@redhat.com> - 2.00-2
 - Excluding Archs s390 and s390x
 - Related #1355667
 * Mon Feb 20 2017 Jakub Mazanek <jmazanek@redhat.com> - 2.00-1
 - Rebase to version 2.00 
 - Resolves #1355667
 * Tue Jul 19 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-6
 - Replace experimental grep -P with grep -E
 Resolves: #1290205
 * Wed Mar 23 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-5
 - Remove backuped patched files
 Related: #1283930
 * Wed Mar 23 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-4
 - Rear recovery over teaming interface will not work
 Resolves: #1283930
 * Tue Mar 08 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-3
 - Replace experimental grep -P with grep -E
 Resolves: #1290205
 * Tue Feb 23 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-2
 - rear does not require syslinux
 - changing to arch package so that syslinux is installed
 - Resolves: #1283927
 * Mon Sep 14 2015 Petr Hracek <phracek@redhat.com> - 1.17.2-1
 - New upstream release 1.17.2
 Related: #1059196
 * Wed May 13 2015 Petr Hracek <phracek@redhat.com> 1.17.0-2
 - Fix Source tag
 Related: #1059196
 * Mon May 04 2015 Petr Hracek <phracek@redhat.com> 1.17.0-1
 - Initial package for RHEL 7
 Resolves: #1059196
 * Fri Oct 17 2014 Gratien D'haese <gratien.dhaese@gmail.com>
 - added the suse_version lines to identify the corresponding OS_VERSION
 * Fri Jun 20 2014 Gratien D'haese <gratien.dhaese@gmail.com>
 - add %%pre section
 * Thu Apr 11 2013 Gratien D'haese <gratien.dhaese@gmail.com>
 - changes Source
 * Thu Jun 03 2010 Dag Wieers <dag@wieers.com>
 - Initial package. (using DAR)
--- a/gating.yaml
+++ b/gating.yaml
@ -1,7 +0,0 @@
 --- !Policy
 product_versions:
  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
--- a/plans/tier1.fmf
+++ b/plans/tier1.fmf
@ -1,15 +0,0 @@
 ---
 summary: Tier1 plan for ReaR
 discover:
  how: fmf
  url: https://pkgs.devel.redhat.com/git/tests/rear
  ref: master
  filter: tier:1
 execute:
  how: tmt
 adjust:
    enabled: false
    when: distro == centos-stream or distro == fedora
--- a/rear-bz2104005.patch
+++ b/rear-bz2104005.patch
@ -1,60 +0,0 @@
 commit bca0e7a92af16cb7fb82ef04401cdb3286068081
 Merge: d2d2300b f36bfe9b
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Thu Jul 28 12:11:04 2022 +0200
    Merge pull request #2839 from pcahyna/lvm-y
    Pass -y to lvcreate instead of piping the output of yes
 diff --git a/usr/share/rear/conf/GNU/Linux.conf b/usr/share/rear/conf/GNU/Linux.conf
 index 82007719..7e47b912 100644
 --- a/usr/share/rear/conf/GNU/Linux.conf
 +++ b/usr/share/rear/conf/GNU/Linux.conf
@@ -5,7 +5,7 @@ ip
 less
 parted
 readlink
 -# For noninteractive confirmation in lvm commands during layout recreation
 +# For noninteractive confirmation in commands
 yes
 )
 diff --git a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 index 0bd863ac..6089cc09 100644
 --- a/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
 +++ b/usr/share/rear/layout/prepare/GNU/Linux/110_include_lvm_code.sh
@@ -287,28 +287,16 @@ create_lvmvol() {
     # so e.g. 'lvcreate -L 123456b -n LV VG' becomes 'lvcreate -l 100%FREE -n LV VG'
     fallbacklvopts="$( sed -e 's/-L [0-9b]*/-l 100%FREE/' <<< "$lvopts" )"
 -    # In SLES11 "man lvcreate" does not show '-y' or '--yes'
 -    # so we cannot use "lvm lvcreate -y ..."
 -    # see https://github.com/rear/rear/issues/2820#issuecomment-1161934013
 -    # instead we input as many 'y' as asked for by "lvm lvcreate"
 -    # see https://github.com/rear/rear/issues/513
 -    # and https://github.com/rear/rear/issues/2820
 -    # plus be safe against possible 'set -o pipefail' non-zero exit code of 'yes' via '( yes || true ) | ...'
 -    # see https://github.com/rear/rear/issues/2820#issuecomment-1162804476
 -    # because 'yes' may get terminated by SIGPIPE when plain 'yes | ...' is used
 -    # see https://github.com/rear/rear/issues/2820#issuecomment-1162772415
 -    # and suppress needless "yes: standard output: Broken pipe" stderr messages
 -    # that appear at least with newer 'yes' in coreutils-8.32 in openSUSE Leap 15.3
     cat >> "$LAYOUT_CODE" <<EOF
 $ifline
     LogPrint "Creating LVM volume '$vg/$lvname' (some properties may not be preserved)"
     $warnraidline
 -    if ! ( yes 2>/dev/null || true ) | lvm lvcreate $lvopts $vg ; then
 -        LogPrintError "Failed to create LVM volume '$vg/$lvname' with lvcreate $lvopts $vg"
 -        if ( yes 2>/dev/null || true ) | lvm lvcreate $fallbacklvopts $vg ; then
 -            LogPrintError "Created LVM volume '$vg/$lvname' using fallback options lvcreate $fallbacklvopts $vg"
 +    if ! lvm lvcreate -y $lvopts $vg ; then
 +        LogPrintError "Failed to create LVM volume '$vg/$lvname' with lvcreate -y $lvopts $vg"
 +        if lvm lvcreate -y $fallbacklvopts $vg ; then
 +            LogPrintError "Created LVM volume '$vg/$lvname' using fallback options lvcreate -y $fallbacklvopts $vg"
         else
 -            LogPrintError "Also failed to create LVM volume '$vg/$lvname' with lvcreate $fallbacklvopts $vg"
 +            LogPrintError "Also failed to create LVM volume '$vg/$lvname' with lvcreate -y $fallbacklvopts $vg"
             # Explicit 'false' is needed to let the whole 'if then else fi' command exit with non zero exit state
             # to let diskrestore.sh abort here as usual when a command fails (diskrestore.sh runs with 'set -e'):
             false
--- a/rear-bz2117937.patch
+++ b/rear-bz2117937.patch
@ -1,18 +0,0 @@
 diff --git a/usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh b/usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh
 index 4b73fb05..c7704032 100644
 --- a/usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh
 +++ b/usr/share/rear/prep/GNU/Linux/220_include_lvm_tools.sh
@@ -8,6 +8,13 @@ PROGS+=( lvm dmsetup dmeventd fsadm )
 COPY_AS_IS+=( /etc/lvm )
 +# Workaround for a LVM segfault when creating a PV with an UUID already present
 +# in the device file: omit the device file from the rescue system
 +# https://bugzilla.redhat.com/show_bug.cgi?id=2117937
 +# proper fix:
 +# https://sourceware.org/git/?p=lvm2.git;a=commit;h=8c3cfc75c72696ae8b620555fcc4f815b0c1d6b6
 +COPY_AS_IS_EXCLUDE+=( /etc/lvm/devices )
 +
 if lvs --noheadings -o thin_count | grep -q -v "^\s*$" ; then
     # There are Thin Pools on the system, include required binaries
     PROGS+=( thin_check )
--- a/rear-bz2130945.patch
+++ b/rear-bz2130945.patch
@ -1,41 +0,0 @@
 From 6d1e5ab96213a0d79489c4296cd1f5a4be645597 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
 Date: Thu, 29 Sep 2022 15:32:22 +0200
 Subject: [PATCH] Fix initrd regeneration on s390x and Fedora/RHEL
 For some reason, the 550_rebuild_initramfs.sh script was not included
 for s390x on Fedora/RHEL so the initrd was not regenerated after backup
 restore on this architecture.
 Since all other architectures were actually using the same script,
 let's just move it one level up to fix this bug and to also simplify
 the directory structure a bit.
 ---
 .../rear/finalize/Fedora/{i386 => }/550_rebuild_initramfs.sh     | 0
 usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh    | 1 -
 usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh  | 1 -
 3 files changed, 2 deletions(-)
 rename usr/share/rear/finalize/Fedora/{i386 => }/550_rebuild_initramfs.sh (100%)
 delete mode 120000 usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh
 delete mode 120000 usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh
 diff --git a/usr/share/rear/finalize/Fedora/i386/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/550_rebuild_initramfs.sh
 similarity index 100%
 rename from usr/share/rear/finalize/Fedora/i386/550_rebuild_initramfs.sh
 rename to usr/share/rear/finalize/Fedora/550_rebuild_initramfs.sh
 diff --git a/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh
 deleted file mode 120000
 index 22eede59d..000000000
 --- a/usr/share/rear/finalize/Fedora/ppc64/550_rebuild_initramfs.sh
 +++ /dev/null
@@ -1 +0,0 @@
 -../i386/550_rebuild_initramfs.sh
 \ No newline at end of file
 diff --git a/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh b/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh
 deleted file mode 120000
 index 22eede59d..000000000
 --- a/usr/share/rear/finalize/Fedora/ppc64le/550_rebuild_initramfs.sh
 +++ /dev/null
@@ -1 +0,0 @@
 -../i386/550_rebuild_initramfs.sh
 \ No newline at end of file
--- a/rear-bz2188593-nbu-systemd.patch
+++ b/rear-bz2188593-nbu-systemd.patch
@ -1,440 +0,0 @@
 diff --git a/usr/share/rear/rescue/NBU/default/460_prepare_netbackup_systemd.sh b/usr/share/rear/rescue/NBU/default/460_prepare_netbackup_systemd.sh
 new file mode 100644
 index 00000000..f7423e0a
 --- /dev/null
 +++ b/usr/share/rear/rescue/NBU/default/460_prepare_netbackup_systemd.sh
@@ -0,0 +1,41 @@
 +# 460_prepare_netbackup_systemd.sh
 +# prepare systemd units for NBU (only if NBU version >=7.x)
 +
 +# set in 450_prepare_netbackup.sh
 +[[ $NBU_version -lt 7 ]] && return	# NBU is using xinetd when version <7.x
 +
 +# Skip if systemd is not used.
 +has_binary systemctl || return 0
 +
 +# Local functions that are 'unset' at the end of this script:
 +
 +function get_unit_path () {
 +    systemctl show -P FragmentPath $1
 +}
 +
 +function get_unit_dropin_paths () {
 +    systemctl show -P DropInPaths $1
 +}
 +
 +local unit_file_path
 +local i
 +local unit
 +
 +for unit in vxpbx_exchanged.service netbackup.service ; do
 +    unit_file_path="$( get_unit_path $unit )"
 +    if [ -n "$unit_file_path" ]; then
 +        cp $v "$unit_file_path" $ROOTFS_DIR/etc/systemd/system
 +        ln -s ../$unit $ROOTFS_DIR/etc/systemd/system/default.target.wants || Error "Failed to enable Netbackup service $unit in the rescue system"
 +        Log "Enabled Netbackup service $unit in the rescue system"
 +        for i in $( get_unit_dropin_paths $unit ) ; do
 +            mkdir -p $ROOTFS_DIR/etc/systemd/system/$unit.d
 +            cp $v $i $ROOTFS_DIR/etc/systemd/system/$unit.d
 +        done
 +    fi
 +done
 +
 +# Local functions must be 'unset' because bash does not support 'local function ...'
 +# cf. https://unix.stackexchange.com/questions/104755/how-can-i-create-a-local-function-in-my-bashrc
 +unset -f get_unit_path
 +unset -f get_unit_dropin_paths
 +unset -f unit_is_enabled
 diff --git a/usr/share/rear/skel/default/etc/scripts/run-automatic-rear b/usr/share/rear/skel/default/etc/scripts/run-automatic-rear
 new file mode 100755
 index 00000000..6edc657a
 --- /dev/null
 +++ b/usr/share/rear/skel/default/etc/scripts/run-automatic-rear
@@ -0,0 +1,82 @@
 +#!/bin/bash
 +
 +source /etc/scripts/system-setup-functions.sh
 +
 +# In debug mode run the automated 'rear recover' also with debug options.
 +# Because the kernel command line option 'debug' means 'set -x' for the system setup scripts
 +# it also means '-D' (i.e. 'set -x') for the automated 'rear recover' run:
 +if rear_debug ; then
 +    rear_debug_options='-D'
 +else
 +    rear_debug_options=''
 +fi
 +
 +# Launch rear recover automatically:
 +if automatic_recovery ; then
 +    choices=( "View Relax-and-Recover log file(s)"
 +              "Go to Relax-and-Recover shell"
 +            )
 +    echo -e "\nLaunching 'rear recover' automatically\n"
 +    if rear $rear_debug_options recover ; then
 +        echo -e "\n'rear recover' finished successfully\n"
 +        choices+=( "Reboot" )
 +    else
 +        echo -e "\n'rear recover' failed, check the Relax-and-Recover log file(s)\n"
 +    fi
 +    PS3="Select what to do "
 +    select choice in "${choices[@]}" ; do
 +        case "$REPLY" in
 +            (1)
 +                # Do not assume the ReaR log file is named rear-$HOSTNAME.log
 +                # the user can have specified any name as LOGFILE:
 +                less /var/log/rear/*
 +                ;;
 +            (2)
 +                echo "" > /etc/issue
 +                echo "" > /etc/motd
 +                break
 +                ;;
 +            (3)
 +                reboot
 +                ;;
 +        esac
 +        for (( i=1 ; i <= ${#choices[@]} ; i++ )) ; do
 +            echo "$i) ${choices[$i-1]}"
 +        done
 +    done 2>&1
 +fi
 +
 +# Launch rear recover automatically in unattended mode
 +# i.e. with automated reboot after successful 'rear recover':
 +if unattended_recovery ; then
 +    choices=( "View Relax-and-Recover log file(s)"
 +              "Go to Relax-and-Recover shell"
 +            )
 +    echo -e "\nLaunching 'rear recover' automatically in unattended mode\n"
 +    if rear $rear_debug_options recover ; then
 +        echo -e "\n'rear recover' finished successfully\n"
 +        echo -e "\nRebooting in 30 seconds (Ctrl-C to interrupt)\n"
 +        sleep 30
 +        reboot
 +    else
 +        echo -e "\n'rear recover' failed, check the Relax-and-Recover log file(s)\n"
 +        PS3="Select what to do "
 +        select choice in "${choices[@]}" ; do
 +            case "$REPLY" in
 +                (1)
 +                    # Do not assume the ReaR log file is named rear-$HOSTNAME.log
 +                    # the user can have specified any name as LOGFILE:
 +                    less /var/log/rear/*
 +                    ;;
 +                (2)
 +                    echo "" > /etc/issue
 +                    echo "" > /etc/motd
 +                    break
 +                    ;;
 +            esac
 +            for (( i=1 ; i <= ${#choices[@]} ; i++ )) ; do
 +                echo "$i) ${choices[$i-1]}"
 +            done
 +        done 2>&1
 +    fi
 +fi
 diff --git a/usr/share/rear/skel/default/etc/scripts/system-setup b/usr/share/rear/skel/default/etc/scripts/system-setup
 index 1dc7f1e8..17487ac7 100755
 --- a/usr/share/rear/skel/default/etc/scripts/system-setup
 +++ b/usr/share/rear/skel/default/etc/scripts/system-setup
@@ -9,36 +9,7 @@
 # (e.g. "ls foo*bar" becomes plain "ls" without "foo*bar: No such file or directory" error).
 shopt -s nullglob
 -# Use an artificial array to get the kernel command line parameters as array elements
 -kernel_command_line=( $( cat /proc/cmdline ) )
 -
 -function rear_debug() {
 -    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 -        test "debug" = "$kernel_command_line_parameter" && return 0
 -    done
 -    return 1
 -}
 -
 -function unattended_recovery() {
 -    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 -        test "unattended" = "$kernel_command_line_parameter" && return 0
 -    done
 -    return 1
 -}
 -
 -function automatic_recovery() {
 -    # The unattended recovery mode implies automatic recovery (see the implementations below)
 -    # so that in unattended mode the automatic recovery code below must not be run
 -    # otherwise first the automatic recovery code and then the unattended recovery code
 -    # get run automatically one after the other where the unattended recovery fails
 -    # because for two subsequent 'rear recover' the second one fails:
 -    unattended_recovery && return 1
 -    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 -        test "auto_recover" = "$kernel_command_line_parameter" && return 0
 -        test "automatic" = "$kernel_command_line_parameter" && return 0
 -    done
 -    return 1
 -}
 +source /etc/scripts/system-setup-functions.sh
 # The 'sleep 1' is used as workaround to avoid whatever inexplicable actual reason
 # that at least on SLES12 some initial output lines of this script would get lost
@@ -135,84 +106,3 @@ echo -e "\nRelax-and-Recover rescue system is ready\n"
 # Wait two seconds so that the user can read the 'Relax-and-Recover rescue system is ready' message
 # on his screen before the screen gets cleared and replaced by the login screen:
 sleep 2
 -
 -# In debug mode run the automated 'rear recover' also with debug options.
 -# Because the kernel command line option 'debug' means 'set -x' for the system setup scripts
 -# it also means '-D' (i.e. 'set -x') for the automated 'rear recover' run:
 -if rear_debug ; then
 -    rear_debug_options='-D'
 -else
 -    rear_debug_options=''
 -fi
 -
 -# Launch rear recover automatically:
 -if automatic_recovery ; then
 -    choices=( "View Relax-and-Recover log file(s)"
 -              "Go to Relax-and-Recover shell"
 -            )
 -    echo -e "\nLaunching 'rear recover' automatically\n"
 -    # The recover workflow is always verbose (see usr/sbin/rear):
 -    if rear $rear_debug_options recover ; then
 -        echo -e "\n'rear recover' finished successfully\n"
 -        choices+=( "Reboot" )
 -    else
 -        echo -e "\n'rear recover' failed, check the Relax-and-Recover log file(s)\n"
 -    fi
 -    PS3="Select what to do "
 -    select choice in "${choices[@]}" ; do
 -        case "$REPLY" in
 -            (1)
 -                # Do not assume the ReaR log file is named rear-$HOSTNAME.log
 -                # the user can have specified any name as LOGFILE:
 -                less /var/log/rear/*
 -                ;;
 -            (2)
 -                echo "" > /etc/issue
 -                echo "" > /etc/motd
 -                break
 -                ;;
 -            (3)
 -                reboot
 -                ;;
 -        esac
 -        for (( i=1 ; i <= ${#choices[@]} ; i++ )) ; do
 -            echo "$i) ${choices[$i-1]}"
 -        done
 -    done 2>&1
 -fi
 -
 -# Launch rear recover automatically in unattended mode
 -# i.e. with automated reboot after successful 'rear recover':
 -if unattended_recovery ; then
 -    choices=( "View Relax-and-Recover log file(s)"
 -              "Go to Relax-and-Recover shell"
 -            )
 -    echo -e "\nLaunching 'rear recover' automatically in unattended mode\n"
 -    # The recover workflow is always verbose (see usr/sbin/rear):
 -    if rear $rear_debug_options recover ; then
 -        echo -e "\n'rear recover' finished successfully\n"
 -        echo -e "\nRebooting in 30 seconds (Ctrl-C to interrupt)\n"
 -        sleep 30
 -        reboot
 -    else
 -        echo -e "\n'rear recover' failed, check the Relax-and-Recover log file(s)\n"
 -        PS3="Select what to do "
 -        select choice in "${choices[@]}" ; do
 -            case "$REPLY" in
 -                (1)
 -                    # Do not assume the ReaR log file is named rear-$HOSTNAME.log
 -                    # the user can have specified any name as LOGFILE:
 -                    less /var/log/rear/*
 -                    ;;
 -                (2)
 -                    echo "" > /etc/issue
 -                    echo "" > /etc/motd
 -                    break
 -                    ;;
 -            esac
 -            for (( i=1 ; i <= ${#choices[@]} ; i++ )) ; do
 -                echo "$i) ${choices[$i-1]}"
 -            done
 -        done 2>&1
 -    fi
 -fi
 diff --git a/usr/share/rear/skel/default/etc/scripts/system-setup-functions.sh b/usr/share/rear/skel/default/etc/scripts/system-setup-functions.sh
 new file mode 100644
 index 00000000..c320cf88
 --- /dev/null
 +++ b/usr/share/rear/skel/default/etc/scripts/system-setup-functions.sh
@@ -0,0 +1,30 @@
 +# Use an artificial array to get the kernel command line parameters as array elements
 +kernel_command_line=( $( cat /proc/cmdline ) )
 +
 +function rear_debug() {
 +    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 +        test "debug" = "$kernel_command_line_parameter" && return 0
 +    done
 +    return 1
 +}
 +
 +function unattended_recovery() {
 +    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 +        test "unattended" = "$kernel_command_line_parameter" && return 0
 +    done
 +    return 1
 +}
 +
 +function automatic_recovery() {
 +    # The unattended recovery mode implies automatic recovery (see the implementations below)
 +    # so that in unattended mode the automatic recovery code below must not be run
 +    # otherwise first the automatic recovery code and then the unattended recovery code
 +    # get run automatically one after the other where the unattended recovery fails
 +    # because for two subsequent 'rear recover' the second one fails:
 +    unattended_recovery && return 1
 +    for kernel_command_line_parameter in "${kernel_command_line[@]}" ; do
 +        test "auto_recover" = "$kernel_command_line_parameter" && return 0
 +        test "automatic" = "$kernel_command_line_parameter" && return 0
 +    done
 +    return 1
 +}
 diff --git a/usr/share/rear/skel/default/etc/systemd/system/default.target.wants/.gitignore b/usr/share/rear/skel/default/etc/systemd/system/default.target.wants/.gitignore
 new file mode 100644
 index 00000000..d6b7ef32
 --- /dev/null
 +++ b/usr/share/rear/skel/default/etc/systemd/system/default.target.wants/.gitignore
@@ -0,0 +1,2 @@
 +*
 +!.gitignore
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/automatic-rear.service b/usr/share/rear/skel/default/usr/lib/systemd/system/automatic-rear.service
 new file mode 100644
 index 00000000..ee3187a8
 --- /dev/null
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/automatic-rear.service
@@ -0,0 +1,13 @@
 +[Unit]
 +Description=Run Relax-and-Recover recovery automatically if requested
 +Wants=network-online.target
 +After=network-online.target
 +
 +[Service]
 +Type=oneshot
 +ExecStart=/etc/scripts/run-automatic-rear
 +StandardInput=tty
 +RemainAfterExit=yes
 +
 +[Install]
 +WantedBy=multi-user.target
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/getty@.service b/usr/share/rear/skel/default/usr/lib/systemd/system/getty@.service
 index bf858ca8..abafd8b5 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/getty@.service
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/getty@.service
@@ -6,6 +6,8 @@ Description=Getty on %I
 Documentation=man:agetty(8)
 After=systemd-user-sessions.service plymouth-quit-wait.service
 After=sysinit.service
 +# Automatic ReaR uses the system console
 +After=automatic-rear.service
 # If additional gettys are spawned during boot then we should make
 # sure that this is synchronized before getty.target, even though
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target b/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target
 index c5ea1cca..a88e219f 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target
@@ -4,7 +4,7 @@
 [Unit]
 Description=Multi-User
 -Requires=sysinit.target
 +Requires=sysinit.target basic.target
 AllowIsolate=yes
 [Install]
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target.wants/automatic-rear.service b/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target.wants/automatic-rear.service
 new file mode 120000
 index 00000000..3e8a4161
 --- /dev/null
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/multi-user.target.wants/automatic-rear.service
@@ -0,0 +1 @@
 +../automatic-rear.service
 \ No newline at end of file
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target b/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target
 new file mode 100644
 index 00000000..c3edfeb4
 --- /dev/null
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target
@@ -0,0 +1,14 @@
 +#  SPDX-License-Identifier: LGPL-2.1-or-later
 +#
 +#  This file is part of systemd.
 +#
 +#  systemd is free software; you can redistribute it and/or modify it
 +#  under the terms of the GNU Lesser General Public License as published by
 +#  the Free Software Foundation; either version 2.1 of the License, or
 +#  (at your option) any later version.
 +
 +[Unit]
 +Description=Network is Online
 +Documentation=man:systemd.special(7)
 +Documentation=https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
 +After=network.target
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target.wants/sysinit.service b/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target.wants/sysinit.service
 new file mode 120000
 index 00000000..ed660a10
 --- /dev/null
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/network-online.target.wants/sysinit.service
@@ -0,0 +1 @@
 +../sysinit.service
 \ No newline at end of file
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/rsyslog.service b/usr/share/rear/skel/default/usr/lib/systemd/system/rsyslog.service
 index ac171e0f..18fa17b5 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/rsyslog.service
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/rsyslog.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Relax-and-Recover run-syslog script
 -DefaultDependencies=no
 [Service]
 Type=simple
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service b/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service
 index ee22fafc..b34b2fe8 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.service
@@ -1,9 +1,14 @@
 [Unit]
 Description=Initialize Rescue System
 -After=systemd-udevd.service
 +DefaultDependencies=no
 +After=systemd-udevd.service rear-boot-helper.service
 +Before=network-online.target
 [Service]
 Type=oneshot
 ExecStart=/etc/scripts/system-setup
 StandardInput=tty
 RemainAfterExit=yes
 +
 +[Install]
 +WantedBy=network-online.target
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.target b/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.target
 index 4187ef67..2a16369b 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.target
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/sysinit.target
@@ -4,3 +4,5 @@
 [Unit]
 Description=System Initialization
 +Wants=sysinit.service rear-boot-helper.service
 +After=sysinit.service rear-boot-helper.service
 diff --git a/usr/share/rear/skel/default/usr/lib/systemd/system/syslog.socket b/usr/share/rear/skel/default/usr/lib/systemd/system/syslog.socket
 index 9a0064c0..3fb02344 100644
 --- a/usr/share/rear/skel/default/usr/lib/systemd/system/syslog.socket
 +++ b/usr/share/rear/skel/default/usr/lib/systemd/system/syslog.socket
@@ -4,7 +4,6 @@
 [Unit]
 Description=Syslog Socket
 -DefaultDependencies=no
 Before=sockets.target syslog.target
 [Socket]
--- a/rear-copy-console-kernel-cmdline-from-host.patch
+++ b/rear-copy-console-kernel-cmdline-from-host.patch
@ -1,472 +0,0 @@
 commit 42e04f36f5f8eea0017915bb35e56ee285b394d7
 Merge: 7c6296db 940fede7
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Tue Jan 31 13:13:56 2023 +0100
    Merge pull request #2915 from rear/jsmeix-serial-devs-fail-safe
    In lib/serial-functions.sh make the
    get_serial_console_devices() function
    fail-safe if no serial device node exists, see
    https://github.com/rear/rear/issues/2914
 diff --git a/usr/share/rear/lib/serial-functions.sh b/usr/share/rear/lib/serial-functions.sh
 index aac5dc88..3d421b52 100644
 --- a/usr/share/rear/lib/serial-functions.sh
 +++ b/usr/share/rear/lib/serial-functions.sh
@@ -1,13 +1,24 @@
 # Get available serial devices:
 function get_serial_console_devices () {
 -    test "$SERIAL_CONSOLE_DEVICES" && echo $SERIAL_CONSOLE_DEVICES || ls /dev/ttyS[0-9]* /dev/hvsi[0-9]* | sort
 +    # Via SERIAL_CONSOLE_DEVICES the user specifies which ones to use (and no others):
 +    if test "$SERIAL_CONSOLE_DEVICES" ; then
 +        echo $SERIAL_CONSOLE_DEVICES
 +        return 0
 +    fi
 +    # Test if there is /dev/ttyS[0-9]* or /dev/hvsi[0-9]*
 +    # because when there is neither /dev/ttyS[0-9]* nor /dev/hvsi[0-9]*
 +    # the ls command below would become plain 'ls' because of 'nullglob'
 +    # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
 +    # see https://github.com/rear/rear/issues/2914#issuecomment-1396659184
 +    # and return 0 because it is no error when no serial device node exists
 +    test "$( echo -n /dev/ttyS[0-9]* /dev/hvsi[0-9]* )" || return 0
     # Use plain 'sort' which results /dev/ttyS0 /dev/ttyS1 /dev/ttyS10 ... /dev/ttyS19 /dev/ttyS2 /dev/ttyS20 ...
     # to get at least /dev/ttyS0 and /dev/ttyS1 before the other /dev/ttyS* devices because
     # we cannot use "sort -V" which would result /dev/ttyS0 /dev/ttyS1 ... /dev/ttyS9 /dev/ttyS10 ...
     # because in older Linux distributions 'sort' does not support '-V' e.g. SLES10 with GNU coreutils 5.93
     # (SLES11 with GNU coreutils 8.12 supports 'sort -V') but if 'sort' fails there is no output at all
 -    # cf. "Maintain backward compatibility" at https://github.com/rear/rear/wiki/Coding-Style
 +    # cf. "Maintain backward compatibility" in https://github.com/rear/rear/wiki/Coding-Style
     # Furthermore 'sort' results that /dev/hvsi* devices appear before /dev/ttyS* devices
     # so the create_grub2_serial_entry function in lib/bootloader-functions.sh
     # which uses by default the first one and skips the rest will result that
@@ -16,7 +27,8 @@ function get_serial_console_devices () {
     # that have the HVSI driver loaded (a console driver for IBM's p5 servers)
     # cf. https://lwn.net/Articles/98442/
     # and it seems right that when special console drivers are loaded
 -    # then their devices should be preferred by default.
 +    # then their devices should be preferred by default:
 +    ls /dev/ttyS[0-9]* /dev/hvsi[0-9]* | sort
 }
 # Get the serial device speed for those device nodes that belong to actual serial devices.
 commit 07da02143b5597b202e66c187e53103561018255
 Merge: 91942f63 75a23e79
 Author: Johannes Meixner <jsmeix@suse.com>
 Date:   Fri Oct 20 14:45:23 2023 +0200
    Merge pull request #2961 from rear/jsmeix-copy-serial-console
    For the automated serial console setup for the recovery system
    use only the 'console=...' kernel arguments from the original system
    which fixes https://github.com/rear/rear/issues/2843
    and it means that no longer all "real serial devices" get
    auto-enabled as serial consoles in the recovery system, see
    https://github.com/rear/rear/pull/2749#issuecomment-1196650631
    That new default behaviour is described in default.conf.
    In particular prep/GNU/Linux/200_include_serial_console.sh
    and lib/serial-functions.sh were overhauled which results
    that rescue/GNU/Linux/400_use_serial_console.sh is obsolete.
    Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index ec1691b6..76355fb8 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -3320,39 +3320,90 @@ SIMPLIFY_TEAMING=no
 SIMPLIFY_TEAMING=no
 # Serial console support for the ReaR rescue/recovery system:
 -# By default serial consoles get enabled if serial devices are found and
 -# then matching kernel command line parameters like 'console=ttyS0,9600 console=ttyS1,9600'
 -# are set when booting the rescue/recovery system (see KERNEL_CMDLINE above).
 # IA64 platforms require it and people need it when no VGA console is available.
 -# Specify 'yes' or 'no' or leave it empty to use ReaR's automatism:
 +# By default there is serial console support in the ReaR recovery system
 +# when 'getty' or 'agetty' and 'stty' can be found,
 +# otherwise USE_SERIAL_CONSOLE is automatically set to 'no'.
 +# When 'getty' or 'agetty' and 'stty' can be found
 +# and there is a 'console=...' option in /proc/cmdline,
 +# then USE_SERIAL_CONSOLE is automatically set to 'yes'.
 +# With USE_SERIAL_CONSOLE="no" no serial console gets set up,
 +# neither for the recovery system kernel nor for the recovery system bootloader.
 +# With USE_SERIAL_CONSOLE="yes" plus appropriate SERIAL_CONSOLE_DEVICE... settings
 +# serial consoles can be specified for the recovery system kernel and bootloader
 +# for example when there is no 'console=...' option in /proc/cmdline
 +# or when serial consoles for the recovery system kernel and bootloader
 +# should differ from what 'console=...' options in /proc/cmdline tell.
 +# By default (when empty) the automatism further described below is used:
 USE_SERIAL_CONSOLE=
 -# If you do not want to use all serial devices found as console you can specify the ones to use
 -# e.g. SERIAL_CONSOLE_DEVICES="/dev/ttyS0 /dev/ttyS1" provided USE_SERIAL_CONSOLE is turned on.
 -# By default (when empty) all serial devices found are used:
 +#
 +# Devices to be used in general for serial console setup
 +# unless explicitly specified via SERIAL_CONSOLE_DEVICES_KERNEL
 +# or SERIAL_CONSOLE_DEVICE_SYSLINUX or SERIAL_CONSOLE_DEVICE_GRUB:
 +# E.g. SERIAL_CONSOLE_DEVICES="/dev/ttyS0 /dev/ttyS1"
 SERIAL_CONSOLE_DEVICES=
 -# Serial consoles for the kernel of the recovery system:
 +#
 +# Serial consoles for the kernel of the recovery system
 +# provided USE_SERIAL_CONSOLE is not 'no':
 # SERIAL_CONSOLE_DEVICES_KERNEL can be device nodes like "/dev/ttyS0 /dev/ttyS1"
 # or 'console=...' kernel parameters like "console=ttyS1,9600 console=tty0" or both like
 # SERIAL_CONSOLE_DEVICES_KERNEL="/dev/ttyS0 console=ttyS1,9600 console=tty0"
 -# provided USE_SERIAL_CONSOLE is turned on.
 -# By default (when empty) the SERIAL_CONSOLE_DEVICES are used for the kernel:
 +# When SERIAL_CONSOLE_DEVICES_KERNEL is empty but SERIAL_CONSOLE_DEVICES is specified
 +# then the specified SERIAL_CONSOLE_DEVICES are used for the kernel.
 +# By default (when SERIAL_CONSOLE_DEVICES_KERNEL and SERIAL_CONSOLE_DEVICES are empty)
 +# serial consoles get enabled for the recovery system kernel via COPY_KERNEL_PARAMETERS
 +# for all 'console=...' options that are found in /proc/cmdline.
 SERIAL_CONSOLE_DEVICES_KERNEL=
 -# Serial console for SYSLINUX/EXTLINUX when it is used as bootloader for the recovery system:
 +#
 +# Serial console for SYSLINUX/EXTLINUX when it is used as bootloader for the recovery system
 +# provided USE_SERIAL_CONSOLE is 'yes' (automatically with 'console=...' in /proc/cmdline):
 # SYSLINUX supports only one serial device (because the last SYSLINUX 'serial' directive wins).
 # The right /dev/ttyS* can be specified like SERIAL_CONSOLE_DEVICE_SYSLINUX="/dev/ttyS0"
 # or a whole SYSLINUX 'serial' directive can be specified e.g. for /dev/ttyS1 like
 # SERIAL_CONSOLE_DEVICE_SYSLINUX="serial 1 9600"
 -# provided USE_SERIAL_CONSOLE is turned on.
 -# By default (when empty) the first one of SERIAL_CONSOLE_DEVICES is used for SYSLINUX:
 +# When SERIAL_CONSOLE_DEVICE_SYSLINUX is empty but SERIAL_CONSOLE_DEVICES is specified
 +# then the first one of SERIAL_CONSOLE_DEVICES is used for SYSLINUX.
 +# By default (when SERIAL_CONSOLE_DEVICE_SYSLINUX and SERIAL_CONSOLE_DEVICES are empty)
 +# the devices of the 'console=...' options in /proc/cmdline
 +# that exist as /dev/ttyS* or /dev/hvsi* character device nodes are used
 +# (which excludes /dev/tty0 when there is 'console=tty0' in /proc/cmdline).
 SERIAL_CONSOLE_DEVICE_SYSLINUX=
 -# Serial console for GRUB when it is used as bootloader for the recovery system:
 +#
 +# Serial console for GRUB when it is used as bootloader for the recovery system
 +# provided USE_SERIAL_CONSOLE is 'yes' (automatically with 'console=...' in /proc/cmdline):
 # GRUB supports only one serial device (because the last GRUB 'serial' command wins).
 # The right /dev/ttyS* can be specified like SERIAL_CONSOLE_DEVICE_GRUB="/dev/ttyS0"
 # or a whole GRUB 'serial' command can be specified e.g. for /dev/ttyS1 like
 # SERIAL_CONSOLE_DEVICE_GRUB="serial --unit=1 --speed=9600"
 -# provided USE_SERIAL_CONSOLE is turned on.
 -# By default (when empty) the first one of SERIAL_CONSOLE_DEVICES is used for GRUB:
 +# When SERIAL_CONSOLE_DEVICE_GRUB is empty but SERIAL_CONSOLE_DEVICES is specified
 +# then the first one of SERIAL_CONSOLE_DEVICES is used for GRUB.
 +# By default (when SERIAL_CONSOLE_DEVICE_GRUB and SERIAL_CONSOLE_DEVICES are empty)
 +# the devices of the 'console=...' options in /proc/cmdline
 +# that exist as /dev/ttyS* or /dev/hvsi* character device nodes are used
 +# (which excludes /dev/tty0 when there is 'console=tty0' in /proc/cmdline).
 SERIAL_CONSOLE_DEVICE_GRUB=
 +#
 +# Examples
 +# (provided USE_SERIAL_CONSOLE is not 'no'
 +# and 'getty' or 'agetty' and 'stty' can be found):
 +#
 +# Default behaviour
 +# when there is no 'console=...' option in /proc/cmdline
 +# then no serial console is set up for the recovery system.
 +#
 +# Default behaviour when there are for example
 +# 'console=ttyS0,9600' and 'console=tty0' in /proc/cmdline
 +# then 'console=ttyS0,9600' and 'console=tty0'
 +# are used for the recovery system kernel
 +# and only /dev/ttyS0 is used as serial console
 +# for the recovery system bootloader (SYSLINUX or GRUB).
 +#
 +# On a headless machine without VGA card but with serial device /dev/ttyS0
 +# the kernel would choose /dev/ttyS0 as its console automatically
 +# so no 'console=...' kernel option needs to be used and then the automatism described above
 +# would not set up a console for the recovery system (in particular not for the bootloader).
 +# In this case USE_SERIAL_CONSOLE="yes" and appropriate SERIAL_CONSOLE_DEVICE... settings
 +# are needed to manually specify the right console setup for the recovery system.
 # Say "y", "Yes", etc, to enable or "n", "No" etc. to disable the DHCP client protocol or leave empty to autodetect.
 # When enabled, lets the rescue/recovery system run dhclient to get an IP address
 # instead of using the same IP address as the original system:
 diff --git a/usr/share/rear/lib/serial-functions.sh b/usr/share/rear/lib/serial-functions.sh
 index 3d421b52..a586d357 100644
 --- a/usr/share/rear/lib/serial-functions.sh
 +++ b/usr/share/rear/lib/serial-functions.sh
@@ -6,29 +6,34 @@ function get_serial_console_devices () {
         echo $SERIAL_CONSOLE_DEVICES
         return 0
     fi
 -    # Test if there is /dev/ttyS[0-9]* or /dev/hvsi[0-9]*
 -    # because when there is neither /dev/ttyS[0-9]* nor /dev/hvsi[0-9]*
 -    # the ls command below would become plain 'ls' because of 'nullglob'
 -    # cf. "Beware of the emptiness" in https://github.com/rear/rear/wiki/Coding-Style
 -    # see https://github.com/rear/rear/issues/2914#issuecomment-1396659184
 -    # and return 0 because it is no error when no serial device node exists
 -    test "$( echo -n /dev/ttyS[0-9]* /dev/hvsi[0-9]* )" || return 0
 -    # Use plain 'sort' which results /dev/ttyS0 /dev/ttyS1 /dev/ttyS10 ... /dev/ttyS19 /dev/ttyS2 /dev/ttyS20 ...
 -    # to get at least /dev/ttyS0 and /dev/ttyS1 before the other /dev/ttyS* devices because
 -    # we cannot use "sort -V" which would result /dev/ttyS0 /dev/ttyS1 ... /dev/ttyS9 /dev/ttyS10 ...
 -    # because in older Linux distributions 'sort' does not support '-V' e.g. SLES10 with GNU coreutils 5.93
 -    # (SLES11 with GNU coreutils 8.12 supports 'sort -V') but if 'sort' fails there is no output at all
 -    # cf. "Maintain backward compatibility" in https://github.com/rear/rear/wiki/Coding-Style
 -    # Furthermore 'sort' results that /dev/hvsi* devices appear before /dev/ttyS* devices
 -    # so the create_grub2_serial_entry function in lib/bootloader-functions.sh
 -    # which uses by default the first one and skips the rest will result that
 -    # the first /dev/hvsi* device becomes used for the GRUB serial console by default
 -    # which looks right because /dev/hvsi* devices should exist only on systems
 -    # that have the HVSI driver loaded (a console driver for IBM's p5 servers)
 -    # cf. https://lwn.net/Articles/98442/
 -    # and it seems right that when special console drivers are loaded
 -    # then their devices should be preferred by default:
 -    ls /dev/ttyS[0-9]* /dev/hvsi[0-9]* | sort
 +    # Scan the kernel command line of the currently running original system
 +    # for 'console=<device>[,<options>]' settings e.g. 'console=ttyS1,9600n8 ... console=ttyS3 ... console=tty0'
 +    # and extract the specified serial device nodes e.g. ttyS1 -> /dev/ttyS1 ... ttyS3 -> /dev/ttyS3
 +    local kernel_option console_option_value console_option_device
 +    for kernel_option in $( cat /proc/cmdline ) ; do
 +        # Continue with next kernel option when the option name (part before leftmost "=") is not 'console':
 +        test "${kernel_option%%=*}" = "console" || continue
 +        # Get the console option value (part after leftmost "=") e.g. 'ttyS1,9600n8' 'ttyS3' 'tty0'
 +        console_option_value="${kernel_option#*=}"
 +        # Get the console option device (part before leftmost optional ',' separator) e.g. 'ttyS1' 'ttyS3' 'tty0'
 +        console_option_device="${console_option_value%%,*}"
 +        # Continue with next kernel option when the current console option device is no serial device (exclude 'tty0').
 +        # The special /dev/hvsi* devices should exist only on systems that have the HVSI driver loaded
 +        # (a console driver for IBM's p5 servers) cf. https://lwn.net/Articles/98442/
 +        [[ $console_option_device == ttyS* ]] || [[ $console_option_device == hvsi* ]] || continue
 +        # Test that the matching serial device node e.g. ttyS1 -> /dev/ttyS1 and ttyS3 -> /dev/ttyS3' exists
 +        # to avoid that this automated serial console setup may not work in the ReaR recovery system
 +        # when serial device nodes get specified for the recovery system that do not exist
 +        # in the currently running original system because the default assumption is
 +        # that the replacement system has same hardware as the original system,
 +        # cf. https://github.com/rear/rear/pull/2749#issuecomment-1196650631
 +        # (if needed the user can specify what he wants via SERIAL_CONSOLE_DEVICES, see above):
 +        if ! test -c "/dev/$console_option_device" ; then
 +            LogPrintError "Found '$kernel_option' in /proc/cmdline but '/dev/$console_option_device' is no character device"
 +            continue
 +        fi
 +        echo /dev/$console_option_device
 +    done
 }
 # Get the serial device speed for those device nodes that belong to actual serial devices.
@@ -39,64 +44,15 @@ function get_serial_device_speed () {
     # Run it in a subshell so that 'set -o pipefail' does not affect the current shell and
     # it can run in a subshell because the caller of this function only needs its stdout
     # cf. the function get_root_disk_UUID in lib/bootloader-functions.sh
 -    # so when stty fails the get_serial_device_speed return code is the stty exit code and not the awk exit code
 -    # therefore one can call get_serial_device_speed with error checking for example like
 +    # so when stty fails the get_serial_device_speed return code is the stty exit code and not the awk exit code.
 +    # Therefore one can call get_serial_device_speed with error checking for example like
     # speed=$( get_serial_device_speed $serial_device ) && COMMAND_WITH_speed || COMMAND_WITHOUT_speed
 -    # because the return code of variable=$( PIPE ) is the return code of the pipe,
 -    # cf. how get_serial_device_speed is called in cmdline_add_console below.
 +    # because the return code of variable=$( PIPE ) is the return code of the pipe
 +    # cf. how get_serial_device_speed is called in lib/bootloader-functions.sh
 +    # and output/USB/Linux-i386/300_create_extlinux.sh
     # Suppress stty stderr output because for most /dev/ttyS* device nodes the result is
     #   stty: /dev/ttyS...: Input/output error
     # when the device node does not belong to an actual serial device (i.e. to real serial hardware)
     # so get_serial_device_speed is also used to get those device nodes that belong to real serial devices:
     ( set -o pipefail ; stty -F $devnode 2>/dev/null | awk '/^speed / { print $2 }' )
 }
 -
 -# Add serial console to kernel cmdline:
 -function cmdline_add_console {
 -    # Nothing to do when using serial console is not wanted:
 -    is_true "$USE_SERIAL_CONSOLE" || return 0
 -
 -    # Strip existing 'console=...' kernel cmd parameters:
 -    local param cmdline=""
 -    for param in $KERNEL_CMDLINE ; do
 -        case "$param" in
 -            (console=*) ;;
 -            (*) cmdline+=" $param";;
 -        esac
 -    done
 -
 -    # Add serial console config to kernel cmd line:
 -    local devnode speed=""
 -    if test "$SERIAL_CONSOLE_DEVICES_KERNEL" ; then
 -        # When the user has specified SERIAL_CONSOLE_DEVICES_KERNEL use only that (no automatisms):
 -        for devnode in $SERIAL_CONSOLE_DEVICES_KERNEL ; do
 -            # devnode can be a character device node like "/dev/ttyS0" or "/dev/lp0" or "/dev/ttyUSB0"
 -            # cf. https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html
 -            # or devnode can be a 'console=...' kernel cmd parameter like "console=ttyS1,9600"
 -            if test -c "$devnode" ; then
 -                if speed=$( get_serial_device_speed $devnode ) ; then
 -                    cmdline+=" console=${devnode##/dev/},$speed"
 -                else
 -                    cmdline+=" console=${devnode##/dev/}"
 -                fi
 -            else
 -                # When devnode is a 'console=...' kernel cmd parameter use it as specified:
 -                cmdline+=" $devnode"
 -            fi
 -        done
 -    else
 -        local real_consoles=""
 -        for devnode in $( get_serial_console_devices ) ; do
 -            # Only add for those device nodes that belong to actual serial devices:
 -            speed=$( get_serial_device_speed $devnode ) && real_consoles+=" console=${devnode##/dev/},$speed"
 -        done
 -        cmdline+=" $real_consoles"
 -
 -        # Add fallback console if no real serial device was found:
 -        test "$real_consoles" || cmdline+=" console=tty0"
 -    fi
 -
 -    # Have a trailing space to be on the safe side
 -    # so that more kernel cmd parameters could be "just appended" by other scripts:
 -    echo "$cmdline "
 -}
 diff --git a/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh b/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh
 index 214af3c4..14ec113e 100644
 --- a/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh
 +++ b/usr/share/rear/prep/GNU/Linux/200_include_serial_console.sh
@@ -1,31 +1,115 @@
 -# If possible auto-enable serial console when not specified:
 -if [[ -z "$USE_SERIAL_CONSOLE" ]] ; then
 -    local devnode speed=""
 -    for devnode in $( get_serial_console_devices ) ; do
 -        # Enable serial console when there is at least one real serial device:
 -        if speed=$( get_serial_device_speed $devnode ) ; then
 -            USE_SERIAL_CONSOLE="yes"
 -            break
 -        fi
 -    done
 -fi
 +# This script prep/GNU/Linux/200_include_serial_console.sh
 +# is the first ...console... script that is run for "rear mkrescue/mkbackup".
 +#
 +# When USE_SERIAL_CONSOLE is empty then this script decides
 +# if USE_SERIAL_CONSOLE is kept empty
 +# or (provided there is sufficient reason)
 +# it sets USE_SERIAL_CONSOLE to 'no' or 'yes'.
 +# It sets USE_SERIAL_CONSOLE to 'no'
 +# when serial consoles cannot work in the recovery system.
 +# It sets USE_SERIAL_CONSOLE to 'yes'
 +# when a serial console will be set up for the recovery system kernel.
 +# Only when a serial console will be actually set up for the recovery system kernel,
 +# then it makes sense to also set up a serial console for the recovery system bootloader.
 +# So serial console setup for the recovery system bootloader is only done if USE_SERIAL_CONSOLE="yes"
 +# because an empty USE_SERIAL_CONSOLE must not result serial console setup for the recovery system bootloader
 +# (without actual serial console setup for the recovery system kernel).
 -# Always include getty or agetty as we don't know in advance whether they are needed
 +# Always try to include getty or agetty as we do not know in advance whether they are needed
 # (the user may boot the recovery system with manually specified kernel options
 # to get serial console support in his recovery system).
 -# For serial support we need to include the agetty binary,
 -# but Debian distro's use getty instead of agetty:
 -local getty_binary=""
 +# For serial console support we need to include 'getty' or 'agetty'.
 +# Debian distributions (in particular Ubuntu) use 'getty'.
 +# Fedora, RHEL, SLES,... use 'agetty'.
 if has_binary getty ; then
 -    # Debian, Ubuntu,...
 -    getty_binary="getty"
 +    PROGS+=( getty )
 elif has_binary agetty ; then
 -    # Fedora, RHEL, SLES,...
 -    getty_binary="agetty"
 +    PROGS+=( agetty )
 +else
 +    is_true "$USE_SERIAL_CONSOLE" && Error "Failed to find 'getty' or 'agetty' (USE_SERIAL_CONSOLE is 'true')"
 +    LogPrintError "No serial console support (failed to find 'getty' or 'agetty')"
 +    USE_SERIAL_CONSOLE="no"
 +fi
 +
 +# Also try to include 'stty' which is (currently) only needed for serial console support
 +# in skel/default/etc/scripts/system-setup.d/45-serial-console.sh
 +# and lib/serial-functions.sh
 +if has_binary stty ; then
 +    PROGS+=( stty )
 else
 -    # The user must have the programs in REQUIRED_PROGS installed on his system:
 -    Error "Failed to find 'getty' or 'agetty' for serial console"
 +    is_true "$USE_SERIAL_CONSOLE" && Error "Failed to find 'stty' (USE_SERIAL_CONSOLE is 'true')"
 +    LogPrintError "No serial console support (failed to find 'stty')"
 +    USE_SERIAL_CONSOLE="no"
 fi
 -REQUIRED_PROGS+=( "$getty_binary" stty )
 +# Auto-enable serial console support for the recovery system
 +# provided console support is not impossible because there is no getty or agetty and stty
 +# and unless the user specified to not have serial console support:
 +is_false "$USE_SERIAL_CONSOLE" && return 0
 +
 +# When the user has specified SERIAL_CONSOLE_DEVICES_KERNEL use only that,
 +# otherwise use SERIAL_CONSOLE_DEVICES if the user has specified it:
 +local serial_console_devices=""
 +test "$SERIAL_CONSOLE_DEVICES" && serial_console_devices="$SERIAL_CONSOLE_DEVICES"
 +test "$SERIAL_CONSOLE_DEVICES_KERNEL" && serial_console_devices="$SERIAL_CONSOLE_DEVICES_KERNEL"
 +if test "$serial_console_devices" ; then
 +    local serial_console speed="" cmdline_add_console=""
 +    for serial_console in $serial_console_devices ; do
 +        # serial_console can be a character device node like "/dev/ttyS0" or "/dev/lp0" or "/dev/ttyUSB0"
 +        # cf. https://www.kernel.org/doc/html/latest/admin-guide/serial-console.html
 +        # or serial_console can be a 'console=...' kernel cmd parameter like "console=ttyS1,9600"
 +        if test -c "$serial_console" ; then
 +            if speed=$( get_serial_device_speed $serial_console ) ; then
 +                cmdline_add_console+=" console=${serial_console##/dev/},$speed"
 +            else
 +                cmdline_add_console+=" console=${serial_console##/dev/}"
 +            fi
 +        else
 +            # When serial_console is not a character device
 +            # it should be a 'console=...' kernel cmd parameter
 +            # that is used as specified ("final power to the user"):
 +            cmdline_add_console+=" $serial_console"
 +        fi
 +    done
 +    if test "$cmdline_add_console" ; then
 +        KERNEL_CMDLINE+="$cmdline_add_console"
 +        DebugPrint "Appended '$cmdline_add_console' to KERNEL_CMDLINE"
 +        USE_SERIAL_CONSOLE="yes"
 +        # No further automatisms when a 'console=...' kernel cmd parameter was set
 +        # via SERIAL_CONSOLE_DEVICES_KERNEL or SERIAL_CONSOLE_DEVICES:
 +        return
 +    fi
 +    LogPrintError "SERIAL_CONSOLE_DEVICES_KERNEL or SERIAL_CONSOLE_DEVICES specified but none is a character device"
 +fi
 +
 +# Auto-enable serial console support for the recovery system kernel:
 +# The below auto-enable serial console support for the recovery system kernel
 +# does not auto-enable serial console support for the recovery system bootloader.
 +# Currently auto-enable serial console support for the recovery system bootloader
 +# happens for the first real serial device from get_serial_console_devices()
 +# in lib/bootloader-functions.sh in make_syslinux_config() and create_grub2_cfg() 
 +# and in output/USB/Linux-i386/300_create_extlinux.sh
 +# The auto-enable serial console support for the recovery system bootloader should be
 +# auto-aligned with the auto-enable serial console support for the recovery system kernel.
 +# Things are auto-aligned when the first 'console=...' device in /proc/cmdline
 +# is also the first real serial device from get_serial_console_devices().
 +# When current auto-alignment does not result what the user needs, what is needed can be specified
 +# via SERIAL_CONSOLE_DEVICES_KERNEL and SERIAL_CONSOLE_DEVICE_SYSLINUX or SERIAL_CONSOLE_DEVICE_GRUB.
 +
 +# Scan the kernel command line of the currently running original system
 +# and auto-enable serial console for the recovery system kernel
 +# only if there is at least one 'console=...' option:
 +local kernel_option
 +for kernel_option in $( cat /proc/cmdline ) ; do
 +    # Get the kernel option name (part before leftmost "="):
 +    if test "${kernel_option%%=*}" = "console" ; then
 +        USE_SERIAL_CONSOLE="yes"
 +        # Get all 'console=...' kernel command line options
 +        # copied from the currently running original system
 +        # via rescue/GNU/Linux/290_kernel_cmdline.sh that runs later:
 +        COPY_KERNEL_PARAMETERS+=( console )
 +        return
 +    fi
 +done
 +DebugPrint "No 'console=...' setting for recovery system kernel (none in /proc/cmdline)"
 diff --git a/usr/share/rear/rescue/GNU/Linux/400_use_serial_console.sh b/usr/share/rear/rescue/GNU/Linux/400_use_serial_console.sh
 deleted file mode 100644
 index fc935844..00000000
 --- a/usr/share/rear/rescue/GNU/Linux/400_use_serial_console.sh
 +++ /dev/null
@@ -1,6 +0,0 @@
 -
 -# Nothing to do when using serial console is not wanted:
 -is_true "$USE_SERIAL_CONSOLE" || return 0
 -
 -KERNEL_CMDLINE=$( cmdline_add_console )
 -Log "Modified kernel commandline to: '$KERNEL_CMDLINE'"
--- a/rear-fix-compatibility-with-newer-systemd-bz2254871.patch
+++ b/rear-fix-compatibility-with-newer-systemd-bz2254871.patch
@ -1,54 +0,0 @@
 From 060fef89b6968f0c8f254e6f612eff839b83c057 Mon Sep 17 00:00:00 2001
 From: Pavel Cahyna <pcahyna@redhat.com>
 Date: Mon, 13 Nov 2023 18:54:41 +0100
 Subject: [PATCH] Do not mount /sys if already mounted
 Newer versions of systemd (starting with Fedora 39) seem to mount /sys
 themselves. Mounting it again leads to errors on the recovery system
 startup (startup scripts failing with status=219/CGROUP ), see
 https://github.com/rear/rear/issues/3017.
 Check if /sys is already mounted using the `mountpoint` tool and mount it
 only if it is not.
 Do the same for the other system mountpoints like /proc, /dev, /dev/pts.
 Not sure if they suffer from the same problem, but they probably could.
 N.B. the `mountpoint` command is already among REQUIRED_PROGS.
 ---
 usr/share/rear/skel/default/etc/scripts/boot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 diff --git a/usr/share/rear/skel/default/etc/scripts/boot b/usr/share/rear/skel/default/etc/scripts/boot
 index 0f221af3e4..f06e759620 100755
 --- a/usr/share/rear/skel/default/etc/scripts/boot
 +++ b/usr/share/rear/skel/default/etc/scripts/boot
@@ -4,8 +4,8 @@
 dmesg -n1
 # basic mounts
 -mount -t proc -n none /proc
 -mount -t sysfs none /sys
 +mountpoint /proc || mount -t proc -n none /proc
 +mountpoint /sys || mount -t sysfs none /sys
 if type udevd &>/dev/null && ! type udevinfo &>/dev/null; then
     ### we use udevinfo to filter out old udev versions (<106) that don't
@@ -13,7 +13,7 @@ if type udevd &>/dev/null && ! type udevinfo &>/dev/null; then
     udev_version=$(udevd --version)
     if [[ "$udev_version" -gt 175 ]]; then
         ### udev > 175 needs devtmpfs
 -        mount -t devtmpfs none /dev
 +        mountpoint /dev || mount -t devtmpfs none /dev
     fi
 fi
@@ -26,7 +26,7 @@ if [[ ! -L /dev/fd ]] ; then
     ln -s /proc/self/fd /dev/fd
 fi
 -mount -t devpts -o gid=5,mode=620 none /dev/pts
 +mountpoint /dev/pts || mount -t devpts -o gid=5,mode=620 none /dev/pts
 cat /proc/mounts >/etc/mtab 2>/dev/null
--- a/rear-nbu-RHEL-17390-RHEL-17393.patch
+++ b/rear-nbu-RHEL-17390-RHEL-17393.patch
@ -1,117 +0,0 @@
 diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
 index 17a764cba..a944114b3 100644
 --- a/usr/share/rear/conf/default.conf
 +++ b/usr/share/rear/conf/default.conf
@@ -1866,7 +1866,7 @@ OBDR_BLOCKSIZE=2048
 # BACKUP=NBU stuff (Symantec/Veritas NetBackup)
 ##
 #
 -COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var/auth/[mn]*.txt  /usr/openv/var/vxss /usr/openv/var/webtruststore /usr/openv/resources/nbpxyhelper /opt/VRTSpbx /etc/vx/VxICS /etc/vx/vrtslog.conf /var/log/VRTSpbx )
 +COPY_AS_IS_NBU=( /usr/openv/bin/vnetd /usr/openv/bin/vopied /usr/openv/lib /usr/openv/netbackup /usr/openv/var /usr/openv/resources/nbpxyhelper /opt/VRTSpbx /etc/vx/VxICS /etc/vx/vrtslog.conf /var/log/VRTSpbx )
 COPY_AS_IS_EXCLUDE_NBU=( "/usr/openv/netbackup/logs/*" "/usr/openv/netbackup/bin/bpjava*" /usr/openv/netbackup/bin/xbp /usr/openv/netbackup/bin/private /usr/openv/lib/java "/usr/openv/lib/*-plugins" /usr/openv/lib/shared/vddk /usr/openv/netbackup/baremetal "/var/log/VRTSpbx/*" )
 # See https://github.com/rear/rear/issues/2105 why /usr/openv/netbackup/sec/at/lib/ is needed:
 NBU_LD_LIBRARY_PATH="/usr/openv/lib:/usr/openv/netbackup/sec/at/lib/:/usr/openv/lib/boost"
 diff --git a/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh b/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh
 index 60d9a222c..e326db612 100644
 --- a/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh
 +++ b/usr/share/rear/finalize/NBU/default/990_copy_bplogrestorelog.sh
@@ -1,5 +1,51 @@
 # 990_copy_bprestorelog.sh
 -# copy the logfile to the recovered system, at least the part that has been written till now.
 +# copy the logfiles to the recovered system, at least the part that has been written till now.
 -mkdir -p $TARGET_FS_ROOT/$ROOT_HOME_DIR
 -cp -f $TMP_DIR/bplog.restore* $TARGET_FS_ROOT/$ROOT_HOME_DIR/
 +# $VAR_DIR/restore will be copied to $recovery_system_recover_log_dir in wrapup/default/990_copy_logfile.sh
 +mkdir -p "$VAR_DIR/restore/netbackup"
 +cp -pr /usr/openv/netbackup/logs/* "$VAR_DIR/restore/netbackup"
 +
 +# take care of $VAR_DIR/restore/bplog.restore* files (that used to be in /root before)
 +function symlink_bprestore_logs ()
 +{
 +    # adapted from wrapup/default/990_copy_logfile.sh
 +    local final_logfile_name_full
 +    local final_logfile_name
 +    local log_file_symlink_target
 +    local log_file_symlink
 +    local recover_log_dir=$LOG_DIR/recover
 +    local recovery_system_recover_log_dir=$TARGET_FS_ROOT/$recover_log_dir
 +    # Create the directories with mode 0700 (rwx------) so that only root can access files and subdirectories therein
 +    # because in particular logfiles could contain security relevant information.
 +
 +    # To be backward compatible with where to the logfile was copied before
 +    # have it as a symbolic link that points to where the logfile actually is:
 +    # ( "roots" in recovery_system_roots_home_dir means root's but ' in a variable name is not so good ;-)
 +    local recovery_system_roots_home_dir=$TARGET_FS_ROOT/$ROOT_HOME_DIR
 +    test -d $recovery_system_roots_home_dir || mkdir $verbose -m 0700 $recovery_system_roots_home_dir
 +
 +    # Remove existing and now outdated symlinks that would falsely point to the same target
 +    # The symlink name bplog.restore-$( date -Iseconds ).log is for example bplog.restore-2019-12-17T09:40:36+01:00.log or rear-2006-08-14T02:34:56-06:00.log
 +    # so a matching globbing pattern is bplog.restore-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]*.log ('*' for the UTC offset):
 +    for log_file_symlink in $recovery_system_roots_home_dir/bplog.restore*-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]:[0-9][0-9]:[0-9][0-9]*.log ; do
 +        # Skip if a file that matches the globbing pattern is not a symlink (it could be even a directory full of user's sacrocanct files):
 +        test -L $log_file_symlink || continue
 +        # Remove also outdated dangling symlinks where their target does not exist by using 'readlink -m':
 +        test "$log_file_symlink_target" = "$( readlink -m $log_file_symlink )" || continue
 +        rm $verbose $log_file_symlink
 +    done
 +
 +    # At the moment this function runs, $VAR_DIR/restore will have been already copied
 +    # to $recovery_system_recover_log_dir in wrapup/default/990_copy_logfile.sh
 +    # (exit tasks run in reverse order, so this task will run after the tasks defined in
 +    # wrapup/default/990_copy_logfile.sh )
 +    for final_logfile_name_full in $recovery_system_recover_log_dir/restore/bplog.restore* ; do
 +        final_logfile_name="$( basename "$final_logfile_name_full" )"
 +        log_file_symlink_target="$recover_log_dir/restore/$final_logfile_name"
 +        # Create symlink with current timestamp that points to where the logfile actually is:
 +        log_file_symlink=$recovery_system_roots_home_dir/$( basename "$final_logfile_name" .log )-$( date -Iseconds ).log
 +        ln $verbose -s $log_file_symlink_target $log_file_symlink || true
 +    done
 +}
 +
 +AddExitTask "symlink_bprestore_logs"
 diff --git a/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh b/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh
 index 71f7359a1..4280cb021 100644
 --- a/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh
 +++ b/usr/share/rear/restore/NBU/default/400_restore_with_nbu.sh
@@ -2,6 +2,23 @@
 # 400_restore_with_nbu.sh
 # restore files with NBU
 +# Unique log file name: adapted from restore/NETFS/default/400_restore_backup.sh
 +# and restore/TSM/default/400_restore_with_tsm.sh
 +local backup_restore_log_dir="$VAR_DIR/restore"
 +mkdir -p $backup_restore_log_dir
 +local backup_restore_log_file=""
 +local backup_restore_log_prefix="bplog.restore"
 +local backup_restore_log_suffix="log"
 +# E.g. when "rear -C 'general.conf /path/to/special.conf' recover" was called CONFIG_APPEND_FILES is "general.conf /path/to/special.conf"
 +# so that in particular '/' characters must be replaced in the backup restore log file (by a colon) and then
 +# the backup restore log file name will be like .../restore/bplog.restore.generalconf_:path:to:specialconf.1234.log
 +# It does not work with $( tr -d -c '[:alnum:]/[:space:]' <<<"$CONFIG_APPEND_FILES" | tr -s '/[:space:]' ':_' )
 +# because the <<<"$CONFIG_APPEND_FILES" results a trailing newline that becomes a trailing '_' character so that
 +# echo -n $CONFIG_APPEND_FILES (without double quotes) is used to avoid leading and trailing spaces and newlines:
 +test "$CONFIG_APPEND_FILES" && backup_restore_log_prefix=$backup_restore_log_prefix.$( echo -n $CONFIG_APPEND_FILES | tr -d -c '[:alnum:]/[:space:]' | tr -s '/[:space:]' ':_' )
 +
 +backup_restore_log_file=$backup_restore_log_dir/$backup_restore_log_prefix.$MASTER_PID.$backup_restore_log_suffix
 +
 LogPrint "NetBackup: restoring / into $TARGET_FS_ROOT"
 echo "change / to $TARGET_FS_ROOT" > $TMP_DIR/nbu_change_file
@@ -10,13 +27,13 @@ echo "change / to $TARGET_FS_ROOT" > $TMP_DIR/nbu_change_file
 # $TMP_DIR/restore_fs_list was made by 300_create_nbu_restore_fs_list.sh
 if [ ${#NBU_ENDTIME[@]} -gt 0 ] ; then
     edate="${NBU_ENDTIME[@]}"
 -    bprestore_args="-B -H -L $TMP_DIR/bplog.restore -8 -R $TMP_DIR/nbu_change_file -t 0 -w 0 -e ${edate} -C ${NBU_CLIENT_SOURCE} -D ${NBU_CLIENT_NAME} -f $TMP_DIR/restore_fs_list"
 +    bprestore_args="-B -H -L $backup_restore_log_file -8 -R $TMP_DIR/nbu_change_file -t 0 -w 0 -e ${edate} -C ${NBU_CLIENT_SOURCE} -D ${NBU_CLIENT_NAME} -f $TMP_DIR/restore_fs_list"
 else
 -    bprestore_args="-B -H -L $TMP_DIR/bplog.restore -8 -R $TMP_DIR/nbu_change_file -t 0 -w 0 -C ${NBU_CLIENT_SOURCE} -D ${NBU_CLIENT_NAME} -f $TMP_DIR/restore_fs_list"
 +    bprestore_args="-B -H -L $backup_restore_log_file -8 -R $TMP_DIR/nbu_change_file -t 0 -w 0 -C ${NBU_CLIENT_SOURCE} -D ${NBU_CLIENT_NAME} -f $TMP_DIR/restore_fs_list"
 fi
 LogPrint "RUN: /usr/openv/netbackup/bin/bprestore $bprestore_args"
 -LogPrint "Restore progress: see $TMP_DIR/bplog.restore"
 +LogPrint "Restore progress: see $backup_restore_log_file"
 LANG=C /usr/openv/netbackup/bin/bprestore $bprestore_args
 rc=$?
 if (( $rc > 1 )) ; then
--- a/rear-remove-lvmdevices-bz2145014.patch
+++ b/rear-remove-lvmdevices-bz2145014.patch
@ -1,50 +0,0 @@
 From 5a8c5086bf3fc28236436ff3ef27196509f0375d Mon Sep 17 00:00:00 2001
 From: Pavel Cahyna <pcahyna@redhat.com>
 Date: Thu, 24 Aug 2023 11:41:25 +0200
 Subject: [PATCH] Remove the lvmdevices file at the end of recovery
 The file /etc/lvm/devices/system.devices restricts LVM to disks with
 given (hardware) IDs (serial numbers, WWNs). See lvmdevices(8).
 Unfortunately, when restoring to different disks than in the original
 system, it will mean that LVM is broken in the recovered system (it
 won't find any disks).  Therefore it is safer to remove the file to
 force the old behavior where LVM scans all disks. This used to be the
 LVM default (use_devicesfile=0).
 ---
 .../GNU/Linux/230_remove_lvmdevices.sh        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 usr/share/rear/finalize/GNU/Linux/230_remove_lvmdevices.sh
 diff --git a/usr/share/rear/finalize/GNU/Linux/230_remove_lvmdevices.sh b/usr/share/rear/finalize/GNU/Linux/230_remove_lvmdevices.sh
 new file mode 100644
 index 0000000000..9392c9f52f
 --- /dev/null
 +++ b/usr/share/rear/finalize/GNU/Linux/230_remove_lvmdevices.sh
@@ -0,0 +1,25 @@
 +# Adapted from 260_rename_diskbyid.sh
 +
 +# Remove /etc/lvm/devices/system.devices
 +# The file restricts LVM to disks with given (hardware) IDs (serial
 +# numbers, WWNs). See lvmdevices(8).
 +# Unfortunately, when restoring to different disks than in the original 
 +# system, it will mean that LVM is broken in the recovered system (it
 +# won't find any disks).  Therefore it is safer to remove the file to
 +# force the old behavior where LVM scans all disks. This used to be the
 +# LVM default (use_devicesfile=0).
 +
 +# There may be other files under /etc/lvm/devices, but they are not used
 +# by default
 +
 +local file=/etc/lvm/devices/system.devices
 +local realfile
 +
 +realfile="$TARGET_FS_ROOT/$file"
 +# OK if file not found
 +test -f "$realfile" || return 0
 +mv $v "$realfile" "$realfile.rearbak"
 +LogPrint "Renamed LVM devices file $realfile to $realfile.rearbak
 +to prevent LVM problems in the recovered system, verify that the file
 +is correct after booting the recovered system and move it back, or
 +regenerate it using vgimportdevices."
--- a/rear-resolve-libraries-for-symlinks-in-COPY_AS_IS-RHEL-15108.patch
+++ b/rear-resolve-libraries-for-symlinks-in-COPY_AS_IS-RHEL-15108.patch
@ -1,30 +0,0 @@
 commit 9f859c13f5ba285cd1d5983c9b595975c21888d3
 Merge: 01f503ed 4434da63
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Tue Nov 14 14:33:56 2023 +0100
    Merge pull request #3073 from pcahyna/resolve-libraries-for-symlinks-in-COPY_AS_IS
    Resolve libs for executable links in COPY_AS_IS
 diff --git a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
 index 2169efaa..2e991145 100644
 --- a/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
 +++ b/usr/share/rear/build/GNU/Linux/100_copy_as_is.sh
@@ -135,10 +135,13 @@ local copy_as_is_file=""
 # cf. https://github.com/rear/rear/pull/2378
 # It is crucial to append to /dev/$DISPENSABLE_OUTPUT_DEV (cf. 'Print' in lib/_input-output-functions.sh):
 while read -r copy_as_is_file ; do
 -    # Skip non-regular files like directories, device files, and 'tar' error messages (e.g. in case of non-existent files, see above):
 +    # Skip non-regular files like directories, device files, and 'tar' error messages (e.g. in case of non-existent files, see above)
 +    # but do not skip symbolic links. Their targets will be copied later by build/default/490_fix_broken_links.sh.
 +    # We thus need library dependencies for symlinked executables just like for normal executables
 +    # and build/default/490_fix_broken_links.sh does not perform library dependency scan.
 +    # See GitHub PR https://github.com/rear/rear/pull/3073
 +    # and issue https://github.com/rear/rear/issues/3064 for details.
     test -f "$copy_as_is_file" || continue
 -    # Skip symbolic links (only care about symbolic link targets):
 -    test -L "$copy_as_is_file" && continue
     # Remember actual regular files that are executable:
     test -x "$copy_as_is_file" && copy_as_is_executables+=( "$copy_as_is_file" )
 done < <( sort -u $copy_as_is_filelist_file ) 2>>/dev/$DISPENSABLE_OUTPUT_DEV
--- a/rear-skip-invalid-drives-RHEL-22863.patch
+++ b/rear-skip-invalid-drives-RHEL-22863.patch
@ -1,90 +0,0 @@
 commit c08658d5a0260c3242bb817e77b9c6dadecd14f6
 Merge: 879e173f db191aaf
 Author: pcahyna <pcahyna@users.noreply.github.com>
 Date:   Wed Sep 13 12:46:54 2023 +0200
    Merge pull request #3047 from pcahyna/skip-invalid-drives
    Skip invalid disk drives (zero sized, no media) when saving layout
    Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
 diff --git a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
 index 9d6e0bc6..b2dc743a 100644
 --- a/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
 +++ b/usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh
@@ -413,17 +413,21 @@ Log "Saving disks and their partitions"
             elif [[ ! ($blockd = *rpmb || $blockd = *[0-9]boot[0-9]) ]]; then # Silently skip Replay Protected Memory Blocks and others  
                 devname=$(get_device_name $disk)
                 devsize=$(get_disk_size ${disk#/sys/block/})
 -                disktype=$(parted -s $devname print | grep -E "Partition Table|Disk label" | cut -d ":" -f "2" | tr -d " ")
                 # Ensure syntactically correct 'disk' entries:
                 # Each value must exist and each value must be a single non-blank word so we 'test' without quoting the value:
                 test $devname || Error "Invalid 'disk' entry (no disk device name for '$disk')"
                 test $devsize || Error "Invalid 'disk $devname' entry (no device size for '$devname')"
 -                # We do not error out when there is no partition label type value because
 -                # "rear recover" works in a special case without partition label type value when there is
 -                # only a 'disk' entry but nothing else for this disk exists in disklayout.conf
 -                # which can happen when /dev/sdX is an empty SD card slot without medium,
 -                # see https://github.com/rear/rear/issues/2810
 -                test $disktype || LogPrintError "No partition label type for 'disk $devname' (may cause 'rear recover' failure)"
 +                # Validation error can happen when /dev/sdX is an empty SD card slot without medium,
 +                # see https://github.com/rear/rear/issues/2810 https://github.com/rear/rear/issues/2958
 +                # this is normal, but such device must be skipped and not be added to the layout
 +                # - it does not contain any data anyway.
 +                # See https://github.com/rear/rear/pull/3047
 +                if ! validation_error=$(is_disk_valid $devname) ; then
 +                    LogPrintError "Ignoring $blockd: $validation_error"
 +                    continue
 +                fi
 +                disktype=$(parted -s $devname print | grep -E "Partition Table|Disk label" | cut -d ":" -f "2" | tr -d " ")
 +                test $disktype || Error "Invalid 'disk $devname' entry (no partition table type for '$devname')"
                 if [ "$disktype" != "dasd" ]; then
                     echo "# Disk $devname"
                     echo "# Format: disk <devname> <size(bytes)> <partition label type>"
 diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
 index 6dd43313..e46478d6 100644
 --- a/usr/share/rear/lib/layout-functions.sh
 +++ b/usr/share/rear/lib/layout-functions.sh
@@ -819,6 +819,41 @@ is_disk_a_pv() {
     return 1
 }
 +# Check whether disk is suitable for being added to layout
 +# Can be used to skip obviously unsuitable/broken devices
 +# (missing device node, zero size, device can't be opened).
 +# Should not be used to skip potential mapping targets before layout restoration
 +# - an invalid disk may become valid later, for example if it is a DASD that needs
 +# low-level formatting (see 090_include_dasd_code.sh and 360_generate_dasd_format_code.sh),
 +# unformatted DASDs show zero size.
 +# Returns 0 if the device is ok
 +# Returns nonzero code if it should be skipped, and a text describing the error
 +# on stdout
 +# usage example:
 +# local err
 +# if ! err=$(is_disk_valid /dev/sda); then
 +
 +function is_disk_valid {
 +    local disk="$1"
 +    local size
 +
 +    if ! test -b "$disk" ; then
 +        echo "$disk is not a block device"
 +        return 1
 +    fi
 +    # capture stdout in a variable and redirect stderr to stdout - the error message
 +    # will be our output
 +    if { size=$(blockdev --getsize64 "$disk") ; } 2>&1 ; then
 +        if ! test "$size" -gt 0 2>/dev/null ; then
 +            echo "$disk has invalid size $size"
 +            return 1
 +        fi
 +        return 0
 +    else
 +        return 1
 +    fi
 +}
 +
 function is_multipath_used {
     # Return 'false' if there is no multipath command:
     type multipath &>/dev/null || return 1
--- a/rear.cron
+++ b/rear.cron
@ -1,4 +0,0 @@
 # cronjob for ReaR
 # periodically check if disk layout has changed and update
 # the rescue image
 30 1 * * * root test -f /var/lib/rear/layout/disklayout.conf && /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue
--- a/rear.service
+++ b/rear.service
@ -1,6 +0,0 @@
 [Unit]
 Description=Update ReaR rescue image
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/rear checklayout || /usr/sbin/rear mkrescue
--- a/rear.spec
+++ b/rear.spec
@ -1,405 +0,0 @@
 # this is purely a shell script, so no debug packages
 %global debug_package %{nil}
 Name: rear
 Version: 2.7
 Release: 9%{?dist}
 Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool
 URL: https://relax-and-recover.org
 License: GPL-3.0-only
 Source0: https://github.com/rear/rear/archive/%{version}.tar.gz#/rear-%{version}.tar.gz
 # Add cronjob and systemd timer as documentation
 Source1: rear.cron
 Source2: rear.service
 Source3: rear.timer
 ######################
 # upstream backports #
 ######################
 # pass -y to lvcreate instead of piping the output of yes
 # https://github.com/rear/rear/commit/bca0e7a92af16cb7fb82ef04401cdb3286068081
 Patch101: rear-bz2104005.patch
 # fix initrd generation on s390x
 # https://github.com/rear/rear/commit/6d1e5ab96213a0d79489c4296cd1f5a4be645597
 Patch102: rear-bz2130945.patch
 # do not use ':' as a field separator in pvdisplay output
 # https://github.com/rear/rear/commit/29e739ae7c0651f8f77c60846bfbe2b6c91baa29
 Patch103: rear-bz2091163.patch
 # do not autoformat DASDs on s390x
 # https://github.com/rear/rear/commit/015c1ffd9fa96b01882b068714d3bc3aae3b5168
 Patch104: s390-no-clobber-disks.patch
 # continue when extracting shrank files with tar
 # https://github.com/rear/rear/commit/41c2d9b1fbcece4b0890ab92e9f5817621917ad3
 Patch105: rear-device-shrinking-bz2223895.patch
 # add secure boot support for OUTPUT=USB
 # https://github.com/rear/rear/commit/46b29195bff7f93cf5bd4c2dd83d69e5676800cb
 Patch106: rear-uefi-usb-secureboot-bz2196445.patch
 # remove the lvmdevices file at the end of recovery
 # https://github.com/rear/rear/commit/5a8c5086bf3fc28236436ff3ef27196509f0375d
 Patch107: rear-remove-lvmdevices-bz2145014.patch
 # save LVM pool metadata volume size in disk layout
 # https://github.com/rear/rear/commit/f6af518baf3b5a4dc06bf8cfea262e627eee3e07
 Patch108: rear-save-lvm-poolmetadatasize-RHEL-6984.patch
 # skip useless xfs mount options when mounting during recovery
 # https://github.com/rear/rear/commit/ed4c78d5fe493ea368989d0086a733653692f5cb
 Patch109: rear-skip-useless-xfs-mount-options-RHEL-10478.patch
 # fix unusable recovery with newer systemd
 # https://github.com/rear/rear/commit/060fef89b6968f0c8f254e6f612eff839b83c057
 Patch110: rear-fix-compatibility-with-newer-systemd-bz2254871.patch
 # make initrd accessible only by root
 # https://github.com/rear/rear/commit/89b61793d80bc2cb2abe47a7d0549466fb087d16
 Patch111: rear-CVE-2024-23301.patch
 # copy the console= kernel arguments from the original system
 # https://github.com/rear/rear/commit/42e04f36f5f8eea0017915bb35e56ee285b394d7
 # https://github.com/rear/rear/commit/07da02143b5597b202e66c187e53103561018255
 Patch112: rear-copy-console-kernel-cmdline-from-host.patch
 # support saving and restoring hybrid BIOS/UEFI bootloader setup and clean
 # up bootloader detection
 # https://github.com/rear/rear/commit/096bfde5e234f5a803bae74f24e3821798022c7c
 # https://github.com/rear/rear/pull/3145
 Patch113: rear-restore-hybrid-bootloader-RHEL-16864.patch
 # resolve libs for executable links in COPY_AS_IS
 # https://github.com/rear/rear/commit/9f859c13f5ba285cd1d5983c9b595975c21888d3
 Patch114: rear-resolve-libraries-for-symlinks-in-COPY_AS_IS-RHEL-15108.patch
 # skip invalid disk drives (zero sized, no media) when saving layout
 # https://github.com/rear/rear/commit/c08658d5a0260c3242bb817e77b9c6dadecd14f6
 Patch115: rear-skip-invalid-drives-RHEL-22863.patch
 ######################
 # downstream patches #
 ######################
 # suggest to install grub-efi-x64-modules on x86_64 UEFI Fedora/RHEL machines
 Patch201: rear-bz1492177-warning.patch
 # avoid vgcfgrestore on unsupported volume types
 # https://github.com/pcahyna/rear/commit/5d5d1db3ca621eb80b9481924d1fc470571cfc09
 Patch202: rear-bz1747468.patch
 # skip deliberately broken symlinks in initrd on Fedora/RHEL
 Patch203: rear-bz2119501.patch
 # additional fixes for NBU support
 Patch204: rear-bz2120736.patch
 Patch205: rear-bz2188593-nbu-systemd.patch
 Patch206: rear-nbu-RHEL-17390-RHEL-17393.patch
 # rear contains only bash scripts plus documentation so that on first glance it could be "BuildArch: noarch"
 # but actually it is not "noarch" because it only works on those architectures that are explicitly supported.
 # Of course the rear bash scripts can be installed on any architecture just as any binaries can be installed on any architecture.
 # But the meaning of architecture dependent packages should be on what architectures they will work.
 # Therefore only those architectures that are actually supported are explicitly listed.
 # This avoids that rear can be "just installed" on architectures that are actually not supported (e.g. ARM):
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 s390x
 # Furthermore for some architectures it requires architecture dependent packages (like syslinux for x86 and x86_64)
 # so that rear must be architecture dependent because ifarch conditions never match in case of "BuildArch: noarch"
 # see the GitHub issue https://github.com/rear/rear/issues/629
 %ifarch %ix86 x86_64
 Requires: syslinux
 # We need mkfs.vfat for recreating EFI System Partition
 Recommends: dosfstools
 %endif
 %ifarch ppc ppc64 ppc64le
 # Called by grub2-install (except on PowerNV)
 Requires:   /usr/sbin/ofpathname
 # Needed to make PowerVM LPARs bootable
 Requires:   /usr/sbin/bootlist
 %endif
 %ifarch s390x
 # Contain many utilities for working with DASDs
 Requires:   s390utils-base
 Requires:   s390utils-core
 %endif
 # Required for HTML user guide
 BuildRequires: make
 BuildRequires: asciidoctor
 ### Mandatory dependencies:
 Requires: binutils
 Requires: ethtool
 Requires: gzip
 Requires: iputils
 Requires: parted
 Requires: tar
 Requires: openssl
 Requires: gawk
 Requires: attr
 Requires: bc
 Requires: iproute
 # No ISO image support on s390x (may change when we add support for LPARs)
 %ifnarch s390x
 Requires:   xorriso
 %endif
 Requires: file
 Requires: dhcpcd
 %if 0%{?rhel}
 Requires: util-linux
 %endif
 Requires(post): /etc/os-release
 %description
 Relax-and-Recover is the leading Open Source disaster recovery and system
 migration solution. It comprises of a modular
 frame-work and ready-to-go workflows for many common situations to produce
 a bootable image and restore from backup using this image. As a benefit,
 it allows to restore to different hardware and can therefore be used as
 a migration tool as well.
 Currently Relax-and-Recover supports various boot media (incl. ISO, PXE,
 OBDR tape, USB or eSATA storage), a variety of network protocols (incl.
 sftp, ftp, http, nfs, cifs) as well as a multitude of backup strategies
 (incl.  IBM TSM, MircroFocus Data Protector, Symantec NetBackup, EMC NetWorker,
 Bacula, Bareos, BORG, Duplicity, rsync).
 Relax-and-Recover was designed to be easy to set up, requires no maintenance
 and is there to assist when disaster strikes. Its setup-and-forget nature
 removes any excuse for not having a disaster recovery solution implemented.
 Professional services and support are available.
 #-- PREP, BUILD & INSTALL -----------------------------------------------------#
 %prep
 %autosetup -p1
 # Change /lib to /usr/lib for COPY_AS_IS
 sed -E -e "s:([\"' ])/lib:\1/usr/lib:g" \
    -i usr/share/rear/prep/GNU/Linux/*include*.sh
 # Same for Linux.conf
 sed -e 's:/lib/:/usr/lib/:g' \
    -e 's:/lib\*/:/usr/lib\*/:g' \
    -e 's:/usr/usr/lib:/usr/lib:g' \
    -i 'usr/share/rear/conf/GNU/Linux.conf'
 %build
 # build HTML user guide
 # asciidoc writes a timestamp to files it produces, based on the last
 # modified date of the source file, but is sensitive to the timezone.
 # This makes the results differ according to the timezone of the build machine
 # and spurious changes will be seen.
 # Set the timezone to UTC as a workaround.
 # https://wiki.debian.org/ReproducibleBuilds/TimestampsInDocumentationGeneratedByAsciidoc
 TZ=UTC make doc
 %install
 %{make_install}
 install -p -d %{buildroot}%{_docdir}/%{name}/
 install -m 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/
 install -m 0644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/
 install -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
 %post
 # Regenerate /etc/rear/os.conf file after install.  Otherwise, it will
 # contain stale information after system upgrade.
 cat > %{_sysconfdir}/rear/os.conf <<EOF
 OS_VENDOR=%{?fedora:Fedora}%{?rhel:RedHatEnterpriseServer}
 OS_VERSION=$(. /etc/os-release; echo $VERSION_ID)
 EOF
 #-- FILES ---------------------------------------------------------------------#
 %files
 %license COPYING
 %doc MAINTAINERS README.adoc doc/*.txt doc/user-guide/*.html
 %config(noreplace) %{_sysconfdir}/rear/local.conf
 %ghost %{_sysconfdir}/rear/os.conf
 %{_datadir}/rear/
 %{_docdir}/%{name}/rear.*
 %{_mandir}/man8/rear.8*
 %{_sbindir}/rear
 %{_sharedstatedir}/rear/
 #-- CHANGELOG -----------------------------------------------------------------#
 %changelog
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.7-9
 - Bump release for June 2024 mass rebuild
 * Fri Feb 09 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-8
 - Sync with patches in CentOS Stream 9 (kudos to @pcahyna!) chronologically
  from the latest:
  - Resolve libs for executable links in COPY_AS_IS, PR 3073
  - Skip invalid disk drives when saving layout PR 3047
  - Do not delete NetBackup logs in case of errors and save
    /usr/openv/netbackup/logs to the restored system after a successful recovery
  - Add /usr/openv/var to COPY_AS_IS_NBU, fixes an issue seen
    with NetBackup 10.2.0.1
  - Support saving and restoring hybrid BIOS/UEFI bootloader, PRs 3145 3136
 * Thu Feb 08 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-7
 - do not generate /etc/rear/os.conf during build
 * Wed Feb 07 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-6
 - copy the console= kernel arguments from the original system
 * Tue Feb 06 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-5
 - replace dhcp-client with dhcpcd (rhbz#2247060)
 * Tue Feb 06 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-4
 - make initrd accessible only by root (CVE-2024-23301)
 * Tue Feb 06 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-3
 - fix unusable recovery with newer systemd (rbhz#2254871)
 * Mon Feb 05 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-2
 - migrate to SPDX license format
 - properly use %%license and %%doc macros
 - use https in URLs
 * Fri Feb 02 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.7-1
 - rebase to version 2.7 (rhbz#2215778)
 - drop obsolete patches
 - rebase remaining patches
 * Fri Feb  2 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.6-14
 - Sync with patches in CentOS Stream 9 (kudos to @pcahyna!) chronologically
  from the latest:
  - Backport PR 3061 to save LVM pool metadata volume size in disk layout
    and restore it
  - Backport PR 3058 to skip useless xfs mount options when mounting
    during recovery, prevents mount errors like "logbuf size must be greater
    than or equal to log stripe size"
  - Add patch to force removal of lvmdevices, prevents LVM problems after
    restoring to different disks/cloning. Upstream PR 3043
  - Add patch to start rsyslog and include NBU systemd units
  - Apply PR 3027 to ensure correct creation of the rescue environment
    when a file is shrinking while being read
  - Backport PR 2774 to increase USB_UEFI_PART_SIZE to 1024 MiB
  - Apply upstream patch for temp dir usage with LUKS to ensure
    that during recovery an encrypted disk can be unlocked using a keyfile
  - Backport upstream PR 3031: Secure Boot support for OUTPUT=USB
  - Correct a mistake done when backporting PR 2691
  - Backport PR2943 to fix s390x dasd formatting
  - Require s390utils-{core,base} on s390x
  - Apply PR2903 to protect against colons in pvdisplay output
  - Apply PR2873 to fix initrd regeneration on s390x
  - Apply PR2431 to migrate XFS configuration files
  - Exclude /etc/lvm/devices from the rescue system to work around a segfault
    in lvm pvcreate
  - Avoid stderr message about irrelevant broken links
  - Changes for NetBackup (NBU) 9.x support
  - Backport PR2831 - rsync URL refactoring
    fixes rsync OUTPUT_URL when different from BACKUP_URL
  - Apply PR2795 to detect changes in system files between backup
    and rescue image
  - Apply PR2808 to exclude dev/watchdog* from recovery system
  - Backport upstream PRs 2827 and 2839 to pass -y to lvcreate instead of one "y"
    on stdin
  - Apply PR2811 to add the PRE/POST_RECOVERY_COMMANDS directives
  - Recommend dosfstools on x86_64, needed for EFI System Partition
  - Backport PR2825 to replace defunct mkinitrd with dracut
  - Apply PR2580 to load the nvram module in the rescue environment in order
    to be able to set the boot order on ppc64le LPARs
  - Backport PR2822 to include the true vi executable in rescue ramdisk
  - Apply PR2675 to fix leftover temp dir bug (introduced in backported PR2625)
  - Apply PR2603 to ignore unused PV devices
  - Apply upstream PR2750 to avoid exclusion of wanted multipath devices
  - Remove unneeded xorriso dep on s390x (no ISO image support there)
  - Apply upstream PR2736 to add the EXCLUDE_{IP_ADDRESSES,NETWORK_INTERFACES}
    options
  - Add patch for better handling of thin pools and other LV types not supported
    by vgcfgrestore
  - Sync spec changes and downstream patches from RHEL 8 rear-2.6-2
    - Fix multipath performance regression in 2.6, introduced by upstream PR #2299.
      Resolves: rhbz1993296
    - On POWER add bootlist & ofpathname to the list of required programs
      conditionally (bootlist only if running under PowerVM, ofpathname
      always except on PowerNV) - upstream PR2665, add them to package
      dependencies
      Resolves: rhbz1983013
    - Backport PR2608:
      Fix setting boot path in case of UEFI partition (ESP) on MD RAID
      Resolves: rhbz1945869
    - Backport PR2625
      Prevents accidental backup removal in case of errors
      Resolves: rhbz1958247
    - Fix rsync error and option handling
      Resolves: rhbz1930662
  - Put TMPDIR on /var/tmp by default, otherwise it may lack space
    RHBZ #1988420, upstream PR2664
  - Sync spec changes and downstream patches from RHEL 8
    - Require xorriso instead of genisoimage
    - Add S/390 support and forgotten dependency on the file utility
    - Backport upstream code related to LUKS2 support
    - Modify the cron command to avoid an e-mail with error message after
      ReaR is installed but not properly configured when the cron command
      is triggered for the first time
    - Changes for NetBackup (NBU) support, upstream PR2544
  - Add dependency on dhcp-client, RHBZ #1926451
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 * Fri Jun 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6-10
 - Switch to xorriso for iso image creation
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 * Fri Feb 26 2021 Christopher Engelhard <ce@lcts.de> - 2.6-5
 - Change /lib to /usr/lib in scripts to fix RHBZ #1931112
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 * Wed Sep 23 2020 Christopher Engelhard <ce@lcts.de> - 2.6-3
 - Stop auto-creating a cronjob, but ship example cronjob/
  systemd timer units in docdir instead (upstream issue #1829)
 - Build & ship HTML user guide
 - Remove %pre scriptlet, as it was introduced only to fix a
  specific upgrade issue with v1.15 in 2014
 * Tue Sep 22 2020 Christopher Engelhard <ce@lcts.de> - 2.6-2
 - Backport upstream PR#2469 to fix RHBZ #1831311
 * Tue Sep 22 2020 Christopher Engelhard <ce@lcts.de> - 2.6-1
 - Update to 2.6
 - Streamline & clean up spec file
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 * Thu Jul 30 2015 Johannes Meixner <jsmeix@suse.de>
 - For a changelog see the rear-release-notes.txt file.
--- a/rear.timer
+++ b/rear.timer
@ -1,10 +0,0 @@
 [Unit]
 Description=Update ReaR rescue image
 [Timer]
 OnCalendar=daily
 RandomizedDelaySec=1h
 Persistent=true
 [Install]
 WantedBy=timers.target
--- a/1
+++ b/1
@ -1 +0,0 @@
 SHA512 (rear-2.7.tar.gz) = 9cabc6c5ddb01934740b73098a80bf1e0c03140ac1fce7c399752c1145bb743573033f6e34ae59a13e34fa873c8e992ce50316ee0260d23667614d5250daa087
`@ -1,2 +1 @@`
	`/rear-*.tar.gz`	`SOURCES/rear-2.6.tar.gz`
	`/rear-*/`
		`@ -1 +0,0 @@`
			`SHA512 (rear-2.7.tar.gz) = 9cabc6c5ddb01934740b73098a80bf1e0c03140ac1fce7c399752c1145bb743573033f6e34ae59a13e34fa873c8e992ce50316ee0260d23667614d5250daa087`