From d9db96a4538e96a4eb8f4eeeec9b18d5db3dbde4 Mon Sep 17 00:00:00 2001 From: Shane Nehring Date: Mon, 31 Mar 2025 15:22:22 -0500 Subject: [PATCH] adding override for nm-wait-online-initrd.service to wait for interface config Signed-off-by: Shane Nehring --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- dracut/modules.d/90wwinit/module-setup.sh | 4 ++++ .../90wwinit/nm-wait-online-initrd.service.override | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 dracut/modules.d/90wwinit/nm-wait-online-initrd.service.override diff --git a/CHANGELOG.md b/CHANGELOG.md index db976c87..d8b12cb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Makefile b/Makefile index b8118713..bcfa7073 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/dracut/modules.d/90wwinit/module-setup.sh b/dracut/modules.d/90wwinit/module-setup.sh index d1fd62e5..aeec152c 100755 --- a/dracut/modules.d/90wwinit/module-setup.sh +++ b/dracut/modules.d/90wwinit/module-setup.sh @@ -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 } diff --git a/dracut/modules.d/90wwinit/nm-wait-online-initrd.service.override b/dracut/modules.d/90wwinit/nm-wait-online-initrd.service.override new file mode 100644 index 00000000..e8c58762 --- /dev/null +++ b/dracut/modules.d/90wwinit/nm-wait-online-initrd.service.override @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/usr/bin/nm-online -q -t 300