add more cleanup for rootfs contents

Author: Camelron

tools/osbuilder/image-builder/image_builder.sh

@@ -498,7 +498,10 @@ create_rootfs_image() {
 
 	info "Setup systemd"
 	setup_systemd "${mount_dir}"
-
+	echo "FOOBY: mount_dir: ${mount_dir}"
+	find "${mount_dir}" -type f | xargs touch -d "Sun, 29 Feb 2004 16:21:42 -0800"
+	find "${mount_dir}" -type d | xargs touch -d "Sun, 29 Feb 2004 16:21:42 -0800"
+	sudo chroot /
 	info "Unmounting root partition"
 	umount "${mount_dir}"
 	OK "Root partition unmounted"
@@ -531,7 +534,7 @@ create_rootfs_image() {
 		echo "FOOBY!!!"
 		set -x
 		echo "setup_cmd: $setup_cmd"
-		eval "${setup_cmd} -s \"deadbeef\"" > "${image_dir}"/root_hash.txt 2>&1
+		eval "${setup_cmd} -v --uuid "bddba635-5269-45dc-8a64-e5abc5b7b1df" -s \"deadbeef\"" > "${image_dir}"/root_hash.txt 2>&1
 		set +x
 	fi
 

tools/osbuilder/rootfs-builder/cbl-mariner/rootfs_lib.sh

@@ -2,6 +2,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+temp_upgrade_cacerts()
+{
+        rpm -Uhv ca-certificates-tools-2.0.0-17.cm2.noarch.rpm --replacepkgs
+	rm ca-certificates-tools-2.0.0-17.cm2.noarch.rpm
+	rm /etc/pki/ca-trust/extracted/java/cacerts
+	update-ca-trust
+}
+
 build_rootfs()
 {
 	# Mandatory
@@ -18,10 +26,15 @@ build_rootfs()
 	PKG_MANAGER="tdnf"
 
 	DNF="${PKG_MANAGER} -y --installroot=${ROOTFS_DIR} --noplugins --releasever=${OS_VERSION}"
-
+	set -x
 	info "install packages for rootfs"
-	$DNF install ${EXTRA_PKGS} ${PACKAGES}
-
+	$DNF install ${EXTRA_PKGS} ${PACKAGES} rpm wget
+	wget https://cameronbairdstorage.blob.core.windows.net/public/ca-certificates-tools-2.0.0-17.cm2.noarch.rpm
+	cp ca-certificates-tools-2.0.0-17.cm2.noarch.rpm "${ROOTFS_DIR}"
+	export -f temp_upgrade_cacerts
+	chroot "${ROOTFS_DIR}" /bin/bash -c "temp_upgrade_cacerts"
+	echo "chroot done"
+	set +x
 	rm -rf ${ROOTFS_DIR}/usr/share/{bash-completion,cracklib,doc,info,locale,man,misc,pixmaps,terminfo,zoneinfo,zsh}
 }