From 645db8a8995de9bff55a5b65d6c330d7bf009f00 Mon Sep 17 00:00:00 2001 From: Jialei Feng Date: Wed, 21 Feb 2024 01:00:27 +0800 Subject: [PATCH] Remove useless apt cmd and IMA config in TDX image creation (#36) The TDX setup process is nice and won't break the apt system, so "apt install --fix-broken" is redundant. Also remove IMA parameters from guest kernel cmdline to avoid confusion. Enabling TDX doesn't require kernel IMA at all. Signed-off-by: Feng, Jialei --- guest-tools/image/cloud-init-data/user-data | 5 ----- guest-tools/image/cloud-init-data/user-data.template | 5 ----- 2 files changed, 10 deletions(-) diff --git a/guest-tools/image/cloud-init-data/user-data b/guest-tools/image/cloud-init-data/user-data index dd9070f..0e6ac2d 100644 --- a/guest-tools/image/cloud-init-data/user-data +++ b/guest-tools/image/cloud-init-data/user-data @@ -29,11 +29,6 @@ packages: - golang-doc - ntp -runcmd: - - apt install --fix-broken - - sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="[^"]*/& ima_hash=sha384 ima_policy=critical_data/' /etc/default/grub.d/50-cloudimg-settings.cfg - - update-grub2 - # HACK way to set root password # https://github.com/vmware/photon/issues/931 # set root password to 123456 diff --git a/guest-tools/image/cloud-init-data/user-data.template b/guest-tools/image/cloud-init-data/user-data.template index 5cbeaae..6a9bf76 100644 --- a/guest-tools/image/cloud-init-data/user-data.template +++ b/guest-tools/image/cloud-init-data/user-data.template @@ -29,11 +29,6 @@ packages: - golang-doc - ntp -runcmd: - - apt install --fix-broken - - sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="[^"]*/& ima_hash=sha384 ima_policy=critical_data/' /etc/default/grub.d/50-cloudimg-settings.cfg - - update-grub2 - # HACK way to set root password # https://github.com/vmware/photon/issues/931 # set root password to 123456