Skip to content

Commit d75b029

Browse files
committed
fix(zipl): shellcheck for modules.d/91zipl
1 parent 2d98cb6 commit d75b029

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

modules.d/91zipl/.shchkdir

Whitespace-only changes.

modules.d/91zipl/install_zipl_cmdline.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ MNT=/boot/zipl
55

66
if [ -z "$DEV" ]; then
77
echo "No IPL device given"
8-
> /tmp/install.zipl.cmdline-done
8+
: > /tmp/install.zipl.cmdline-done
99
exit 1
1010
fi
1111

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

14-
mount -o ro ${DEV} ${MNT}
15-
if [ "$?" != "0" ]; then
14+
if ! mount -o ro "${DEV}" ${MNT}; then
1615
echo "Failed to mount ${MNT}"
17-
> /tmp/install.zipl.cmdline-done
16+
: > /tmp/install.zipl.cmdline-done
1817
exit 1
1918
fi
2019

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

2524
if [ -f ${MNT}/active_devices.txt ]; then
26-
while read dev etc; do
25+
while read -r dev _ || [[ $dev ]]; do
2726
[ "$dev" = "#" -o "$dev" = "" ] && continue
28-
cio_ignore -r $dev
27+
cio_ignore -r "$dev"
2928
done < ${MNT}/active_devices.txt
3029
fi
3130

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

4039
exit 0

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ installkernel() {
2424

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ if [ -n "$zipl_arg" ]; then
4242
if [ "$zipl_env" ]; then
4343
{
4444
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' \
45-
${zipl_env} ${zipl_val} ${zipl_arg}
46-
echo "[ -f /tmp/install.zipl.cmdline-done ]" > $hookdir/initqueue/finished/wait-zipl-conf.sh
45+
${zipl_env} "${zipl_val}" "${zipl_arg}"
46+
echo "[ -f /tmp/install.zipl.cmdline-done ]" > "$hookdir"/initqueue/finished/wait-zipl-conf.sh
4747
} >> /etc/udev/rules.d/99zipl-conf.rules
4848
cat /etc/udev/rules.d/99zipl-conf.rules
4949
fi

0 commit comments

Comments
 (0)