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

Merge pull request #128 from AlexanderKurtz/master 

dracut-systemd/dracut-cmdline.sh: Don't error out if there is no root…
master
Harald Hoyer 2016-05-11 09:23:05 +02:00
parent a365b67db0 016613c774
commit d6145ece6d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules.d/98dracut-systemd/dracut-cmdline.sh
View File

@ -21,7 +21,12 @@ getargbool 0 rd.udev.log-priority=debug -d rd.udev.debug -d -n -y rdudevdebug &&


source_conf /etc/conf.d source_conf /etc/conf.d


root=$(getarg root=) # Get the "root=" parameter from the kernel command line, but differentiate
# between the case where it was set to the empty string and the case where it
# wasn't specified at all.
if ! root="$(getarg root=)"; then
root='UNSET'
fi


rflags="$(getarg rootflags=)" rflags="$(getarg rootflags=)"
getargbool 0 ro && rflags="${rflags},ro" getargbool 0 ro && rflags="${rflags},ro"
@ -65,9 +70,12 @@ case "$root" in
/dev/*) /dev/*)
root="block:${root}" root="block:${root}"
rootok=1 ;; rootok=1 ;;
UNSET|gpt-auto)
# systemd's gpt-auto-generator handles this case.
rootok=1 ;;
esac esac


[ -z "$root" ] && die "No or empty root= argument" [ -z "$root" ] && die "Empty root= argument"
[ -z "$rootok" ] && die "Don't know how to handle 'root=$root'" [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"


export root rflags fstype netroot NEWROOT export root rflags fstype netroot NEWROOT