Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crio_cgroupv2_imagefs.ign: run SELinux relabeling service before crio #33963

Merged
merged 1 commit into from
Dec 16, 2024
+5 −3
Merged

crio_cgroupv2_imagefs.ign: run SELinux relabeling service before crio #33963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jobs/e2e_node/crio/crio_cgroupv2_imagefs.ign
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
3 changes: 2 additions & 1 deletion jobs/e2e_node/crio/templates/base/imagefs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion jobs/e2e_node/crio/templates/crio_cgroupv2_imagefs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down