52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
dracut: Do not wait for swap device
|
||
|
|
|
||
|
|
also not in hostonly mode.
|
||
|
|
There should be no difference between hostonly and no-hostonly mode.
|
||
|
|
Systemd should take care to bring up the swap device whenever it is
|
||
|
|
accessable.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
||
|
|
|
||
|
|
Index: dracut-037/dracut.sh
|
||
|
|
===================================================================
|
||
|
|
--- dracut-037.orig/dracut.sh
|
||
|
|
+++ dracut-037/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"
|