]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
dracut: make module-setup.sh shebang explicit
authorAntonio Russo <antonio.e.russo@gmail.com>
Tue, 10 Oct 2017 21:21:32 +0000 (17:21 -0400)
committerAron Xu <aron@debian.org>
Tue, 31 Oct 2017 10:26:51 +0000 (18:26 +0800)
debian/patches/0008-dracut-make-module-setup.sh-shebang-explicit.patch [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/0008-dracut-make-module-setup.sh-shebang-explicit.patch b/debian/patches/0008-dracut-make-module-setup.sh-shebang-explicit.patch
new file mode 100644 (file)
index 0000000..3114035
--- /dev/null
@@ -0,0 +1,42 @@
+From: Fabian-Gruenbichler <f.gruenbichler@proxmox.com>
+Date: Mon, 14 Aug 2017 19:56:04 +0200
+Subject: dracut: make module-setup.sh shebang explicit
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+while these are source by dracut (which is a bash script)
+the practical difference is small, but it is more correct:
+
+/bin/sh is not bash on all systems (e.g. Debian and its
+derivatives use /bin/dash as /bin/sh by default).
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Closes #6491
+(cherry picked from commit 42a76fc8d757ab82fc1ce8e5e1f2079e07a5b9d4)
+---
+ contrib/dracut/02zfsexpandknowledge/module-setup.sh.in | 2 +-
+ contrib/dracut/90zfs/module-setup.sh.in                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
+index 981beb3..c22141f 100755
+--- a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
++++ b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ get_devtype() {
+   local typ
+diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
+index 9bbee0e..7632cbc 100755
+--- a/contrib/dracut/90zfs/module-setup.sh.in
++++ b/contrib/dracut/90zfs/module-setup.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ check() {
+       # We depend on udev-rules being loaded
index 5714ff20cf900b34cb18399a0165ec9a09001e8b..ca6cf665759cf71e1caac070c19593f3fd6fb291 100644 (file)
@@ -4,3 +4,4 @@
 enable-zed.patch
 1001-cmd-python-exec-path.patch
 1004-zed-service-bindir.patch
+0008-dracut-make-module-setup.sh-shebang-explicit.patch