91zipl: Install script as executable

initqueue will only work with executable scripts, so we need to
mark it as such.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/modules.d/91zipl/install_zipl_cmdline.sh b/modules.d/91zipl/install_zipl_cmdline.sh
index 8b454b8248b1aa7b6cae250a28ec3b192199f6ca..3e939c15c11362f3586d10e3bb7e0a72b732dd05 100755 (executable)
--- a/modules.d/91zipl/install_zipl_cmdline.sh
+++ b/modules.d/91zipl/install_zipl_cmdline.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEV=$1
+DEV="$1"
 MNT=/boot/zipl
 
 if [ -z "$DEV" ] ; then

diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
index 4ca7e3048f4c698224cb7c13b16c4c13375b094b..d0cd75da720d71c0cbff42d72332edd425828ce6 100755 (executable)
--- a/modules.d/91zipl/module-setup.sh
+++ b/modules.d/91zipl/module-setup.sh
@@ -51,7 +51,7 @@ install() {
     inst_multiple mount umount
 
     inst_hook cmdline 91 "$moddir/parse-zipl.sh"
-    inst "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
+    inst_script "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
     if [[ $hostonly_cmdline == "yes" ]] ; then
         local _zipl=$(cmdline)
 

diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh
index f8c2ca4671badbd103c5e8c646686c7bc0061fcb..308f228bcfc09f2a559b4e92274a5d867c12c60a 100755 (executable)
--- a/modules.d/91zipl/parse-zipl.sh
+++ b/modules.d/91zipl/parse-zipl.sh
@@ -31,7 +31,7 @@ if [ -n "$zipl_arg" ] ; then
     esac
     if [ "$zipl_env" ] ; then
         {
-            printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/install_zipl_cmdline.sh %s"\n' \
+            printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", RUN+="/sbin/initqueue --settled --onetime --unique --name install_zipl_cmdline /sbin/install_zipl_cmdline.sh %s"\n' \
                 ${zipl_env} ${zipl_val} ${zipl_arg}
             echo "[ -f /tmp/install.zipl.cmdline-done ]" >$hookdir/initqueue/finished/wait-zipl-conf.sh
         } >> /etc/udev/rules.d/99zipl-conf.rules