crio_cgroupv2_imagefs.ign: run semanage before crio install

kubernetes · Dec 16, 2024 · 342220a · 342220a
1 parent a4a9697
commit 342220a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/jobs/e2e_node/crio/crio_cgroupv2_imagefs.ign b/jobs/e2e_node/crio/crio_cgroupv2_imagefs.ign
@@ -116,7 +116,7 @@
         "name": "authorized-key.service"
       },
       {
-        "contents": "[Unit]\nDescription=Label Graphroot\nAfter=crio-install.service\n\n[Service]\nType=oneshot\nExecStart=rpm-ostree install \\\n  -y \\\n  --apply-live \\\n  --allow-inactive \\\n  policycoreutils-python-utils\nExecStart=semanage fcontext -a -e /var/lib/containers /var/lib/imagefs\nExecStart=restorecon -R -v /var/lib/imagefs\n\n[Install]\nWantedBy=multi-user.target\n",
+        "contents": "[Unit]\nDescription=Label Graphroot\nAfter=selinux-install.service\nBefore=crio-install.service\n\n[Service]\nType=oneshot\nExecStart=rpm-ostree install \\\n  -y \\\n  --apply-live \\\n  --allow-inactive \\\n  policycoreutils-python-utils\nExecStart=semanage fcontext -a -e /var/lib/containers /var/lib/imagefs\nExecStart=restorecon -R -v /var/lib/imagefs\n\n[Install]\nWantedBy=multi-user.target\n",
         "enabled": true,
         "name": "label-graphroot.service"
       }

diff --git a/jobs/e2e_node/crio/templates/base/imagefs.yaml b/jobs/e2e_node/crio/templates/base/imagefs.yaml
@@ -28,7 +28,8 @@ systemd:
       contents: |
         [Unit]
         Description=Label Graphroot
-        After=crio-install.service
+        After=selinux-install.service
+        Before=crio-install.service
 
         [Service]
         Type=oneshot

diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv2_imagefs.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv2_imagefs.yaml
@@ -147,7 +147,8 @@ systemd:
       contents: |
         [Unit]
         Description=Label Graphroot
-        After=crio-install.service
+        After=selinux-install.service
+        Before=crio-install.service
 
         [Service]
         Type=oneshot