Thomas Renninger
46c37d057a
- Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1
Tue May 20 13:23
Modified dracut_v37_to_HEAD.patch
Modified mdraid-setup.patch
Modified dracut-install-persistent-rule.patch
- Add /etc/dracut.d.conf/01-dist modifications to file instead of writing
to it via rpm build section
Add 0033-dracut_hostonly_hostonly_cmdline_default.patch
Add 0034-suse.conf.example_extend.patch
- Cleanup mkinitrd-suse.sh:
* Remove hostonly and hostonly-cmdline -> this is done via 01-dist config
file now
- Always add network module based on modules_setup.sh check() function and not
via 01-dist config file
Add 0035-always_add_network.patch
- Add find to debug binaries - Useful and harmless
Add 0036-add_extra_debug_binaries.patch
- Fix adding of network modules for s390 (bnc#879302)
Add 0037-fix_s390_network_modules_install.patch
- Omit resume module on s390(x) - There is no suspend on s390
Add 0039-s390_no_resume_module.patch
- Do not wait for swap - This causes trouble with Rudi's autobuild images:
Add 0038-remove_waiting_for_swap_dev.patch
- Fcoe and ibft fixes (bnc#879038):
Add 0041-only_enable_network_if_explicitly_requested.patch
Add 0042-ibft_autoconfig_param.patch
Add 0043-fcoe_strip_quotes.patch
- Print message when starting to update bootloader
Add 0044-Add_update_bootloader_msg.patch
- ToDo: Pass hostonly variable earlier so that is always avail in check()
OBS-URL: https://build.opensuse.org/request/show/235703
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
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"
|