Merge pull request #1850 from ResearchIT/dracut-nm-wait-online-override

Make nm-wait-online-initrd.service wait for interfaces to be online during dracut boot
This commit is contained in:
Timothy Middelkoop
2025-04-21 14:40:53 -05:00
committed by GitHub
4 changed files with 14 additions and 1 deletions

View File

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased
### Added
- Added override.conf for nm-wait-online-initrd.service with dracut.
## v4.6.1, 2025-04-04
### Added

View File

@@ -215,7 +215,7 @@ install: build docs ## Install Warewulf from source
for f in docs/man/man1/*.1.gz; do install -m 0644 $$f $(DESTDIR)$(MANDIR)/man1/; done
for f in docs/man/man5/*.5.gz; do install -m 0644 $$f $(DESTDIR)$(MANDIR)/man5/; done
install -pd -m 0755 $(DESTDIR)$(DRACUTMODDIR)/90wwinit
install -m 0644 dracut/modules.d/90wwinit/*.sh $(DESTDIR)$(DRACUTMODDIR)/90wwinit
install -m 0644 dracut/modules.d/90wwinit/*.sh dracut/modules.d/90wwinit/*.override $(DESTDIR)$(DRACUTMODDIR)/90wwinit
.PHONY: install-sos
install-sos:

View File

@@ -17,4 +17,8 @@ install() {
inst_multiple cpio curl dmidecode
inst_hook cmdline 30 "$moddir/parse-wwinit.sh"
inst_hook pre-mount 30 "$moddir/load-wwinit.sh"
if dracut_module_included "network-manager" && dracut_module_included "systemd"
then
inst_simple "$moddir/nm-wait-online-initrd.service.override" "/etc/systemd/system/nm-wait-online-initrd.service.d/override.conf"
fi
}

View File

@@ -0,0 +1,3 @@
[Service]
ExecStart=
ExecStart=/usr/bin/nm-online -q -t 300