From 6ecab258710d158a7a628f699449ac1c2c918208 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 2 Jun 2014 14:45:36 +0200 Subject: [PATCH] dracut: Do not wait for swap device There should be no difference between hostonly and non-hostonly mode; systemd should take care of bringing up the swap device whenever it's accessible. Signed-off-by: Thomas Renninger --- dracut.sh | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dracut.sh b/dracut.sh index 9898cdf..79a6840 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1044,37 +1044,6 @@ if [[ $hostonly ]]; then push host_devs "$_dev" done - if [[ -f /proc/swaps ]] && [[ -f /etc/fstab ]]; then - while read dev type rest; do - [[ -b $dev ]] || continue - [[ "$type" == "partition" ]] || continue - - while read _d _m _t _o _r; do - [[ "$_d" == \#* ]] && continue - [[ $_d ]] || continue - [[ $_t != "swap" ]] && continue - [[ $_m != "swap" ]] && [[ $_m != "none" ]] && continue - [[ "$_o" == *noauto* ]] && continue - _d=$(expand_persistent_dev "$_d") - [[ "$_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 entries with password files - [[ "$_p" == /* ]] && [[ -f $_p ]] && continue 2 - # skip mkswap swap - [[ $_o == *swap* ]] && continue 2 - done < /etc/crypttab - fi - - push host_devs "$(readlink -f "$dev")" - break - done < /etc/fstab - done < /proc/swaps - fi # record all host modaliases declare -A host_modalias find /sys/devices/ -name uevent -print > "$initdir/.modalias" -- 1.8.4.5