photon-os-installer: Bug fixes from upstream

- Sync with upstream Change-Id: Ia3e5fd723b9b2844105d0766e48f85f82434cea8 Signed-off-by: Ankit Jain <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/19978 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Piyush Gupta <[email protected]>
SharanKallur · Mar 10, 2023 · 4d7ecd0 · 4d7ecd0
1 parent 1340476
commit 4d7ecd0
Show file tree

Hide file tree

Showing 14 changed files with 1,995 additions and 24 deletions.
diff --git a/SPECS/photon-os-installer/0001-create-abupdate.conf.patch b/SPECS/photon-os-installer/0001-create-abupdate.conf.patch
@@ -0,0 +1,234 @@
+From 589e184f55ff712e92239f5cbaf200c125709f1e Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <[email protected]>
+Date: Thu, 16 Feb 2023 18:52:27 -0800
+Subject: [PATCH 01/13] create abupdate.conf
+
+Example:
+
+root@photon-machine [ ~ ]# cat /etc/abupdate.conf
+BOOT_TYPE=BOTH
+_ROOT=(f6b51480-10ec-4b87-b74c-29866643bec3 ebaa3d90-4724-48c0-8a2c-8791b1d60256 /)
+EFI=(802fb52e-0d4e-4be1-ad8d-4997b8348f6a 8172187f-c4d2-4470-9b9a-2adffa11a888 /boot/efi)
+SETS=(_ROOT EFI)
+
+Change-Id: I34b352c77d655c5936368efce9f3e7c5e0000337
+---
+ photon_installer/installer.py | 117 +++++++++++++++++++++++++++-------
+ 1 file changed, 93 insertions(+), 24 deletions(-)
+
+diff --git a/photon_installer/installer.py b/photon_installer/installer.py
+index 644d3ba..aab3339 100755
+--- a/photon_installer/installer.py
++++ b/photon_installer/installer.py
+@@ -154,8 +154,13 @@ class Installer(object):
+
+         self.install_config = install_config
+
++        self.ab_present = self._is_ab_present()
++
++        self._insert_boot_partitions()
++
+         self._add_shadow_partitions()
+
++
+     def execute(self):
+         if 'setup_grub_script' in self.install_config:
+             self.setup_grub_command = self.install_config['setup_grub_script']
+@@ -333,6 +338,8 @@ class Installer(object):
+                 mountpoints.append(mntpoint)
+             if mntpoint == '/boot' and 'lvm' in partition:
+                 return "/boot on LVM is not supported"
++            elif mntpoint == '/boot/efi' and partition['filesystem'] != 'vfat':
++                return "/boot/efi filesystem must be vfat"
+             elif mntpoint == '/':
+                 has_root = True
+         if not has_root:
+@@ -360,23 +367,31 @@ class Installer(object):
+         return None
+
+
++    def _is_ab_present(self):
++        partitions = self.install_config['partitions']
++        for partition in partitions:
++            if 'lvm' not in partition and partition.get('ab', False):
++                return True
++
++
+     def _add_shadow_partitions(self):
+         """
+         Add shadow partitions (copy those with 'ab' = true) to list of partitions
+         Both will have 'ab' = True
+         Shadow will have 'shadow'==True, the active one will have 'shadow'==False
+         """
+-        shadow_parts = []
+-        partitions = self.install_config['partitions']
+-        for partition in partitions:
+-            if 'lvm' not in partition and partition.get('ab', False):
+-                shadow_part = copy.deepcopy(partition)
+-                shadow_part['shadow'] = True
+-                partition['shadow'] = False
+-                shadow_parts.append(shadow_part)
+-                self.ab_present = True
++        if self.ab_present:
++            shadow_parts = []
++            partitions = self.install_config['partitions']
++            for partition in partitions:
++                if 'lvm' not in partition and partition.get('ab', False):
++                    shadow_part = copy.deepcopy(partition)
++                    shadow_part['shadow'] = True
++                    partition['shadow'] = False
++                    shadow_parts.append(shadow_part)
++                    self.ab_present = True
+
+-        partitions.extend(shadow_parts)
++            partitions.extend(shadow_parts)
+
+
+     def _install(self, stdscreen=None):
+@@ -451,6 +466,7 @@ class Installer(object):
+             self._cleanup_install_repo()
+             self._setup_grub()
+             self._create_fstab()
++            self._update_abupdate()
+         self._execute_modules(modules.commons.POST_INSTALL)
+         self._deactivate_network_in_chroot()
+         self._unmount_all()
+@@ -587,8 +603,8 @@ class Installer(object):
+                 ptype = self._get_partition_type(partition)
+                 if ptype == PartitionType.BIOS:
+                     continue
+-#                if partition.get('shadow', False):
+-#                    continue
++                if partition.get('shadow', False):
++                    continue
+
+                 options = 'defaults'
+                 dump = 1
+@@ -623,9 +639,6 @@ class Installer(object):
+                 if not mnt_src:
+                     raise RuntimeError("Cannot get PARTUUID/UUID of: {}".format(path))
+
+-                if partition.get('shadow', False):
+-                    mnt_src = "# " + mnt_src
+-
+                 fstab_file.write("{}\t{}\t{}\t{}\t{}\t{}\n".format(
+                     mnt_src,
+                     mountpoint,
+@@ -641,6 +654,55 @@ class Installer(object):
+             # Add the cdrom entry
+             fstab_file.write("/dev/cdrom\t/mnt/cdrom\tiso9660\tro,noauto\t0\t0\n")
+
++
++    def _update_abupdate(self):
++        if not self.ab_present:
++            return
++
++        abupdate_conf = os.path.join(self.photon_root, "etc/abupdate.conf")
++
++        boot_map = {'efi':'EFI', 'bios':'BIOS', 'dualboot':'BOTH'}
++        bootmode = self.install_config['bootmode']
++        if not bootmode in boot_map:
++            raise Exception(f"invalid boot mode '{bootmode}'")
++
++        ab_map = {}
++        for partition in self.install_config['partitions']:
++            ptype = self._get_partition_type(partition)
++            if ptype == PartitionType.BIOS:
++                continue
++            if partition.get('ab', False):
++                mntpoint = partition['mountpoint']
++                partuuid = self._get_partuuid(partition['path'])
++
++                if mntpoint == '/boot/efi':
++                    name = 'EFI'
++                elif mntpoint == '/':
++                    name = '_ROOT'
++                else:
++                    name = mntpoint[1:].upper().replace('/', '_')
++
++                # we go through this twice - active and shadow
++                # only add entry once
++                if not name in ab_map:
++                    ab_map[name] = {'mntpoint' : mntpoint}
++
++                if partition.get('shadow', False):
++                    ab_map[name]['shadow'] = partuuid
++                else:
++                    ab_map[name]['active'] = partuuid
++
++        # assuming a virgin file with no settings, or no file
++        with open(abupdate_conf, 'a') as f:
++            f.write(f"BOOT_TYPE={boot_map[bootmode]}\n")
++
++            for name, ab in ab_map.items():
++                f.write(f"{name}=({ab['active']} {ab['shadow']} {ab['mntpoint']})\n")
++
++            sets = " ".join(ab_map.keys())
++            f.write(f"SETS=({sets})\n")
++
++
+     def _generate_partitions_param(self, reverse=False):
+         """
+         Generate partition param for mount command
+@@ -1265,34 +1327,42 @@ class Installer(object):
+
+         return ptv
+
++
+     def _insert_boot_partitions(self):
+         bios_found = False
+         esp_found = False
+-        for partition in self.install_config['partitions']:
++        partitions = self.install_config['partitions']
++
++        for partition in partitions:
+             ptype = self._get_partition_type(partition)
+             if ptype == PartitionType.BIOS:
+                 bios_found = True
+             if ptype == PartitionType.ESP:
+                 esp_found = True
++                efi_partition = partition
+
+         # Adding boot partition required for ostree if already not present in partitions table
+         if 'ostree' in self.install_config:
+-            mount_points = [partition['mountpoint'] for partition in self.install_config['partitions'] if 'mountpoint' in partition]
++            mount_points = [partition['mountpoint'] for partition in partitions if 'mountpoint' in partition]
+             if '/boot' not in mount_points:
+                 boot_partition = {'size': 300, 'filesystem': 'ext4', 'mountpoint': '/boot'}
+-                self.install_config['partitions'].insert(0, boot_partition)
++                partitions.insert(0, boot_partition)
+
+         bootmode = self.install_config.get('bootmode', 'bios')
+
+-        # Insert efi special partition
+-        if not esp_found and (bootmode == 'dualboot' or bootmode == 'efi'):
+-            efi_partition = {'size': ESPSIZE, 'filesystem': 'vfat', 'mountpoint': '/boot/efi'}
+-            self.install_config['partitions'].insert(0, efi_partition)
++        if bootmode == 'dualboot' or bootmode == 'efi':
++            # Insert efi special partition
++            if not esp_found:
++                efi_partition = {'size': ESPSIZE, 'filesystem': 'vfat', 'mountpoint': '/boot/efi'}
++                partitions.insert(0, efi_partition)
++
++            if self.ab_present:
++                efi_partition['ab'] = True
+
+         # Insert bios partition last to be very first
+         if not bios_found and (bootmode == 'dualboot' or bootmode == 'bios'):
+             bios_partition = {'size': BIOSSIZE, 'filesystem': 'bios'}
+-            self.install_config['partitions'].insert(0, bios_partition)
++            partitions.insert(0, bios_partition)
+
+
+     def __set_ab_partition_size(self, l2entries, used_size, total_disk_size):
+@@ -1333,7 +1403,6 @@ class Installer(object):
+         if self.install_config['ui']:
+             self.progress_bar.update_message('Partitioning...')
+
+-        self._insert_boot_partitions()
+         ptv = self._get_partition_tree_view()
+
+         self.__ptv_update_partition_sizes(ptv)
+-- 
+2.23.1
+
diff --git a/...y-Set-default-value-of-live-to-True.patch → ...y-Set-default-value-of-live-to-True.patch b/...y-Set-default-value-of-live-to-True.patch → ...y-Set-default-value-of-live-to-True.patch
@@ -1,15 +1,15 @@
 From db093194a30c7328c3792c19407b3568061cc398 Mon Sep 17 00:00:00 2001
 From: Piyush Gupta <[email protected]>
 Date: Mon, 27 Feb 2023 13:30:32 +0000
-Subject: [PATCH] installer.py: Set default value of "live" to True.
+Subject: [PATCH 02/13] installer.py: Set default value of "live" to True.
 
 Change-Id: Ia47223758899a112d1900d82b54f7798fbd99434
 ---
  photon_installer/installer.py | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/photon_installer/installer.py b/photon_installer/installer.py
-index aab33397..f5672896 100755
+index aab3339..f567289 100755
 --- a/photon_installer/installer.py
 +++ b/photon_installer/installer.py
 @@ -241,6 +241,7 @@ class Installer(object):
@@ -21,5 +21,5 @@ index aab33397..f5672896 100755
                  install_config['live'] = False
 
 -- 
-2.23.3
+2.23.1
 
diff --git a/...aise-exception-in-case-installer-fa.patch → ...aise-exception-in-case-installer-fa.patch b/...aise-exception-in-case-installer-fa.patch → ...aise-exception-in-case-installer-fa.patch
@@ -1,7 +1,8 @@
 From b42ba1c5dac0b0202a7dae93c02370afb611e615 Mon Sep 17 00:00:00 2001
 From: Piyush Gupta <[email protected]>
 Date: Mon, 27 Feb 2023 12:42:42 +0000
-Subject: [PATCH 2/2] isoInstaller.py: Raise exception in case installer fails.
+Subject: [PATCH 03/13] isoInstaller.py: Raise exception in case installer
+ fails.
 
 Fixes https://github.com/vmware/photon-os-installer/commit/ede221e30e17feb733f8327b1ba03386bc5884b5
 
@@ -11,7 +12,7 @@ Change-Id: I58abe505aa230dd498c2461ab926068b563e59c6
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/photon_installer/isoInstaller.py b/photon_installer/isoInstaller.py
-index 12bf307d..39dd4152 100755
+index 12bf307..39dd415 100755
 --- a/photon_installer/isoInstaller.py
 +++ b/photon_installer/isoInstaller.py
 @@ -87,8 +87,8 @@ class IsoInstaller(object):
@@ -26,5 +27,5 @@ index 12bf307d..39dd4152 100755
      def _load_ks_config(self, path):
          """kick start configuration"""
 -- 
-2.23.3
+2.23.1
 
diff --git a/...h-Remove-rpmdb-files-from-the-insta.patch → ...h-Remove-rpmdb-files-from-the-insta.patch b/...h-Remove-rpmdb-files-from-the-insta.patch → ...h-Remove-rpmdb-files-from-the-insta.patch
@@ -1,8 +1,8 @@
 From 0e8f8e0e3ddeb3392f1eb20278b6bccd607d2c42 Mon Sep 17 00:00:00 2001
 From: Piyush Gupta <[email protected]>
 Date: Fri, 17 Feb 2023 09:02:19 +0000
-Subject: [PATCH 5/7] generate_initrd.sh: Remove rpmdb files from the installer
- image, not needed in installer.
+Subject: [PATCH 04/13] generate_initrd.sh: Remove rpmdb files from the
+ installer image, not needed in installer.
 
 Change-Id: Idefbe30cda8372ec78f38842dce17a47ffc02b01
 ---
@@ -79,5 +79,5 @@ index de8d981..cdf2eda 100755
  # Set password max days to 99999 (disable aging)
  chroot ${INITRD} /bin/bash -c "chage -M 99999 root"
 -- 
-2.25.1
+2.23.1
 
diff --git a/...aller/0006-test.log-Remove-test.log.patch → ...aller/0005-test.log-Remove-test.log.patch b/...aller/0006-test.log-Remove-test.log.patch → ...aller/0005-test.log-Remove-test.log.patch
@@ -1,7 +1,7 @@
 From f53253025338f5eb07fb3df4de9a1b9108afa0db Mon Sep 17 00:00:00 2001
 From: Piyush Gupta <[email protected]>
 Date: Tue, 28 Feb 2023 10:25:42 +0000
-Subject: [PATCH 6/7] test.log: Remove test.log.
+Subject: [PATCH 05/13] test.log: Remove test.log.
 
 Change-Id: I7d7b935ddcbec66113ef67c3a1e2517902af4121
 ---
@@ -18,5 +18,5 @@ index 3598c30..0000000
 -tests
 \ No newline at end of file
 -- 
-2.25.1
+2.23.1
 
diff --git a/...aller/0007-fix-a-few-network-issues.patch → ...aller/0006-fix-a-few-network-issues.patch b/...aller/0007-fix-a-few-network-issues.patch → ...aller/0006-fix-a-few-network-issues.patch
@@ -1,7 +1,7 @@
 From e4e1247d30439a591bc9fb61f810f27ae039ee50 Mon Sep 17 00:00:00 2001
 From: Oliver Kurth <[email protected]>
 Date: Mon, 27 Feb 2023 11:28:07 -0800
-Subject: [PATCH 7/7] fix a few network issues
+Subject: [PATCH 06/13] fix a few network issues
 
 Change-Id: Ia63fd488d18760321bbbb75b95fb758047e0126e
 ---
@@ -245,5 +245,5 @@ index d417c10..089ffe7 100644
  		"destination": "/etc/config/config.file"
  	}
 -- 
-2.25.1
+2.23.1