From 7d915f9ce861f999d6fc559e7a466a32c7e4aec9 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 9 Sep 2022 16:44:27 +0200 Subject: [PATCH 13/32] Make shellcheck happy again Fixing: ``` 85sys-upgrade-redhat/do-upgrade.sh:236:37: warning[SC2166]: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined. ``` It's not a real issue as we do not care about the order of the evaluation, but making shellcheck happy. --- .../files/dracut/85sys-upgrade-redhat/do-upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh index 1f39a6b2..ff491316 100755 --- a/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh +++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh @@ -233,7 +233,7 @@ do_upgrade() { # on aarch64 systems during el8 to el9 upgrades the swap is broken due to change in page size (64K to 4k) # adjust the page size before booting into the new system, as it is possible the swap is necessary for to boot # `arch` command is not available in the dracut shell, using uname -m instead - [ "$(uname -m)" = "aarch64" -a "$RHEL_OS_MAJOR_RELEASE" = "9" ] && { + [ "$(uname -m)" = "aarch64" ] && [ "$RHEL_OS_MAJOR_RELEASE" = "9" ] && { cp -aS ".leapp_bp" $NEWROOT/etc/fstab /etc/fstab # swapon internally uses mkswap and both swapon and mkswap aren't available in dracut shell # as a workaround we can use the one from $NEWROOT in $NEWROOT/usr/sbin -- 2.38.1