Merge branch 'master' into ipv6

.packit.yaml

@@ -3,6 +3,7 @@ jobs:
 - job: copr_build
   targets:
   - fedora-all
+  - centos-stream-8-x86_64
   - centos-stream-9-x86_64
   - opensuse-leap-15.3-x86_64
   - opensuse-tumbleweed-x86_64
@@ -18,6 +19,7 @@ jobs:
   metadata:
   targets:
   - fedora-all
+  - centos-stream-8-x86_64
   - centos-stream-9-x86_64
 specfile_path: packaging/rpm/rear.spec
 files_to_sync:

doc/user-guide/14-ZYPPER-and-YUM.adoc

@@ -95,7 +95,7 @@ longer required after other RPMs had been removed (those are probably orphans).
 *Option: COPY_AS_IS_ZYPPER and COPY_AS_IS_EXCLUDE_ZYPPER*
 
 The COPY_AS_IS_ZYPPER array contains by default basically what `rpm -qc 
-zypper ; rpm -ql libzypp | egrep -v 'locale|man'` shows (currently determined 
+zypper ; rpm -ql libzypp | grep -Ev 'locale|man'` shows (currently determined 
 on openSUSE Leap 42.1) plus the special _/etc/products.d/baseproduct_ link 
 and whereto it points and rpm because that is required by zypper/libzypp and
 finally all kernel modules because otherwise modules like 'isofs' and some 

doc/user-guide/15-EFISTUB.adoc

@@ -140,7 +140,7 @@ BACKUP_PROG_EXCLUDE+=( /mnt )
 #BTRFS stuff
 REQUIRED_PROGS+=( snapper chattr lsattr xfs_repair )
 COPY_AS_IS+=( /usr/lib/snapper/installation-helper /etc/snapper/config-templates/default )
-BACKUP_PROG_INCLUDE=( $(findmnt -n -r -t btrfs | cut -d ' ' -f 1 | grep -v '^/$' | egrep -v 'snapshots|crash' ) )
+BACKUP_PROG_INCLUDE=( $(findmnt -n -r -t btrfs | cut -d ' ' -f 1 | grep -v '^/$' | grep -Ev 'snapshots|crash' ) )
 
 EFI_STUB=y
 ```

tests/setup1/verify.sh

@@ -10,7 +10,7 @@ echo
 echo "CASE $CASE"
 echo
 
-DEVICES="$( ls /sys/class/net/ | egrep -wv "(bonding_masters|eth0|lo)" )"
+DEVICES="$( ls /sys/class/net/ | grep -Ewv "(bonding_masters|eth0|lo)" )"
 
 # Cleanup of network interfaces
 for dev in $DEVICES; do
@@ -28,11 +28,11 @@ sleep 3
 tmpfile_ipa=$( mktemp /tmp/REARXXX )
 tmpfile_ipr=$( mktemp /tmp/REARXXX )
 
-DEVICES="$( ls /sys/class/net/ | egrep -wv "(bonding_masters|eth0|lo)" )"
+DEVICES="$( ls /sys/class/net/ | grep -Ewv "(bonding_masters|eth0|lo)" )"
 
 for dev in $DEVICES; do
 	ip addr show dev $dev
-done 2>/dev/null | egrep -w "(mtu|inet)" | sed -e "s/^[0-9]*: //" -e "s/ group \S* / /" > $tmpfile_ipa
+done 2>/dev/null | grep -Ew "(mtu|inet)" | sed -e "s/^[0-9]*: //" -e "s/ group \S* / /" > $tmpfile_ipa
 
 for dev in $DEVICES; do
 	ip r show dev $dev

tools/run-in-docker.bashrc

@@ -1,6 +1,6 @@
 PATH=/rear/tools:$PATH:/rear/usr/sbin
 
-alias egrep='egrep --color=auto'
+alias egrep='grep -E --color=auto'
 alias grep='grep --color=auto'
 alias l='ls -CF'
 alias la='ls -A'

usr/share/rear/backup/YUM/default/600_capture_selinux_contexts.sh

@@ -24,7 +24,7 @@ set -e -u -o pipefail
 local yum_backup_dir=$( dirname "$backuparchive" )
 test -d $yum_backup_dir || mkdir $verbose -p -m 755 $yum_backup_dir
 
-find $(cat $TMP_DIR/backup-include.txt) -xdev -exec stat -c "%C %n" {} \; | egrep -w -v -f $TMP_DIR/backup-exclude.txt > $yum_backup_dir/selinux_contexts.dat
+find $(cat $TMP_DIR/backup-include.txt) -xdev -exec stat -c "%C %n" {} \; | grep -E -w -v -f $TMP_DIR/backup-exclude.txt > $yum_backup_dir/selinux_contexts.dat
 
 # Go back from "set -e -u -o pipefail" to the defaults:
 apply_bash_flags_and_options_commands "$DEFAULT_BASH_FLAGS_AND_OPTIONS_COMMANDS"

usr/share/rear/build/GNU/Linux/390_copy_binaries_libraries.sh

@@ -21,12 +21,12 @@ function copy_binaries () {
         contains_visible_char "$binary" || continue
         if ! cp $verbose --archive --dereference --force "$binary" "$destdir" 1>&2 ; then
             # When a binary should be copied where its target already exists as dangling symlink
-            # e.g. when /sbin/lvcreate should be copied to /tmp/rear.XXX/rootfs/bin/lvcreate
-            # but there is already the dangling symlink /tmp/rear.XXX/rootfs/bin/lvcreate -> lvm
+            # e.g. when /sbin/lvcreate should be copied to /var/tmp/rear.XXX/rootfs/bin/lvcreate
+            # but there is already the dangling symlink /var/tmp/rear.XXX/rootfs/bin/lvcreate -> lvm
             # because its link target was not yet copied into the recovery system
             # cf. "create LVM symlinks" in build/GNU/Linux/005_create_symlinks.sh
             # then cp fails (regardless of the --force option) with an error message like
-            # cp: not writing through dangling symlink '/tmp/rear.XXX/rootfs/bin/lvcreate'
+            # cp: not writing through dangling symlink '/var/tmp/rear.XXX/rootfs/bin/lvcreate'
             # so we silently skip cp errors here regardless what the reason is why cp failed here
             # and add it to REQUIRED_PROGS to error out later if it is actually missing in the recovery system
             # (for binaries in PROGS copy_binaries is only called when it exists in the original system)

usr/share/rear/build/default/490_fix_broken_links.sh

@@ -66,7 +66,7 @@ pushd $ROOTFS_DIR
             # finalize/GNU/Linux/250_migrate_lun_wwid.sh
             # finalize/GNU/Linux/280_migrate_uuid_tags.sh
             # finalize/GNU/Linux/320_migrate_network_configuration_files.sh
-            if echo $link_target | egrep -q '^/(proc|sys|dev|run)/' ; then
+            if echo $link_target | grep -Eq '^/(proc|sys|dev|run)/' ; then
                 DebugPrint "Skip copying broken symlink '$broken_symlink' target '$link_target' on /proc/ /sys/ /dev/ or /run/"
                 continue
             fi

usr/share/rear/build/default/990_verify_rootfs.sh

@@ -70,9 +70,13 @@ DebugPrint "Testing each binary with 'ldd' and look for 'not found' libraries wi
 local backup_tool_LD_LIBRARY_PATH=""
 local binary=""
 local broken_binary_LD_LIBRARY_PATH=""
-local broken_binaries="no"
 local fatal_missing_library="no"
 local ldd_output=""
+local not_found_output=""
+local not_found_library=""
+local junk=""
+local actually_found_library=""
+local actually_missing_libraries="no"
 # Third-party backup tools may use LD_LIBRARY_PATH to find their libraries
 # so that for testing such third-party backup tools we must also use their
 # special LD_LIBRARY_PATH here, otherwise just use the default:
@@ -99,7 +103,7 @@ for binary in $( find $ROOTFS_DIR -type f \( -executable -o -name '*.so' -o -nam
     # Skip the ldd test for ReaR files (mainly bash scripts) where it does not make sense
     # (programs in the recovery system get all copied into /bin/ so it is /bin/rear)
     # cf. https://github.com/rear/rear/issues/2519#issuecomment-731196820
-    egrep -q "/lib/modules/|/lib.*/firmware/|$SHARE_DIR|/bin/rear$" <<<"$binary" && continue
+    grep -Eq "/lib/modules/|/lib.*/firmware/|$SHARE_DIR|/bin/rear$" <<<"$binary" && continue
     # Skip the ldd test for files that are not owned by a trusted user to mitigate possible ldd security issues
     # because some versions of ldd may directly execute the file (see "man ldd") as user 'root' here
     # cf. the RequiredSharedObjects code in usr/share/rear/lib/linux-functions.sh
@@ -159,27 +163,26 @@ for binary in $( find $ROOTFS_DIR -type f \( -executable -o -name '*.so' -o -nam
         broken_binary_LD_LIBRARY_PATH=$backup_tool_LD_LIBRARY_PATH
         Log "$binary requires additional libraries with backup tool specific LD_LIBRARY_PATH=$backup_tool_LD_LIBRARY_PATH"
     fi
-    # All tests had a 'not found' shared object dependency so the binary requires additional libraries
-    # without LD_LIBRARY_PATH and with LD_LIBRARY_PATH and with backup tool specific LD_LIBRARY_PATH:
-    broken_binaries="yes"
+    # At this point all tests had a 'not found' shared object dependency so the binary requires additional libraries
+    # without LD_LIBRARY_PATH and with LD_LIBRARY_PATH and with backup tool specific LD_LIBRARY_PATH.
     # Only for programs (i.e. files in a .../bin/... or .../sbin/... directory) treat a missing library as fatal
     # unless specified when a 'not found' reported library is not fatal (when the 'ldd' test was false alarm):
     if grep -q '/[s]*bin/' <<<"$binary" ; then
         # With an empty NON_FATAL_BINARIES_WITH_MISSING_LIBRARY grep -E '' would always match:
         if test "$NON_FATAL_BINARIES_WITH_MISSING_LIBRARY" ; then
             # A program with missing library is treated as fatal when it does not match the pattern:
             if grep -E -q "$NON_FATAL_BINARIES_WITH_MISSING_LIBRARY" <<<"$binary" ; then
-                LogPrintError "$binary requires additional libraries (specified as non-fatal)"
+                LogPrint "$binary requires libraries were 'ldd' shows 'not found' (specified as non-fatal)"
             else
-                LogPrintError "$binary requires additional libraries (fatal error)"
+                LogPrint "$binary requires libraries were 'ldd' shows 'not found' (fatal error)"
                 fatal_missing_library="yes"
             fi
         else
-            LogPrintError "$binary requires additional libraries (fatal error)"
+            LogPrint "$binary requires libraries were 'ldd' shows 'not found' (fatal by default)"
             fatal_missing_library="yes"
         fi
     else
-        LogPrintError "$binary requires additional libraries"
+        LogPrint "$binary requires libraries were 'ldd' shows 'not found'"
     fi
     # Run the same ldd call as above but now keep its whole stdout output.
     # The ldd call that results the final 'not found' shared object is the last of the above ldd calls that was run.
@@ -191,10 +194,27 @@ for binary in $( find $ROOTFS_DIR -type f \( -executable -o -name '*.so' -o -nam
     fi
     # Have the whole ldd output only in the log:
     Log "$ldd_output"
-    # Show only the missing libraries to the user to not flood his screen with tons of other ldd output lines:
-    PrintError "$( grep 'not found' <<<"$ldd_output" )"
+    # For each 'not found' shared object (i.e. a shared object that was 'not found' by 'ldd')
+    # check whether or not the shared object may exist nevertheless in the ReaR recovery system
+    # and if yes, we may sufficiently safely assume things are OK in the ReaR recovery system
+    # so we do not report it as missing to the user (for debugging we have all in the log)
+    # cf. https://github.com/rear/rear/issues/3021#issuecomment-2165453757
+    not_found_output="$( grep 'not found' <<<"$ldd_output" )"
+    # not_found_output is a string of multiple lines (separated by \n) that look e.g. like
+    #   libsystemd-shared-255.4-1.fc40.so => not found
+    #   /path/to/library => not found
+    while read not_found_library junk ; do
+        # We prefer a simple 'grep -q' pipe over dealing with find -name versus -path options:
+        if actually_found_library="$( find $ROOTFS_DIR -xdev | grep "$not_found_library" )" ; then
+            LogPrint "$binary requires $not_found_library which was not found by 'ldd' but exists as $actually_found_library"
+        else
+            actually_missing_libraries="yes"
+            # Show only the missing libraries to the user to not flood his screen with tons of other ldd output lines:
+            LogPrintError "$binary requires $not_found_library which could not be found in the ReaR recovery system"
+        fi
+    done <<<"$not_found_output"
 done
-is_true $broken_binaries && LogPrintError "ReaR recovery system in '$ROOTFS_DIR' needs additional libraries, check $RUNTIME_LOGFILE for details"
+is_true $actually_missing_libraries && LogPrintError "ReaR recovery system in '$ROOTFS_DIR' needs additional libraries, check $RUNTIME_LOGFILE for details"
 is_true $fatal_missing_library && keep_build_dir
 
 # Testing that each program in the PROGS array can be found as executable command within the recovery system

usr/share/rear/build/default/995_md5sums_rootfs.sh

@@ -50,6 +50,6 @@ pushd $ROOTFS_DIR 1>&2
     # firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
     # firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
     # cf. https://github.com/rear/rear/issues/2407
-    find . -xdev -type f -print0 | egrep -z -v '/md5sums\.txt|/\.gitignore|~$|/dev/' | xargs -0 md5sum -b >>$md5sums_file || cat /dev/null >$md5sums_file
+    find . -xdev -type f -print0 | grep -E -z -v '/md5sums\.txt|/\.gitignore|~$|/dev/' | xargs -0 md5sum -b >>$md5sums_file || cat /dev/null >$md5sums_file
 popd 1>&2
 

usr/share/rear/conf/default.conf

@@ -2970,7 +2970,7 @@ NETFS_KEEP_OLD_BACKUP_COPY=
 # For backup program that do not support to save and restore file capabilities
 # the user can manually specify NETFS_RESTORE_CAPABILITIES as a workaround
 # cf. https://github.com/rear/rear/issues/1175
-# Furthermore BUILD_DIR (i.e. usually /tmp/rear.XXXXXXXXXXXXXXX cf. TMPDIR above) and
+# Furthermore BUILD_DIR (i.e. usually /var/tmp/rear.XXXXXXXXXXXXXXX cf. TMPDIR above) and
 # ISO_DIR are automatically excluded cf. rescue/NETFS/default/610_save_capabilities.sh
 NETFS_RESTORE_CAPABILITIES=( 'No' )
 ####
@@ -3098,7 +3098,7 @@ ZYPPER_REPOSITORIES=( "cd:///?devices=/dev/sr0" )
 # or are no longer required after other RPMs had been removed (those are probably orphans):
 ZYPPER_INSTALL_RPMS=""
 # The COPY_AS_IS_ZYPPER array contains by default basically what
-#   rpm -qc zypper ; rpm -ql libzypp | egrep -v 'locale|man'
+#   rpm -qc zypper ; rpm -ql libzypp | grep -Ev 'locale|man'
 # shows (currently determined on openSUSE Leap 42.1)
 # plus the special /etc/products.d/baseproduct link and where to it points
 # and rpm because that is required by zypper/libzypp and

usr/share/rear/conf/examples/SLE12-SP1-btrfs-example.conf

@@ -57,7 +57,7 @@ COPY_AS_IS+=( /usr/lib/snapper/installation-helper /etc/snapper/config-templates
 #   /.snapshots  /var/crash
 # but files in /home are included to be in the backup.
 # You may use a command like
-#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | egrep -v 'snapshots|crash'
+#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | grep -Ev 'snapshots|crash'
 # to generate the values:
 BACKUP_PROG_INCLUDE=( /var/tmp /srv /var/lib/pgsql /var/spool /var/lib/libvirt/images /var/opt/ /tmp /var/lib/named /var/log /boot/grub2/i386 /var/lib/mariadb /home /var/lib/mailman /opt /usr/local /boot/grub2/x86_64 )
 # Set a root password for the ReaR recovery system in a confidential way

usr/share/rear/conf/examples/SLE12-SP2-btrfs-example.conf

@@ -59,7 +59,7 @@ COPY_AS_IS+=( /usr/lib/snapper/installation-helper /etc/snapper/config-templates
 #   /.snapshots  /var/crash
 # but files in /home are included to be in the backup.
 # You may use a command like
-#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | egrep -v 'snapshots|crash'
+#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | grep -Ev 'snapshots|crash'
 # to generate the values:
 BACKUP_PROG_INCLUDE=( /var/cache /var/lib/mailman /var/tmp /var/lib/pgsql /usr/local /opt /var/lib/libvirt/images /boot/grub2/i386-pc /var/opt /srv /boot/grub2/x86_64-efi /var/lib/mariadb /var/spool /var/lib/mysql /tmp /home /var/log /var/lib/named /var/lib/machines )
 # The following POST_RECOVERY_SCRIPT implements during "rear recover"

usr/share/rear/conf/examples/SLE12-btrfs-example.conf

@@ -35,7 +35,7 @@ NETFS_KEEP_OLD_BACKUP_COPY=yes
 #   /.snapshots  /var/crash
 # but files in /home are included to be in the backup.
 # You may use a command like
-#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | egrep -v 'snapshots|crash'
+#   findmnt -n -r -o TARGET -t btrfs | grep -v '^/$' | grep -Ev 'snapshots|crash'
 # to generate the values:
 BACKUP_PROG_INCLUDE=( /home /var/tmp /var/spool /var/opt /var/log /var/lib/pgsql /var/lib/mailman /var/lib/named /usr/local /tmp /srv /boot/grub2/x86_64-efi /opt /boot/grub2/i386-pc )
 # Set a root password for the ReaR recovery system in a confidential way

usr/share/rear/finalize/Fedora/550_rebuild_initramfs.sh

@@ -67,10 +67,10 @@ WITH_INITRD_MODULES=$( printf '%s\n' $INITRD_MODULES | awk '{printf "--add-drive
 # kdump images as they are build by kdump
 # initramfs rescue images (>= Rhel 7), which need all modules and are created by new-kernel-pkg
 # initrd-plymouth.img (>= Rhel 7), which contains only files needed for graphical boot via plymouth
-for INITRD_IMG in $( ls $TARGET_FS_ROOT/boot/initramfs-*.img $TARGET_FS_ROOT/boot/initrd-*.img | egrep -v '(kdump|rescue|plymouth)' ) ; do
+for INITRD_IMG in $( ls $TARGET_FS_ROOT/boot/initramfs-*.img $TARGET_FS_ROOT/boot/initrd-*.img | grep -Ev '(kdump|rescue|plymouth)' ) ; do
     # Do not use KERNEL_VERSION here because that is readonly in the rear main script:
     kernel_version=$( basename $( echo $INITRD_IMG ) | cut -f2- -d"-" | sed s/"\.img"// )
-    INITRD=$( echo $INITRD_IMG | egrep -o "/boot/.*" )
+    INITRD=$( echo $INITRD_IMG | grep -Eo "/boot/.*" )
     LogPrint "Running dracut..."
     # Run dracut directly in chroot without a login shell in between (see https://github.com/rear/rear/issues/862).
     # We need the dracut binary in the chroot environment i.e. the dracut binary in the recreated system.

usr/share/rear/finalize/GNU/Linux/250_migrate_disk_devices_layout.sh

@@ -56,7 +56,7 @@ do
             # 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
             # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
-            if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
+            if echo $symlink_target | grep -Eq '/proc/|/sys/|/dev/|/run/' ; then
                 LogPrint "Skip patching symlink $restored_file target $symlink_target on /proc/ /sys/ /dev/ or /run/"
                 continue
             fi

usr/share/rear/finalize/GNU/Linux/250_migrate_lun_wwid.sh

@@ -51,7 +51,7 @@ do
             # 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
             # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
-            if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
+            if echo $symlink_target | grep -Eq '/proc/|/sys/|/dev/|/run/' ; then
                 LogPrint "Skip patching symlink $restored_file target $symlink_target on /proc/ /sys/ /dev/ or /run/"
                 continue
             fi

usr/share/rear/finalize/GNU/Linux/260_rename_diskbyid.sh

@@ -97,7 +97,7 @@ for file in $FILES; do
             # 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
             # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
-            if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
+            if echo $symlink_target | grep -Eq '/proc/|/sys/|/dev/|/run/' ; then
                 LogPrint "Skip patching symlink $realfile target $symlink_target on /proc/ /sys/ /dev/ or /run/"
                 continue
             fi

usr/share/rear/finalize/GNU/Linux/280_migrate_uuid_tags.sh

@@ -50,7 +50,7 @@ do
             # 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
             # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
-            if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
+            if echo $symlink_target | grep -Eq '/proc/|/sys/|/dev/|/run/' ; then
                 LogPrint "Skip patching symlink $restored_file target $symlink_target on /proc/ /sys/ /dev/ or /run/"
                 continue
             fi

usr/share/rear/finalize/GNU/Linux/320_migrate_network_configuration_files.sh

@@ -81,7 +81,7 @@ function valid_restored_file_for_patching () {
     # 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
     # cf. https://github.com/rear/rear/pull/2047#issuecomment-464846777
-    if echo $symlink_target | egrep -q '/proc/|/sys/|/dev/|/run/' ; then
+    if echo $symlink_target | grep -Eq '/proc/|/sys/|/dev/|/run/' ; then
         Log "Skip patching symlink $restored_file target $symlink_target on /proc/ /sys/ /dev/ or /run/"
         return 1
     fi

usr/share/rear/layout/compare/default/500_compare_layout.sh

@@ -1,7 +1,7 @@
 # Test if ORIG_LAYOUT and TEMP_LAYOUT are the same.
 
 # Usually ORIG_LAYOUT is of the form var/lib/rear/layout/disklayout.conf
-# and TEMP_LAYOUT is of the form /tmp/rear.XXXX/tmp/checklayout.conf
+# and TEMP_LAYOUT is of the form /var/tmp/rear.XXXX/tmp/checklayout.conf
 # see lib/checklayout-workflow.sh
 
 # In case of btrfs the ordering of the btrfsmountedsubvol entries is random

usr/share/rear/layout/save/GNU/Linux/200_partition_layout.sh

@@ -474,5 +474,5 @@ Log "Saving disks and their partitions"
 # what program calls are written to diskrestore.sh and which programs will be run during "rear recover" in any case
 # e.g. mdadm is not called in any case and sfdisk is only used in case of BLOCKCLONE_STRICT_PARTITIONING
 # cf. https://github.com/rear/rear/issues/1963
-egrep -q '^disk |^part ' $DISKLAYOUT_FILE && REQUIRED_PROGS+=( parted partprobe ) || true
+grep -Eq '^disk |^part ' $DISKLAYOUT_FILE && REQUIRED_PROGS+=( parted partprobe ) || true