photon-os-installer: Upgrade to v2.7

- Consume new installer changes for platform kickstart file changes
- Add open-vm-tools to packages_installer_initrd.json
- Disable vmtoolsd services in ISO initrd to match installer

Change-Id: I884ae13ffb198ba888a6eecf8c089a947d3d9490
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/24167
Reviewed-by: Oliver Kurth <okurth@vmware.com>
Reviewed-by: Michelle Wang <michelle.wang@broadcom.com>
Tested-by: Michelle Wang <michelle.wang@broadcom.com>

SPECS/photon-os-installer/0001-photon-os-installer-ostreeinstaller-Fix-tmp-mountpoi.patch

@@ -1,33 +0,0 @@
-From cc4ecce518d1d232820688595c2c2550907bbba6 Mon Sep 17 00:00:00 2001
-From: Ankit Jain <ankitja@vmware.com>
-Date: Wed, 25 Oct 2023 06:34:28 +0000
-Subject: [PATCH] photon-os-installer: ostreeinstaller: Fix tmp mountpoint
-
-- tmp mountpoint inside deployment is broken symlink
-  causing failure in tmpfs mount command.
-- Fixed it by creating symlink before doing mount
-
-Change-Id: Iab1d585151616e4fbe3a9c4890996082f79eb3b8
-Signed-off-by: Ankit Jain <ankitja@vmware.com>
----
- photon_installer/ostreeinstaller.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/photon_installer/ostreeinstaller.py b/photon_installer/ostreeinstaller.py
-index c3e10bc..72a5fae 100755
---- a/photon_installer/ostreeinstaller.py
-+++ b/photon_installer/ostreeinstaller.py
-@@ -165,9 +165,9 @@ class OstreeInstaller(object):
-         commit_number = self.get_commit_number(self.ostree_ref)
-         self.do_systemd_tmpfiles_commands(commit_number)
- 
--        self.run_lambdas([lambda: self.mount_devices_in_deployment(commit_number)], "mounting done")
-         deployment = os.path.join(self.photon_root, f"ostree/deploy/photon/deploy/{commit_number}.0/")
-         self.create_symlink_directory(deployment)
-+        self.run_lambdas([lambda: self.mount_devices_in_deployment(commit_number)], "mounting done")
- 
-         if os.path.exists(loader1):
-             cmd = []
--- 
-2.23.1
-

SPECS/photon-os-installer/photon-os-installer.spec

@@ -2,21 +2,22 @@
 
 Summary:       Photon OS Installer
 Name:          photon-os-installer
-Version:       2.4
-Release:       2%{?dist}
+Version:       2.7
+Release:       1%{?dist}
 License:       Apache 2.0 and GPL 2.0
 Group:         System Environment/Base
 Vendor:        VMware, Inc.
 Distribution:  Photon
 URL:           https://github.com/vmware/photon-os-installer
 Source0:       %{name}-%{version}.tar.gz
-%define sha512 %{name}=a361c22234ed467c0cf1a827d1a3a15553ebde6f68e48c8d32f4867d26ca9326029d7840791bed0186565e935670ebcc273a5fe77c84a90dc80f2a80d5972dda
+%define sha512 %{name}=9c2b6df1e9136e94db1451064b51a286b2894849b309dde9539cb9df4fc82e807c74ccb0f7795d7d1d5b2c1ea856dfb38623e1c08e94c567696a637ca6f75fe8
 
 BuildRequires: python3-devel
 BuildRequires: python3-pyinstaller
 BuildRequires: python3-requests
 BuildRequires: python3-cracklib
 BuildRequires: python3-curses
+BuildRequires: python3-jc
 
 Requires: dosfstools
 Requires: efibootmgr
@@ -31,14 +32,15 @@ Requires: lvm2
 Requires: zlib
 Requires: cdrkit
 Requires: findutils
+# needed for --rpmdefine option
+Requires: tdnf >= 3.3.11-2
 
 Requires: python3-pyOpenSSL
 Requires: python3-requests
 Requires: python3-cracklib
 Requires: python3-curses
 Requires: python3-PyYAML
-
-Patch0: 0001-photon-os-installer-ostreeinstaller-Fix-tmp-mountpoi.patch
+Requires: python3-jc
 
 %description
 This is to create rpm for installer code
@@ -62,6 +64,8 @@ rm -rf %{buildroot}
 %{_bindir}/photon-iso-builder
 
 %changelog
+* Fri May 24 2024 Ankit Jain <ankit-aj.jain@broadcom.com> 2.7-1
+- Upgrade to v2.7
 * Wed Oct 25 2023 Ankit Jain <ankitja@vmware.com> 2.4-2
 - Fix tmpfs mount issue
 * Tue Oct 17 2023 Piyush Gupta <gpiyush@vmware.com> 2.4-1

common/data/packages_installer_initrd.json

@@ -68,6 +68,7 @@
         "lvm2",
 	"btrfs-progs",
 	"xfsprogs",
+        "open-vm-tools",
         "photon-os-installer"],
 
     "packages_x86_64": ["grub2-pc"]

support/image-builder/iso/mk-install-iso.sh

@@ -138,6 +138,10 @@ mkdir -p ${INITRD}/etc/systemd/scripts
 # Step 6 create fstab
 cp $SCRIPT_PATH/BUILD_DVD/fstab ${INITRD}/etc/fstab
 
+#- Step 7 - Disable vmtoolsd/vgauthd
+ln -s /dev/null ${INITRD}/etc/systemd/system/vmtoolsd.service
+ln -s /dev/null ${INITRD}/etc/systemd/system/vgauthd.service
+
 mkdir -p ${INITRD}/etc/yum.repos.d
 cat > ${INITRD}/etc/yum.repos.d/photon-iso.repo << EOF
 [photon-iso]