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

95iscsi/iscsiroot.sh: fix for empty $root

master
Harald Hoyer 2012-03-08 12:26:00 +01:00
parent 0635530dda
commit f8208d682f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules.d/95iscsi/iscsiroot.sh
View File

@ -40,7 +40,7 @@ modprobe crc32c 2>/dev/null
[ -e /sys/module/bnx2i ] && iscsiuio [ -e /sys/module/bnx2i ] && iscsiuio


if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then
if [ -n "${root%%block:*}" ]; then if [ -z "$root" -o -n "${root%%block:*}" ]; then
# if root is not specified try to mount the whole iSCSI LUN # if root is not specified try to mount the whole iSCSI LUN
printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules
udevadm control --reload udevadm control --reload
@ -167,9 +167,12 @@ handle_netroot()


# FIXME $iscsi_protocol?? # FIXME $iscsi_protocol??


if [ -n "${root%%block:*}" ]; then if [ -z "$root" -o -n "${root%%block:*}" ]; then
# if root is not specified try to mount the whole iSCSI LUN # if root is not specified try to mount the whole iSCSI LUN
printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules

# install mount script
echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
fi fi


# inject new exit_if_exists # inject new exit_if_exists
@ -185,12 +188,6 @@ handle_netroot()
${iscsi_password+-w $iscsi_password} \ ${iscsi_password+-w $iscsi_password} \
${iscsi_in_username+-U $iscsi_in_username} \ ${iscsi_in_username+-U $iscsi_in_username} \
${iscsi_in_password+-W $iscsi_in_password} || : ${iscsi_in_password+-W $iscsi_in_password} || :

# install mount script
if [ -n "${root%%block:*}" ]; then
# if root is not specified try to mount the whole iSCSI LUN
echo "iscsi_lun=$iscsi_lun . /bin/mount-lun.sh " > $hookdir/mount/01-$$-iscsi.sh
fi
} }


# loop over all netroot parameter # loop over all netroot parameter