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

dracut.sh: check for file existance before trying to read from it

master
Harald Hoyer 2013-07-30 15:33:10 +02:00
parent 71bb2ecd79
commit 7fd850d58e
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dracut.sh
View File

@ -876,30 +876,35 @@ if [[ $hostonly ]]; then
push host_devs "$_dev" push host_devs "$_dev"
done done


while read dev type rest; do if [[ -f /proc/swaps ]] && [[ -f /etc/fstab ]]; then
[[ -b $dev ]] || continue while read dev type rest; do
[[ "$type" == "partition" ]] || continue [[ -b $dev ]] || continue
while read _d _m _t _o _r; do [[ "$type" == "partition" ]] || continue
[[ "$_d" == \#* ]] && continue
[[ $_d ]] || continue
[[ $_t != "swap" ]] || [[ $_m != "swap" ]] && continue
[[ "$_o" == *noauto* ]] && continue
[[ "$_d" == UUID\=* ]] && _d="/dev/disk/by-uuid/${_d#UUID=}"
[[ "$_d" == LABEL\=* ]] && _d="/dev/disk/by-label/$_d#LABEL=}"
[[ "$_d" -ef "$dev" ]] || continue


while read _mapper _a _p _o; do while read _d _m _t _o _r; do
[[ $_mapper = \#* ]] && continue [[ "$_d" == \#* ]] && continue
[[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue [[ $_d ]] || continue
[[ "$_o" ]] || _o="$_p" [[ $_t != "swap" ]] || [[ $_m != "swap" ]] && continue
[[ "$_o" == *noauto* ]] && continue
[[ "$_d" == UUID\=* ]] && _d="/dev/disk/by-uuid/${_d#UUID=}"
[[ "$_d" == LABEL\=* ]] && _d="/dev/disk/by-label/$_d#LABEL=}"
[[ "$_d" -ef "$dev" ]] || continue

if [[ -f /etc/crypttab ]]; then
while read _mapper _a _p _o; do
[[ $_mapper = \#* ]] && continue
[[ "$_d" -ef /dev/mapper/"$_mapper" ]] || continue
[[ "$_o" ]] || _o="$_p"
# skip mkswap swap # skip mkswap swap
[[ $_o == *swap* ]] && continue 2 [[ $_o == *swap* ]] && continue 2
done < /etc/crypttab done < /etc/crypttab
fi


push host_devs "$(readlink -f "$dev")" push host_devs "$(readlink -f "$dev")"
break break
done < /etc/fstab done < /etc/fstab
done < /proc/swaps done < /proc/swaps
fi
fi fi


_get_fs_type() { ( _get_fs_type() { (