kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(fstab-sys): shellcheck for modules.d/95fstab-sys

master
Harald Hoyer 2021-03-26 10:29:27 +01:00 committed by Harald Hoyer
parent d8d0b03cb4
commit 3a04fdff87
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules.d/95fstab-sys/.shchkdir Normal file
View File

16
modules.d/95fstab-sys/mount-sys.sh
View File

@ -4,24 +4,24 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
type det_fs > /dev/null 2>&1 || . /lib/fs-lib.sh type det_fs > /dev/null 2>&1 || . /lib/fs-lib.sh


fstab_mount() { fstab_mount() {
local _dev _mp _fs _opts _dump _pass _rest local _dev _mp _fs _opts _pass
test -e "$1" || return 1 test -e "$1" || return 1
info "Mounting from $1" info "Mounting from $1"
while read _dev _mp _fs _opts _dump _pass _rest || [ -n "$_dev" ]; do while read -r _dev _mp _fs _opts _ _pass _ || [ -n "$_dev" ]; do
[ -z "${_dev%%#*}" ] && continue # Skip comment lines [ -z "${_dev%%#*}" ] && continue # Skip comment lines
ismounted $_mp && continue # Skip mounted filesystem ismounted "$_mp" && continue # Skip mounted filesystem
if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then if [ "$_pass" -gt 0 ] && ! strstr "$_opts" _netdev; then
fsck_single "$_dev" "$_fs" "$_opts" fsck_single "$_dev" "$_fs" "$_opts"
fi fi
_fs=$(det_fs "$_dev" "$_fs") _fs=$(det_fs "$_dev" "$_fs")
info "Mounting $_dev" info "Mounting $_dev"
if [ -d "$NEWROOT/$_mp" ]; then if [ -d "$NEWROOT/$_mp" ]; then
mount -v -t $_fs -o $_opts $_dev "$NEWROOT/$_mp" 2>&1 | vinfo mount -v -t "$_fs" -o "$_opts" "$_dev" "$NEWROOT/$_mp" 2>&1 | vinfo
else else
[ -d "$_mp" ] || mkdir -p "$_mp" [ -d "$_mp" ] || mkdir -p "$_mp"
mount -v -t $_fs -o $_opts $_dev $_mp 2>&1 | vinfo mount -v -t "$_fs" -o "$_opts" "$_dev" "$_mp" 2>&1 | vinfo
fi fi
done < $1 done < "$1"
return 0 return 0
} }


@ -32,8 +32,8 @@ if [ -z "$DRACUT_SYSTEMD" ]; then
fi fi


# prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys # prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
if [ -f $NEWROOT/etc/fstab.sys ]; then if [ -f "$NEWROOT"/etc/fstab.sys ]; then
fstab_mount $NEWROOT/etc/fstab.sys fstab_mount "$NEWROOT"/etc/fstab.sys
elif [ -f /etc/fstab.sys ]; then elif [ -f /etc/fstab.sys ]; then
fstab_mount /etc/fstab.sys fstab_mount /etc/fstab.sys
fi fi