@@ -4,7 +4,7 @@

 Summary:        dracut to create initramfs

 Name:           dracut

 Version:        050

-Release:        5%{?dist}

+Release:        6%{?dist}

 Group:          System Environment/Base

 # The entire source code is GPLv2+

 # except install/* which is LGPLv2+

@@ -156,6 +156,8 @@ rm -rf -- $RPM_BUILD_ROOT

 %dir /var/lib/dracut/overlay

 %changelog

+*   Tue Dec 15 2020 Shreenidhi Shedi <sshedi@vmware.com> 050-6

+-   Adjust hostonly based on running environment

 *   Tue Nov 03 2020 Srinidhi Rao <srinidhir@vmware.com> 050-5

 -   Remove fipsify support

 *   Fri Oct 09 2020 Shreenidhi Shedi <sshedi@vmware.com> 050-4

@@ -1,20 +1,56 @@

-diff --color -Naurp -rupN dracut-050/mkinitrd-dracut.sh dracut-050-new/mkinitrd-dracut.sh

-+++ dracut-050-new/mkinitrd-dracut.sh	2020-10-09 12:23:40.832349012 +0530

-@@ -61,7 +61,15 @@ default_kernel_images() {

+From c06a5e795b9213b749ded74e5f9ced0e63ad93f4 Mon Sep 17 00:00:00 2001

+From: Shreenidhi Shedi <sshedi@vmware.com>

+Date: Mon, 21 Dec 2020 12:41:51 +0530

+Subject: [PATCH] adjust host_only flag based on running environment

+

+host_only decides the nature of initrd.

+If initrd is getting generated in docker/chroot environemnt, it should

+be generic. Otherwise cloud-images & ova will have a host specific

+initrd which may fail to boot on a different host.

+

+Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>

+---

+ mkinitrd-dracut.sh | 20 +++++++++++++++++---

+ 1 file changed, 17 insertions(+), 3 deletions(-)

+

+diff --git a/mkinitrd-dracut.sh b/mkinitrd-dracut.sh

+index 01c989c3..6d502a09 100755

+--- a/mkinitrd-dracut.sh

+@@ -60,9 +60,6 @@ default_kernel_images() {

+ 	kernels="$kernels $kernel_version"

          targets="$targets $boot_dir/initrd.img-$kernel_version"

      done

- 

+-

 -    host_only=1

-+    # don't set hostonly flag if running in docker env

-+    # if set initrd will be incomplete

-+    # https://fedoraproject.org/wiki/Features/DracutHostOnly#Detailed_Description

-+    # https://man7.org/linux/man-pages/man5/dracut.conf.5.html

-+    if grep -qc docker /proc/self/cgroup; then

-+      host_only=0

-+    else

-+      host_only=1

-+    fi

-     force=1

+-    force=1

  }

+ while (($# > 0)); do

+@@ -148,6 +145,23 @@ done

+ targets=( $targets )

+ [[ $kernels ]] && kernels=( $kernels )

+ 

++# don't set hostonly flag if running in docker env

++# if set initrd will be incomplete

++# https://fedoraproject.org/wiki/Features/DracutHostOnly#Detailed_Description

++# https://man7.org/linux/man-pages/man5/dracut.conf.5.html

++if grep -qc docker /proc/self/cgroup; then

++  echo "--- Generating initrd under docker environment ---"

++  host_only=0

++elif [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ]; then

++  # set host_only=0 if initrd is generated in chroot

++  # otherwise cloud images generated in a Photon host will have bad initrd

++  echo "--- Generating initrd under chroot environment ---"

++  host_only=0

++else

++  host_only=1

++fi

++force=1

++

+ [[ $host_only == 1 ]] && dracut_args="${dracut_args} -H"

+ [[ $force == 1 ]]     && dracut_args="${dracut_args} -f"

+ 

+-- 

+2.17.1

+

@@ -750,6 +750,7 @@ class BuildImage:

         self.srpm_path = constants.sourceRpmPath

         self.pkg_to_rpm_map_file = os.path.join(Build_Config.stagePath, "pkg_info.json")

         self.ph_docker_image = configdict["photon-build-param"]["photon-docker-image"]

+        self.ova_cloud_images = ["ami", "gce", "azure", "ova_uefi", "ova"]

     def set_Iso_Parameters(self, imgName):

         self.generated_data_path = Build_Config.stagePath + "/common/data"

@@ -829,7 +830,7 @@ class BuildImage:

             rpmBuildTarget.packages()

         if not check_prerequesite["ostree-repo"]:

             RpmBuildTarget.ostree_repo()

-        print("Building image " + self.img_name)

+        print("Building " + self.img_name + " image")

         imagebuilder.createImage(self)

     @staticmethod

@@ -865,8 +866,7 @@ class BuildImage:

         os.chdir(curDir)

     def all_images(self):

-        images = ["ami", "gce", "azure", "ova_uefi", "ova"]

-        for img in images:

+        for img in self.ova_cloud_images:

            self.img_name = img

            self.build_image()

@@ -1078,7 +1078,7 @@ def main():

             if options.targetName in ["iso", "src-iso", "minimal-iso", "rt-iso"]:

                 buildImage.set_Iso_Parameters(options.targetName)

                 buildImage.build_iso()

-            elif options.targetName in ["ami", "gce", "ova", "ova_uefi", "azure", "rpi", "ls1012afrwy"]:

+            elif options.targetName in buildImage.ova_cloud_images + ["rpi", "ls1012afrwy"]:

                 buildImage.build_image()

             else:

                 attr = getattr(buildImage, configdict["targetName"])

@@ -24,7 +24,7 @@ rm -f /etc/ssh/ssh_host_*

 sudo groupadd docker

 sudo groupadd sudo

-rm /root/.ssh/authorized_keys   

+rm /root/.ssh/authorized_keys

 # ssh server config

 # Override old values

@@ -66,14 +66,3 @@ sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=tty

 # Remove kernel symbols

 rm -f /boot/System.map*

-

-arch="$(uname -m)"

-

-if [[ "$arch" == "aarch64" ]]; then

-kver="$(rpm -q --queryformat "%{VERSION}-%{RELEASE}" linux)"

-

-# Regenerate initramfs to reflect the new dracut config and also without the host-only flag

-# TODO: improve mkinitrd to simplify the command line

-

-dracut_args='-N --force' mkinitrd "/boot/initrd.img-$kver" "$kver"

-fi

@@ -16,10 +16,3 @@ cat > /etc/modules-load.d/genet.conf << "EOF"

 mdio_bcm_unimac

 genet

 EOF

-

-kver="$(rpm -q --queryformat "%{VERSION}-%{RELEASE}" linux)"

-

-# Regenerate initramfs to reflect the new dracut config and also without the host-only flag

-# TODO: improve mkinitrd to simplify the command line

-

-dracut_args='-N --force' mkinitrd "/boot/initrd.img-$kver" "$kver"