Merge pull request #1889 from bcressey/release-fixes

bottlerocket-os · Jan 6, 2022 · d8698d9 · d8698d9
2 parents efa97cf + f793284
commit d8698d9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/packages/release/prepare-local.service b/packages/release/prepare-local.service
@@ -1,7 +1,11 @@
 [Unit]
 Description=Prepare Local Directory (/local)
 DefaultDependencies=no
+After=selinux-policy-files.service
+Wants=selinux-policy-files.service
 RequiresMountsFor=/local
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot

diff --git a/packages/release/release.spec b/packages/release/release.spec
@@ -161,7 +161,7 @@ install -p -m 0644 %{S:203} %{buildroot}%{_cross_templatedir}/hosts
 install -d %{buildroot}%{_cross_udevrulesdir}
 install -p -m 0644 %{S:1016} %{buildroot}%{_cross_udevrulesdir}/61-mount-cdrom.rules
 
-ln -s %{_cross_unitdir}/preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
+ln -s preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
 
 %files
 %{_cross_factorydir}%{_cross_sysconfdir}/nsswitch.conf

diff --git a/packages/selinux-policy/selinux-policy-files.service b/packages/selinux-policy/selinux-policy-files.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Copy SELinux policy files
 DefaultDependencies=no
+RefuseManualStart=true
+RefuseManualStop=true
 
 [Service]
 Type=oneshot