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 remote-tracking branch 'github/master'

master
Harald Hoyer 2015-05-18 13:28:00 +02:00
parent 10e59202c7 79bc77d2f4
commit 27c9d1f20f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dracut-functions.sh
View File

@ -977,7 +977,7 @@ inst_rules_wildcard() {
_found=$_rule _found=$_rule
fi fi
done done
if [ -n ${hostonly} ] ; then if [[ -n ${hostonly} ]] ; then
for _rule in ${_target}/$1 ; do for _rule in ${_target}/$1 ; do
if [[ -f $_rule ]]; then if [[ -f $_rule ]]; then
inst_rule_programs "$_rule" inst_rule_programs "$_rule"

2
modules.d/50plymouth/module-setup.sh
View File

@ -3,7 +3,7 @@
# called by dracut # called by dracut
check() { check() {
[[ "$mount_needs" ]] && return 1 [[ "$mount_needs" ]] && return 1
require_binaries plymouthd plymouth require_binaries plymouthd plymouth plymouth-set-default-theme
} }


# called by dracut # called by dracut

4
modules.d/90crypt/crypt-lib.sh
View File

@ -42,10 +42,10 @@ ask_for_password() {


while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
--cmd) ply_cmd="$2"; tty_cmd="$2" shift;; --cmd) ply_cmd="$2"; tty_cmd="$2"; shift;;
--ply-cmd) ply_cmd="$2"; shift;; --ply-cmd) ply_cmd="$2"; shift;;
--tty-cmd) tty_cmd="$2"; shift;; --tty-cmd) tty_cmd="$2"; shift;;
--prompt) ply_prompt="$2"; tty_prompt="$2" shift;; --prompt) ply_prompt="$2"; tty_prompt="$2"; shift;;
--ply-prompt) ply_prompt="$2"; shift;; --ply-prompt) ply_prompt="$2"; shift;;
--tty-prompt) tty_prompt="$2"; shift;; --tty-prompt) tty_prompt="$2"; shift;;
--tries) ply_tries="$2"; tty_tries="$2"; shift;; --tries) ply_tries="$2"; tty_tries="$2"; shift;;