Skip to content

Commit 136efa8

Browse files
authored
selinux-policy: Add fix for cloud-init growpart. (#9114)
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
1 parent 5f94d0b commit 136efa8

4 files changed

Lines changed: 49 additions & 2 deletions

File tree

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 2f6ac01a96f7b0de7464474ddff51bee596007a6 Mon Sep 17 00:00:00 2001
2+
From: Chris PeBenito <chpebeni@linux.microsoft.com>
3+
Date: Mon, 29 Apr 2024 16:36:05 -0400
4+
Subject: [PATCH 43/43] cloudinit: Add support for cloud-init-growpart.
5+
6+
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
7+
---
8+
policy/modules/admin/cloudinit.te | 9 +++++++++
9+
1 file changed, 9 insertions(+)
10+
11+
diff --git a/policy/modules/admin/cloudinit.te b/policy/modules/admin/cloudinit.te
12+
index bbc92f30d..10d26bc30 100644
13+
--- a/policy/modules/admin/cloudinit.te
14+
+++ b/policy/modules/admin/cloudinit.te
15+
@@ -10,6 +10,13 @@ gen_require(`
16+
# Declarations
17+
#
18+
19+
+## <desc>
20+
+## <p>
21+
+## Enable support for the cloud-init-growpart module.
22+
+## </p>
23+
+## </desc>
24+
+gen_tunable(cloudinit_growpart, false)
25+
+
26+
## <desc>
27+
## <p>
28+
## Enable support for cloud-init to manage all non-security files.
29+
@@ -129,6 +136,8 @@ ssh_setattr_home_dirs(cloud_init_t)
30+
# Read public keys
31+
ssh_read_server_keys(cloud_init_t)
32+
33+
+storage_raw_read_fixed_disk_cond(cloud_init_t, cloudinit_growpart)
34+
+
35+
sysnet_run_ifconfig(cloud_init_t, system_r)
36+
37+
term_write_console(cloud_init_t)
38+
--
39+
2.45.0
40+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# enable cloud-init-growpart support
2+
cloudinit_growpart = true
3+
14
# Enable this to allow unconfined to log in over ssh
25
ssh_sysadm_login = true

SPECS/selinux-policy/selinux-policy.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"Makefile.devel": "cd065e896d7eb11e238a05b9102359ea370ec75b27785a81935c985899ed2df6",
4-
"booleans_targeted.conf": "bdefca5cc433e5fd372cd68105412db279673140f6477148744ea22c7395fec1",
4+
"booleans_targeted.conf": "009f880c7179a007569dfdbf40ef64ae41671ad33cc2717eebbdaeb8ab431d12",
55
"macros.selinux-policy": "027f5d27441a7262365c26076dc3b7ab1f1ac62026ae94514020e0607e53a73a",
66
"modules_targeted.conf": "0a3444baa54aef35220e9954d1175da091155f240bf989caa7dfb9ef64302a76",
77
"refpolicy-2.20221101.tar.bz2": "44f88e62c8efcef54d019b9ca077520d5993de580926bd7575788cfa78515396"

SPECS/selinux-policy/selinux-policy.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Summary: SELinux policy
1010
Name: selinux-policy
1111
Version: %{refpolicy_major}.%{refpolicy_minor}
12-
Release: 6%{?dist}
12+
Release: 7%{?dist}
1313
License: GPLv2
1414
Vendor: Microsoft Corporation
1515
Distribution: Mariner
@@ -61,6 +61,7 @@ Patch39: 0039-modutils-Temporary-fix-for-mkinitrd-dracut.patch
6161
Patch40: 0040-For-systemd-hostnamed-service-to-run.patch
6262
Patch41: 0041-docker-Silence-io.containerd.internal.v1.opt-opt-con.patch
6363
Patch42: 0042-getty-grant-checkpoint_restore.patch
64+
Patch43: 0043-cloudinit-Add-support-for-cloud-init-growpart.patch
6465
BuildRequires: bzip2
6566
BuildRequires: checkpolicy >= %{CHECKPOLICYVER}
6667
BuildRequires: m4
@@ -346,6 +347,9 @@ exit 0
346347
selinuxenabled && semodule -nB
347348
exit 0
348349
%changelog
350+
* Tue May 14 2024 Chris PeBenito <chpebeni@microsoft.com> - 2.20221101-7
351+
- Add fix for cloud-init growpart.
352+
349353
* Tue Apr 23 2024 Chris PeBenito <chpebeni@microsoft.com> - 2.20221101-6
350354
- Add getty fix for new check in kernel 6.7
351355

0 commit comments

Comments
 (0)