packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shebang syntax in new libexec script

This commit is contained in:
Simon McVittie 2022-03-07 21:07:46 +00:00
parent d882fdba24
commit 3c56b06ff6
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch vendored Normal file
View File

@ -0,0 +1,24 @@
From: Simon McVittie <smcv@debian.org>
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 <smcv@debian.org>
---
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

10
debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch vendored
View File

@ -1,5 +1,5 @@
From: Simon McVittie <smcv@debian.org>
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 <smcv@debian.org>
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

1
debian/patches/series vendored
View File

@ -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