Merge pull request #1052 from jeckersb/decouple-target-from-multi-user

Add bootc-status-updated-onboot.target
containers · Jan 22, 2025 · b086321 · b086321
2 parents 2f90eff + 7399044
commit b086321
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ install:
 	install -D -m 0644 -t $(DESTDIR)/$(prefix)/lib/systemd/system systemd/*.service systemd/*.timer systemd/*.path systemd/*.target
 	install -d -m 0755 $(DESTDIR)/$(prefix)/lib/systemd/system/multi-user.target.wants
 	ln -s ../bootc-status-updated.path $(DESTDIR)/$(prefix)/lib/systemd/system/multi-user.target.wants/bootc-status-updated.path
-	ln -s ../bootc-status-updated.target $(DESTDIR)/$(prefix)/lib/systemd/system/multi-user.target.wants/bootc-status-updated.target
+	ln -s ../bootc-status-updated-onboot.target $(DESTDIR)/$(prefix)/lib/systemd/system/multi-user.target.wants/bootc-status-updated-onboot.target
 	install -D -m 0644 -t $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/usr/lib/ostree/ baseimage/base/usr/lib/ostree/prepare-root.conf
 	install -d -m 755 $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/sysroot
 	cp -PfT baseimage/base/ostree $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/ostree 

diff --git a/systemd/bootc-publish-rhsm-facts.service b/systemd/bootc-publish-rhsm-facts.service
@@ -9,3 +9,4 @@ ExecStart=/usr/bin/bootc internals publish-rhsm-facts
 
 [Install]
 WantedBy=bootc-status-updated.target
+WantedBy=bootc-status-updated-onboot.target
diff --git a/systemd/bootc-status-updated-onboot.target b/systemd/bootc-status-updated-onboot.target
@@ -0,0 +1,7 @@
+[Unit]
+Description=Target for bootc status changes on boot
+Documentation=man:bootc-status-updated.target(8)
+ConditionPathExists=/run/ostree-booted
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/bootc-status-updated.target b/systemd/bootc-status-updated.target
@@ -3,6 +3,3 @@ Description=Target for bootc status changes
 Documentation=man:bootc-status-updated.target(8)
 StopWhenUnneeded=true
 ConditionPathExists=/run/ostree-booted
-
-[Install]
-WantedBy=multi-user.target
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ ExecStart=/usr/bin/bootc internals publish-rhsm-facts

		[Install]
		WantedBy=bootc-status-updated.target
		WantedBy=bootc-status-updated-onboot.target