60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
|
From 488cf7ad86eee4cd9138d5e58c1baefeeb5e8c98 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Thu, 10 Jul 2014 15:58:24 +0200
|
||
|
|
Subject: 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>
|
||
|
|
---
|
||
|
|
modules.d/91zipl/install_zipl_cmdline.sh | 2 +-
|
||
|
|
modules.d/91zipl/module-setup.sh | 2 +-
|
||
|
|
modules.d/91zipl/parse-zipl.sh | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
mode change 100644 => 100755 modules.d/91zipl/install_zipl_cmdline.sh
|
||
|
|
|
||
|
|
diff --git a/modules.d/91zipl/install_zipl_cmdline.sh b/modules.d/91zipl/install_zipl_cmdline.sh
|
||
|
|
old mode 100644
|
||
|
|
new mode 100755
|
||
|
|
index 8b454b8..3e939c1
|
||
|
|
--- 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 84bb41d..eda4c32 100644
|
||
|
|
--- a/modules.d/91zipl/module-setup.sh
|
||
|
|
+++ b/modules.d/91zipl/module-setup.sh
|
||
|
|
@@ -35,7 +35,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 f8c2ca4..308f228 100644
|
||
|
|
--- 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
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|