Browse Source

fix(zipl): shellcheck for modules.d/91zipl

master
Harald Hoyer 3 years ago committed by Harald Hoyer
parent
commit
d75b029a8c
  1. 0
      modules.d/91zipl/.shchkdir
  2. 13
      modules.d/91zipl/install_zipl_cmdline.sh
  3. 5
      modules.d/91zipl/module-setup.sh
  4. 4
      modules.d/91zipl/parse-zipl.sh

0
modules.d/91zipl/.shchkdir

13
modules.d/91zipl/install_zipl_cmdline.sh

@ -5,16 +5,15 @@ MNT=/boot/zipl @@ -5,16 +5,15 @@ MNT=/boot/zipl

if [ -z "$DEV" ]; then
echo "No IPL device given"
> /tmp/install.zipl.cmdline-done
: > /tmp/install.zipl.cmdline-done
exit 1
fi

[ -d ${MNT} ] || mkdir -p ${MNT}

mount -o ro ${DEV} ${MNT}
if [ "$?" != "0" ]; then
if ! mount -o ro "${DEV}" ${MNT}; then
echo "Failed to mount ${MNT}"
> /tmp/install.zipl.cmdline-done
: > /tmp/install.zipl.cmdline-done
exit 1
fi

@ -23,9 +22,9 @@ if [ -f ${MNT}/dracut-cmdline.conf ]; then @@ -23,9 +22,9 @@ if [ -f ${MNT}/dracut-cmdline.conf ]; then
fi

if [ -f ${MNT}/active_devices.txt ]; then
while read dev etc; do
while read -r dev _ || [[ $dev ]]; do
[ "$dev" = "#" -o "$dev" = "" ] && continue
cio_ignore -r $dev
cio_ignore -r "$dev"
done < ${MNT}/active_devices.txt
fi

@ -35,6 +34,6 @@ if [ -f /etc/cmdline.d/99zipl.conf ]; then @@ -35,6 +34,6 @@ if [ -f /etc/cmdline.d/99zipl.conf ]; then
systemctl restart dracut-cmdline.service
systemctl restart systemd-udev-trigger.service
fi
> /tmp/install.zipl.cmdline-done
: > /tmp/install.zipl.cmdline-done

exit 0

5
modules.d/91zipl/module-setup.sh

@ -24,7 +24,7 @@ installkernel() { @@ -24,7 +24,7 @@ installkernel() {

_boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
if [ -n "$_boot_zipl" ]; then
eval $(blkid -s TYPE -o udev ${_boot_zipl})
eval "$(blkid -s TYPE -o udev "${_boot_zipl}")"
if [ -n "$ID_FS_TYPE" ]; then
case "$ID_FS_TYPE" in
ext?)
@ -53,7 +53,8 @@ install() { @@ -53,7 +53,8 @@ install() {
inst_hook cmdline 91 "$moddir/parse-zipl.sh"
inst_script "${moddir}/install_zipl_cmdline.sh" /sbin/install_zipl_cmdline.sh
if [[ $hostonly_cmdline == "yes" ]]; then
local _zipl=$(cmdline)
local _zipl
_zipl=$(cmdline)

[[ $_zipl ]] && printf "%s\n" "$_zipl" > "${initdir}/etc/cmdline.d/91zipl.conf"
fi

4
modules.d/91zipl/parse-zipl.sh

@ -42,8 +42,8 @@ if [ -n "$zipl_arg" ]; then @@ -42,8 +42,8 @@ if [ -n "$zipl_arg" ]; then
if [ "$zipl_env" ]; then
{
printf 'ACTION=="add|change", SUBSYSTEM=="block", %s=="%s", ENV{SYSTEMD_READY}!="0", 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
${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
cat /etc/udev/rules.d/99zipl-conf.rules
fi

Loading…
Cancel
Save