Browse Source

dracut-lib.sh: change -f to -e to allow symlinks

master
Harald Hoyer 16 years ago
parent
commit
54a73cbb2b
  1. 10
      modules.d/99base/dracut-lib.sh

10
modules.d/99base/dracut-lib.sh

@ -1,7 +1,7 @@
getarg() { getarg() {
local o line local o line
if [ -z "$CMDLINE" ]; then if [ -z "$CMDLINE" ]; then
[ -f /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline; [ -e /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline;
read CMDLINE </proc/cmdline; read CMDLINE </proc/cmdline;
CMDLINE="$CMDLINE $CMDLINE_ETC" CMDLINE="$CMDLINE $CMDLINE_ETC"
fi fi
@ -15,7 +15,7 @@ getarg() {
getargs() { getargs() {
local o line found local o line found
if [ -z "$CMDLINE" ]; then if [ -z "$CMDLINE" ]; then
[ -f /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline; [ -e /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline;
read CMDLINE </proc/cmdline; read CMDLINE </proc/cmdline;
CMDLINE="$CMDLINE $CMDLINE_ETC" CMDLINE="$CMDLINE $CMDLINE_ETC"
fi fi
@ -33,19 +33,19 @@ getargs() {
source_all() { source_all() {
local f local f
[ "$1" ] && [ -d "/$1" ] || return [ "$1" ] && [ -d "/$1" ] || return
for f in "/$1"/*.sh; do [ -f "$f" ] && . "$f"; done for f in "/$1"/*.sh; do [ -e "$f" ] && . "$f"; done
} }


check_finished() { check_finished() {
local f local f
for f in /initqueue-finished/*.sh; do { [ -f "$f" ] && ( . "$f" ) ; } || return 1 ; done for f in /initqueue-finished/*.sh; do { [ -e "$f" ] && ( . "$f" ) ; } || return 1 ; done
return 0 return 0
} }


source_conf() { source_conf() {
local f local f
[ "$1" ] && [ -d "/$1" ] || return [ "$1" ] && [ -d "/$1" ] || return
for f in "/$1"/*.conf; do [ -f "$f" ] && . "$f"; done for f in "/$1"/*.conf; do [ -e "$f" ] && . "$f"; done
} }


die() { die() {

Loading…
Cancel
Save