From 3c56b06ff62fce2ed01071cb2de3340cb55966e7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 7 Mar 2022 21:07:46 +0000 Subject: [PATCH] Fix shebang syntax in new libexec script --- ...x-se-luks-gencpio-Fix-shebang-syntax.patch | 24 +++++++++++++++++++ ...cpio-Use-interoperable-path-for-bash.patch | 10 ++++---- debian/patches/series | 1 + 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch diff --git a/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch b/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch new file mode 100644 index 00000000..645d6c56 --- /dev/null +++ b/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch @@ -0,0 +1,24 @@ +From: Simon McVittie +Date: Mon, 7 Mar 2022 21:06:48 +0000 +Subject: s390x-se-luks-gencpio: Fix shebang syntax + +An indented `#!` is technically meaningless, although many shells will +run text files with the shell if asked to execute them. + +Signed-off-by: Simon McVittie +--- + src/libostree/s390x-se-luks-gencpio | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio +index f0ad24e..729aff6 100755 +--- a/src/libostree/s390x-se-luks-gencpio ++++ b/src/libostree/s390x-se-luks-gencpio +@@ -1,5 +1,5 @@ +- #!/usr/bin/bash +- # This script creates new initramdisk with LUKS config within ++#!/usr/bin/bash ++# This script creates new initramdisk with LUKS config within + set -euo pipefail + + old_initrd=$1 diff --git a/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch b/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch index 24f55a2f..21f755fb 100644 --- a/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch +++ b/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch @@ -1,5 +1,5 @@ From: Simon McVittie -Date: Mon, 7 Mar 2022 19:23:09 +0000 +Date: Mon, 7 Mar 2022 21:07:25 +0000 Subject: s390x-se-luks-gencpio: Use interoperable path for bash On OSs that do not consistently merge /usr/bin with /bin, the path to @@ -11,12 +11,12 @@ Signed-off-by: Simon McVittie 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index f0ad24e..a62d43e 100755 +index 729aff6..7c94a44 100755 --- a/src/libostree/s390x-se-luks-gencpio +++ b/src/libostree/s390x-se-luks-gencpio @@ -1,4 +1,4 @@ -- #!/usr/bin/bash -+ #!/bin/bash - # This script creates new initramdisk with LUKS config within +-#!/usr/bin/bash ++#!/bin/bash + # This script creates new initramdisk with LUKS config within set -euo pipefail diff --git a/debian/patches/series b/debian/patches/series index c2a5e547..53aaf1d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ debian/Skip-test-pull-repeated-during-CI.patch +s390x-se-luks-gencpio-Fix-shebang-syntax.patch s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch test-prune-Read-to-the-end-of-cut-1-output.patch