From 6d806be080c6b50c528e579d05888db355b8273a Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Tue, 22 Aug 2023 13:33:20 +0200 Subject: [PATCH] Correct a mistake done when backporting PR 2691 Resolves: rhbz2121476 --- rear-vg-command-not-found-bz2121476.patch | 21 +++++++++++++++++++++ rear.spec | 1 + 2 files changed, 22 insertions(+) create mode 100644 rear-vg-command-not-found-bz2121476.patch diff --git a/rear-vg-command-not-found-bz2121476.patch b/rear-vg-command-not-found-bz2121476.patch new file mode 100644 index 0000000..6d6ab1d --- /dev/null +++ b/rear-vg-command-not-found-bz2121476.patch @@ -0,0 +1,21 @@ +commit ead05a460d3b219372f47be888ba6011c7fd3318 +Author: Pavel Cahyna +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 diff --git a/rear.spec b/rear.spec index d47f53c..7aa69af 100644 --- a/rear.spec +++ b/rear.spec @@ -49,6 +49,7 @@ 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 # 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.