3f26422f3a
- Rename patches to match git repository:
* old: 0013-Correct-paths-for-openSUSE.patch
new: 0011-Correct-paths-for-openSUSE.patch
* old: 0014-Check-for-plymouth-lib-directories.patch
new: 0012-Check-for-plymouth-lib-directories.patch
* old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch
* old: suse_grub_manpage.patch
new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch
* old: replace_dhclient_with_wickedd_dhcp_supplicants.patch
new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
* old: 0015-add-new-s390x-specific-rule-files.patch
new: 0016-Add-new-s390x-specific-rule-files.patch
* old: change_write_ifcfg_to_suse.patch
new: 0017-45ifcfg-use-distro-specific-scripts.patch
* old: dracut-fix-whitespace-add-drivers_call.patch
new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch
* old: wait_for_network_race_condition_fix.patch
new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
* old: dracut-warpclock_module.patch
new: 0020-00warpclock-Set-correct-timezone.patch
* old: s390-dcssblk.patch
new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
* old: dracut-install-persistent-rule.patch
new: 0022-95udev-rules-add-persistent-network-rule.patch
* old: dracut-really-always-add-autofs4.patch
new: 0023-systemd-always-tries-to-load-autofs4.patch
* old: mdraid-setup.patch
new: 0024-Fixup-mdraid-setup.patch
* old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
OBS-URL: https://build.opensuse.org/request/show/236221
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
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"
|