From aca8707f8476cee118613151dcf1a3b84abe16f2e2a23a2bd5686ee3586f2124 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Fri, 1 Mar 2024 13:04:07 +0000 Subject: [PATCH] Accepting request 1153997 from home:favogt:branches:devel:kubic:ignition Not directly tested but copy-pasted from combustion where it works fine - module-setup.sh: Use $dracutsysrootdir OBS-URL: https://build.opensuse.org/request/show/1153997 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=119 --- ignition.changes | 5 +++++ ignition.spec | 2 +- module-setup.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ignition.changes b/ignition.changes index c817953..51903bf 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 12:53:50 UTC 2024 - Fabian Vogt + +- module-setup.sh: Use $dracutsysrootdir + ------------------------------------------------------------------- Fri Nov 24 13:20:31 UTC 2023 - iforster@suse.com diff --git a/ignition.spec b/ignition.spec index 22e0df7..30d3594 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,7 +1,7 @@ # # spec file for package ignition # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/module-setup.sh b/module-setup.sh index 53064ec..7d6402c 100644 --- a/module-setup.sh +++ b/module-setup.sh @@ -4,7 +4,7 @@ check() { # Omit if building for this already configured system - if [[ $hostonly ]] && [ -e /etc/machine-id ]; then + if [[ $hostonly ]] && [ -e "${dracutsysrootdir}/etc/machine-id" ]; then return 255 fi return 0