Skip to content

Commit c60e2a0

Browse files
authored
Remove unused files and cleanup (#14435)
1 parent 0c9474d commit c60e2a0

File tree

8 files changed

+25
-67
lines changed

8 files changed

+25
-67
lines changed

toolkit/imageconfigs/files/linuxguard/99-dhcp-eth0.network

Lines changed: 0 additions & 6 deletions
This file was deleted.

toolkit/imageconfigs/files/linuxguard/no-password-prompt-on-sudo

Lines changed: 0 additions & 2 deletions
This file was deleted.

toolkit/imageconfigs/files/linuxguard/selinux-ci-uki.semanage

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ boolean -m -1 init_mounton_non_security
1515
login -m -s ci_unconfined_u -r 's0' root
1616
login -m -s ci_unconfined_u -r 's0' __default__
1717
fcontext -a -f f -t bin_t -r 's0' '/etc/grub\.d/.*'
18-
fcontext -a -f d -t root_t -r 's0' '/overlays'
19-
fcontext -a -f d -t lost_found_t -r 's0' '/overlays/lost\+found'
2018
fcontext -a -f f -t fsadm_exec_t -r 's0' '/usr/bin/lsblk'
2119
fcontext -a -f f -t dockerd_exec_t -r 's0' '/usr/bin/tardev-snapshotter'
2220
fcontext -a -f f -t bin_t -r 's0' '/usr/share/netplan/netplan\.script'
23-
fcontext -a -e / /rw
2421
fcontext -a -e /etc/selinux /usr/etc/selinux

toolkit/imageconfigs/files/linuxguard/sshd-keygen.service

Lines changed: 0 additions & 14 deletions
This file was deleted.

toolkit/imageconfigs/linuxguard-amd64.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ os:
164164
# SELinux customizations
165165
- source: files/linuxguard/selinux-ci-uki.semanage
166166
destination: /etc/selinux/targeted/selinux-ci.semanage
167-
- source: files/linuxguard/99-dhcp-eth0.network
168-
destination: /etc/systemd/network/99-dhcp-eth0.network
169167
# Cloud-init configuration
170168
- source: files/linuxguard/cloud.cfg
171169
destination: /etc/cloud/cloud.cfg
@@ -182,9 +180,9 @@ scripts:
182180
- path: scripts/linuxguard/performance-tuning.sh
183181
# Config AzureLinuxagent
184182
- path: scripts/linuxguard/azlinuxagentconfig.sh
185-
- path: scripts/linuxguard/duid-type-to-link-layer.sh
186183
# Disable unused SELinux policy modules and configure SELinux policy for CI
187-
- path: scripts/linuxguard/selinux-ci-config.sh
184+
- path: scripts/linuxguard/selinux-ci-config.py
185+
interpreter: /usr/bin/python3
188186
- path: scripts/linuxguard/cleanup-machineid.sh
189187
- path: scripts/linuxguard/prepare_trusted_cni_plugins.sh
190188
- path: scripts/linuxguard/tmp-no-exec.sh

toolkit/imageconfigs/scripts/linuxguard/azlinuxagentconfig.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
# Copyright (c) Microsoft Corporation.
44
# Licensed under the MIT License.
55

6-
sha_keys_dir="/etc/ssh"
7-
echo "Updating AzureLinuxAgent config"
8-
sed -i "/OS.SshDir/c\OS.SshDir=${sha_keys_dir}" /etc/waagent.conf
9-
if ! grep -q "OS.SshDir" /etc/waagent.conf; then
10-
sed -i "$ a OS.SshDir=${sha_keys_dir}" /etc/waagent.conf
11-
fi
126
sed -i "/AutoUpdate.Enabled/d" /etc/waagent.conf
137
sed -i "/AutoUpdate.UpdateToLatestVersion=y/c\AutoUpdate.UpdateToLatestVersion=n" /etc/waagent.conf
148
if ! grep -q "AutoUpdate.UpdateToLatestVersion=n" /etc/waagent.conf; then

toolkit/imageconfigs/scripts/linuxguard/duid-type-to-link-layer.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

toolkit/imageconfigs/scripts/linuxguard/selinux-ci-config.sh renamed to toolkit/imageconfigs/scripts/linuxguard/selinux-ci-config.py

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
#!/bin/bash
1+
#!/usr/bin/python3
22

33
# Copyright (c) Microsoft Corporation.
44
# Licensed under the MIT License.
55

6-
set -eux
6+
import os
7+
from semanage import (
8+
semanage_module_key_create,
9+
semanage_module_key_set_name,
10+
semanage_module_set_enabled,
11+
)
12+
import seobject
13+
import shutil
14+
import subprocess
715

816
# import SELinux policy CI customizations. This is installed by MIC
9-
semanage import -f /etc/selinux/targeted/selinux-ci.semanage
10-
11-
# MIC expects customization scripts to be bash scripts.
12-
python_script=$(cat << EOF
13-
#!/usr/bin/python3
17+
subprocess.run(
18+
["semanage", "import", "-f", "/etc/selinux/targeted/selinux-ci.semanage"],
19+
check=True,
20+
)
1421

1522
#
1623
# Module disabling done by script instead of 'semanage import' so new
1724
# modules are disabled by default
1825
#
1926

20-
from semanage import (semanage_module_key_create,
21-
semanage_module_key_set_name,
22-
semanage_module_set_enabled)
23-
import seobject
24-
2527
ENABLED_MODULES: set[str] = {
2628
"base",
2729
"application",
@@ -39,14 +41,14 @@
3941
"chronyd",
4042
"dbus",
4143
"dmesg",
42-
"docker", # handles docker and containerd
44+
"docker", # handles docker and containerd
4345
"fstools",
4446
"getty",
4547
"gpg",
4648
"hostname",
4749
"hotfix",
4850
"hypervkvp",
49-
"init", # systemd
51+
"init", # systemd
5052
"iptables",
5153
"irqbalance",
5254
"kerberos",
@@ -56,7 +58,7 @@
5658
"logging",
5759
"libraries",
5860
"logrotate",
59-
"lvm", # includes dm, cryptsetup, etc.
61+
"lvm", # includes dm, cryptsetup, etc.
6062
"miscfiles",
6163
"modutils",
6264
"mount",
@@ -66,7 +68,7 @@
6668
"ntp",
6769
"oddjob",
6870
"openvswitch",
69-
"podman", # there is a hard dependency for this in crio
71+
"podman", # there is a hard dependency for this in crio
7072
"policykit",
7173
"qemu",
7274
"rdisc",
@@ -90,7 +92,7 @@
9092
"usermanage",
9193
"uuidd",
9294
"virt",
93-
"xdg", # required by systemd
95+
"xdg", # required by systemd
9496
}
9597

9698
records = seobject.moduleRecords()
@@ -123,15 +125,10 @@
123125
semanage_module_set_enabled(handle, key, 1)
124126

125127
records.commit()
126-
EOF
127-
)
128-
129-
/usr/bin/python3 -c "$python_script"
130128

131129
# Move policy to /usr
132-
if [ ! -d /usr/etc/selinux ]; then
133-
mkdir -p /usr/etc
134-
mv /etc/selinux /usr/etc/selinux
130+
if not os.path.isdir("/usr/etc/selinux"):
131+
os.makedirs("/usr/etc", exist_ok=True)
132+
shutil.move("/etc/selinux", "/usr/etc/selinux")
135133
# add backwards compatibility for /etc/selinux
136-
ln -sf ../usr/etc/selinux /etc/selinux
137-
fi
134+
os.symlink("../usr/etc/selinux", "/etc/selinux")

0 commit comments

Comments
 (0)