new file mode 100644

@@ -0,0 +1,42 @@

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

+index 43128e1..d1182f4 100644

+--- a/dracut-init.sh

+@@ -19,11 +19,7 @@

+ #

+ export LC_MESSAGES=C

+ 

+-if [[ "$EUID" = "0" ]]; then

+-    export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr,links -dfr"

+-else

+     export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,links -dfr"

+-fi

+ 

+ # is_func <command>

+ # Check whether $1 is a function.

+diff --git a/install/dracut-install.c b/install/dracut-install.c

+index 32faee6..d7fe26c 100644

+--- a/install/dracut-install.c

+@@ -300,10 +300,6 @@ static int cp(const char *src, const char *dst)

+  normal_copy:

+         pid = fork();

+         if (pid == 0) {

+-                if (geteuid() == 0)

+-                        execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,xattr,timestamps", "-fL", src, dst,

+-                               NULL);

+-                else

+                         execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst,

+                                NULL);

+                 _exit(EXIT_FAILURE);

+@@ -312,10 +308,6 @@ static int cp(const char *src, const char *dst)

+         while (waitpid(pid, &ret, 0) < 0) {

+                 if (errno != EINTR) {

+                         ret = -1;

+-                        if (geteuid() == 0)

+-                                log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,xattr,timestamps -fL %s %s", src,

+-                                          dst);

+-                        else

+                                 log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src,

+                                           dst);

+                         break;

@@ -5,7 +5,7 @@

 Name:		dracut

 Version:	045

-Release:	1%{?dist}

+Release:	2%{?dist}

 Group:		System Environment/Base

 # The entire source code is GPLv2+

 # except install/* which is LGPLv2+

@@ -18,6 +18,8 @@ Source0:	http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar

 Source1:        https://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz

 %define sha1 asciidoc=82e574dd061640561fa0560644bc74df71fb7305

 Patch0:		https://www.gnu.org/licenses/lgpl-2.1.txt

+Patch1:		disable-xattr.patch

+Patch2:		fix-initrd-naming-for-photon.patch

 Summary:	dracut to create initramfs

 Vendor:		VMware, Inc.

 Distribution:	Photon

@@ -48,6 +50,8 @@ This package contains tools to assemble the local initrd and host configuration.

 %setup -q -n %{name}-%{version}

 cp %{PATCH0} .

 tar xf %{SOURCE1} --no-same-owner

+%patch1 -p1

+%patch2 -p1

 %build

 %configure --systemdsystemunitdir=%{_unitdir} --bashcompletiondir=$(pkg-config --variable=completionsdir bash-completion) \

@@ -115,7 +119,7 @@ rm -rf -- $RPM_BUILD_ROOT

 %dir %{dracutlibdir}

 %dir %{dracutlibdir}/modules.d

 %{dracutlibdir}/modules.d/*

-/usr/lib/kernel/install.d/*

+%exclude %{_libdir}/kernel

 /usr/lib/dracut/dracut-init.sh

 /usr/share/pkgconfig/dracut.pc

 %{dracutlibdir}/dracut-functions.sh

@@ -157,6 +161,8 @@ rm -rf -- $RPM_BUILD_ROOT

 %dir /var/lib/dracut/overlay

 %changelog

+*	Thu Apr 27 2017 Bo Gan <ganb@vmware.com> 045-2

+-	Disable xattr for cp

 *	Wed Apr 12 2017 Chang Lee <changlee@vmware.com> 045-1

 -	Updated to 045

 *	Wed Jan 25 2017 Harish Udaiya Kumar <hudaiyakumr@vmware.com> 044-6

new file mode 100644

@@ -0,0 +1,153 @@

+diff --git a/lsinitrd.sh b/lsinitrd.sh

+index b19a66a..7bb1188 100755

+--- a/lsinitrd.sh

+@@ -92,15 +92,7 @@ if [[ $1 ]]; then

+         exit 1

+     fi

+ else

+-    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id

+-

+-    if [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \

+-        && [[ $MACHINE_ID ]] \

+-        && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then

+-        image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"

+-    else

+-        image="/boot/initramfs-${KERNEL_VERSION}.img"

+-    fi

++    image="/boot/initrd.img-${KERNEL_VERSION}"

+ fi

+ 

+ shift

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

+index da34e34..638280a 100755

+--- a/mkinitrd-dracut.sh

+@@ -1,5 +1,5 @@

+ #!/bin/bash --norc

+-kver=$(uname -r)

++kernel_ver_dir='/var/lib/initramfs/kernel'

+ 

+ boot_dir="/boot"

+ quiet=0

+@@ -48,63 +48,16 @@ read_arg() {

+     fi

+ }

+ 

+-# Taken over from SUSE mkinitrd

++# For photon

+ default_kernel_images() {

+-    local regex kernel_image kernel_version version_version initrd_image

+-    local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'

+-

+-    case "$(uname -m)" in

+-        s390|s390x)

+-            regex='image'

+-            ;;

+-        ppc|ppc64)

+-            regex='vmlinux'

+-            ;;

+-        i386|x86_64)

+-            regex='vmlinuz'

+-            ;;

+-        arm*)

+-            regex='[uz]Image'

+-            ;;

+-        aarch64)

+-            regex='Image'

+-            ;;

+-        *)  regex='vmlinu.'

+-            ;;

+-    esac

++    local kernel_version

+ 

+-    # user mode linux

+-    if grep -q UML /proc/cpuinfo; then

+-            regex='linux'

+-    fi

++    for kernel_version in $(ls $kernel_ver_dir) ; do

++

++        # Take this directory as the source of truth

++        kernels="$kernels $kernel_version"

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

+ 

+-    kernel_images=""

+-    initrd_images=""

+-    for kernel_image in $(ls $boot_dir \

+-            | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \

+-            | grep -v kdump$ ) ; do

+-

+-        # Note that we cannot check the RPM database here -- this

+-        # script is itself called from within the binary kernel

+-        # packages, and rpm does not allow recursive calls.

+-

+-        [ -L "$boot_dir/$kernel_image" ] && continue

+-        [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue

+-        kernel_version=$(/usr/bin/get_kernel_version \

+-                         $boot_dir/$kernel_image 2> /dev/null)

+-        initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")

+-        if [ "$kernel_image" != "$initrd_image" -a \

+-             -n "$kernel_version" -a \

+-             -d "/lib/modules/$kernel_version" ]; then

+-                kernel_images="$kernel_images $boot_dir/$kernel_image"

+-                initrd_images="$initrd_images $boot_dir/$initrd_image"

+-        fi

+-    done

+-    for kernel_image in $kernel_images;do

+-	kernels="$kernels ${kernel_image#*-}"

+-    done

+-    for initrd_image in $initrd_images;do

+-	targets="$targets $initrd_image"

+     done

+     host_only=1

+     force=1

+@@ -187,7 +140,7 @@ while (($# > 0)); do

+ done

+ 

+ [[ $targets && $kernels ]] || default_kernel_images

+-[[ $targets && $kernels ]] || (error "No kernel found in $boot_dir" && usage)

++[[ $targets && $kernels ]] || (error "No Kernel Registered")

+ 

+ # We can have several targets/kernels, transform the list to an array

+ targets=( $targets )

+@@ -196,7 +149,6 @@ targets=( $targets )

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

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

+ 

+-echo "Creating: target|kernel|dracut args|basicmodules "

+ for ((i=0 ; $i<${#targets[@]} ; i++)); do

+ 

+     if [[ $img_vers ]];then

+@@ -206,21 +158,27 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do

+     fi

+     kernel="${kernels[$i]}"

+ 

++    if [[ -s "$kernel_ver_dir/$kernel" ]]; then

++        readarray -t kernel_cfg < <(xargs -n1 -a $kernel_ver_dir/$kernel)

++    else

++        kernel_cfg=()

++    fi

++

+     # Duplicate code: No way found how to redirect output based on $quiet

+     if [[ $quiet == 1 ]];then

+-	echo "$target|$kernel|$dracut_args|$basicmodules"

++	echo "Creating $target"

+ 	if [[ $basicmodules ]]; then

+-            dracut $dracut_args --add-drivers "$basicmodules" "$target" \

++            dracut $dracut_args --add-drivers "$basicmodules" "${kernel_cfg[@]}" "$target" \

+ 		"$kernel" &>/dev/null

+ 	else

+-            dracut $dracut_args "$target" "$kernel" &>/dev/null

++            dracut $dracut_args "${kernel_cfg[@]}" "$target" "$kernel" &>/dev/null

+ 	fi

+     else

+ 	if [[ $basicmodules ]]; then

+-            dracut $dracut_args --add-drivers "$basicmodules" "$target" \

++            dracut $dracut_args --add-drivers "$basicmodules" "${kernel_cfg[@]}" "$target" \

+ 		"$kernel"

+ 	else

+-            dracut $dracut_args "$target" "$kernel"

++            dracut $dracut_args "${kernel_cfg[@]}" "$target" "$kernel"

+ 	fi

+     fi

+ done

new file mode 100644

@@ -0,0 +1 @@

+fscks="e2fsck fsck fsck.ext2 fsck.ext3 fsck.ext4"

@@ -1,48 +1,78 @@

 Summary:	initramfs

 Name:		initramfs

-Version:	1.0

-Release:	7%{?kernelsubrelease}%{?dist}

+Version:	2.0

+Release:	1%{?dist}

+Source0:	fscks.conf

 License:	Apache License

 Group:		System Environment/Base

 Vendor:		VMware, Inc.

 Distribution:	Photon

-BuildRequires:       linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

-BuildRequires:       dracut

-BuildRequires:       ostree

-BuildRequires:       e2fsprogs

-Requires:	     linux = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

+Provides:	initramfs

+Requires:	dracut

 %description

-Photon release files such as yum configs and other /etc/ release related files

-

-%prep

-umask 022

-cd /usr/src/photon/BUILD

-cd /usr/src/photon/BUILD

-rm -rf initramfs

-mkdir initramfs

-cd initramfs

-/bin/chmod -Rf a+rX,u+w,g-w,o-w .

-echo 'add_drivers+="tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev xen-privcmd xen-pciback xenfs hv_ballon hv_utils hv_vmbus cn"' >> /etc/dracut.conf

-

-echo 'add_dracutmodules+=" ostree systemd "' > /etc/dracut.conf.d/ostree.conf

-

-%build

-dracut --force --kver %{KERNEL_VERSION}-%{KERNEL_RELEASE} --fscks "e2fsck fsck fsck.ext2 fsck.ext3 fsck.ext4" initrd.img-%{KERNEL_VERSION}-%{KERNEL_RELEASE}

+This package provides the configuration files for initrd generation.

+

 %install

-rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT/boot

-install -m 600 initrd.img-%{KERNEL_VERSION}-%{KERNEL_RELEASE} $RPM_BUILD_ROOT/boot/initrd.img-%{KERNEL_VERSION}-%{KERNEL_RELEASE}

+mkdir -p %{buildroot}%{_sysconfdir}/dracut.conf.d

+install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/dracut.conf.d/

+install -d -m755 %{buildroot}%{_localstatedir}/lib/initramfs/kernel

+

+%define watched_path %{_sbindir} %{_libdir}/udev/rules.d %{_libdir}/systemd/system  /lib/modules

+%define watched_pkgs e2fsprogs, ostree, systemd, kpartx, device-mapper-multipath

+

+%define removal_action \

+rm -rf %{_localstatedir}/lib/rpm-state/initramfs.regenerate \

+rm -rf %{_localstatedir}/lib/rpm-state/initramfs.pending

+

+%define pkgs_trigger_action \

+[ -f %{_localstatedir}/lib/rpm-state/initramfs.regenerate ] && exit 0 \

+mkdir -p %{_localstatedir}/lib/rpm-state \

+touch %{_localstatedir}/lib/rpm-state/initramfs.regenerate \

+echo "initramfs (re)generation triggered" >&2

+

+%define file_trigger_action \

+if [ -f %{_localstatedir}/lib/rpm-state/initramfs.regenerate ]; then \

+    echo "(re)generate initramfs for all kernels" >&2 \

+    mkinitrd -q \

+elif [ -d %{_localstatedir}/lib/rpm-state/initramfs.pending ]; then \

+    for k in `ls %{_localstatedir}/lib/rpm-state/initramfs.pending/`; do \

+        echo "generate initramfs for $k" >&2 \

+        mkinitrd -q /boot/initrd.img-$k $k \

+    done; \

+fi \

+%{removal_action}

+

+%post

+%{pkgs_trigger_action}

+

+%postun

+[ $1 -eq 0 ] || exit 0

+%{removal_action}

+

+%posttrans

+%{file_trigger_action}

+

+%triggerin -- %{watched_pkgs}

+%{pkgs_trigger_action}

+

+%triggerun -- %{watched_pkgs}

+%{pkgs_trigger_action}

+

+%transfiletriggerin -- %{watched_path}

+%{file_trigger_action}

-%clean

-rm -rf $RPM_BUILD_ROOT

+%transfiletriggerpostun -- %{watched_path}

+%{file_trigger_action}

 %files

 %defattr(-,root,root,-)

-%dir /boot

-/boot/initrd.img-%{KERNEL_VERSION}-%{KERNEL_RELEASE}

+%{_sysconfdir}/dracut.conf.d/fscks.conf

+%dir %{_localstatedir}/lib/initramfs/kernel

 %changelog

+*   Wed Apr 12 2017 Bo Gan <ganb@vmware.com> 2.0-1

+-   Made initrd generation dynamic, triggers for systemd, e2fs-progs

 *   Wed Nov 30 2016 Alexey Makhalov <amakhalov@vmware.com> 1.0-7

 -   Expand uname -r to have release number

 *   Wed Nov 23 2016 Anish Swaminathan <anishs@vmware.com>  1.0-6

new file mode 100644

@@ -0,0 +1,9 @@

+%triggerin -- initramfs

+mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending

+touch %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending/%{uname_r}

+echo "initrd generation of kernel %{uname_r} will be triggered later" >&2

+

+%triggerun -- initramfs

+rm -rf %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending/%{uname_r}

+rm -rf /boot/initrd.img-%{uname_r}

+echo "initrd of kernel %{uname_r} removed" >&2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.9.24

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -11,6 +11,7 @@ Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

 %define sha1 linux=c504e8817a320030313710066360bc50be7bebe8

 Source1:        config-esx-%{version}

+Source2:        initramfs.trigger

 # common

 Patch0:         x86-vmware-read-tsc_khz-only-once-at-boot-time.patch

 Patch1:         x86-vmware-use-tsc_khz-value-for-calibrate_cpu.patch

@@ -136,8 +137,13 @@ cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF"

 # GRUB Environment Block

 photon_cmdline=init=/lib/systemd/systemd rcupdate.rcu_expedited=1 rw systemd.show_status=0 quiet noreplace-smp cpu_init_udelay=0

 photon_linux=vmlinuz-%{uname_r}

+#photon_initrd=initrd.img-%{uname_r}

 EOF

+# Register myself to initramfs

+mkdir -p %{buildroot}/%{_localstatedir}/lib/initramfs/kernel

+touch %{buildroot}/%{_localstatedir}/lib/initramfs/kernel/%{uname_r}

+

 # cleanup dangling symlinks

 rm -f %{buildroot}/lib/modules/%{uname_r}/source

 rm -f %{buildroot}/lib/modules/%{uname_r}/build

@@ -154,6 +160,8 @@ cp .config %{buildroot}/usr/src/linux-headers-%{uname_r}

 ln -sf /usr/src/linux-headers-%{uname_r} %{buildroot}/lib/modules/%{uname_r}/build

 find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x

+%include %{SOURCE2}

+

 %post

 /sbin/depmod -aq %{uname_r}

 ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

@@ -164,6 +172,7 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /boot/config-%{uname_r}

 /boot/vmlinuz-%{uname_r}

 %config(noreplace) /boot/linux-%{uname_r}.cfg

+%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}

 /lib/modules/*

 %exclude /lib/modules/%{uname_r}/build

 %exclude /usr/src

@@ -178,6 +187,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Thu Apr 27 2017 Bo Gan <ganb@vmware.com> 4.9.24-2

+-   Support dynamic initrd generation

 *   Tue Apr 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.24-1

 -   Fix CVE-2017-6874 and CVE-2017-7618.

 -   .config: build nvme and nvme-core in kernel.

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.24

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -12,6 +12,7 @@ Source0:       http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.

 %define sha1 linux=c504e8817a320030313710066360bc50be7bebe8

 Source1:        config-secure-%{version}

 Source2:        aufs4.9.tar.gz

+Source3:        initramfs.trigger

 # common

 Patch0:         x86-vmware-read-tsc_khz-only-once-at-boot-time.patch

 Patch1:         x86-vmware-use-tsc_khz-value-for-calibrate_cpu.patch

@@ -174,6 +175,13 @@ cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF"

 # GRUB Environment Block

 photon_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet no-vmw-sta loadpin.enabled=0 slub_debug=P page_poison=1

 photon_linux=vmlinuz-%{uname_r}

+photon_initrd=initrd.img-%{uname_r}

+EOF

+

+# Register myself to initramfs

+mkdir -p %{buildroot}/%{_localstatedir}/lib/initramfs/kernel

+cat > %{buildroot}/%{_localstatedir}/lib/initramfs/kernel/%{uname_r} << "EOF"

+--add-drivers "tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev xen-privcmd xen-pciback xenfs hv_utils hv_vmbus hv_balloon cn"

 EOF

 # cleanup dangling symlinks

@@ -191,6 +199,9 @@ cp .config %{buildroot}/usr/src/linux-headers-%{uname_r}

 # symling to the build folder

 ln -sf /usr/src/linux-headers-%{uname_r} %{buildroot}/lib/modules/%{uname_r}/build

+

+%include %{SOURCE3}

+

 %post

 /sbin/depmod -aq %{uname_r}

 ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

@@ -201,6 +212,7 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /boot/config-%{uname_r}

 /boot/vmlinuz-%{uname_r}

 %config(noreplace) /boot/linux-%{uname_r}.cfg

+%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}

 /lib/firmware/*

 /lib/modules/*

 %exclude /lib/modules/%{uname_r}/build

@@ -216,6 +228,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Thu Apr 27 2017 Bo Gan <ganb@vmware.com> 4.9.24-2

+-   Support dynamic initrd generation

 *   Tue Apr 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.24-1

 -   Fix CVE-2017-6874 and CVE-2017-7618.

 -   .config: build nvme and nvme-core in kernel.

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.9.24

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -11,6 +11,7 @@ Distribution: 	Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

 %define sha1 linux=c504e8817a320030313710066360bc50be7bebe8

 Source1:	config-%{version}

+Source2:	initramfs.trigger

 # common

 Patch0:         x86-vmware-read-tsc_khz-only-once-at-boot-time.patch

 Patch1:         x86-vmware-use-tsc_khz-value-for-calibrate_cpu.patch

@@ -162,6 +163,12 @@ photon_linux=vmlinuz-%{uname_r}

 photon_initrd=initrd.img-%{uname_r}

 EOF

+# Register myself to initramfs

+mkdir -p %{buildroot}/%{_localstatedir}/lib/initramfs/kernel

+cat > %{buildroot}/%{_localstatedir}/lib/initramfs/kernel/%{uname_r} << "EOF"

+--add-drivers "tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev xen-privcmd xen-pciback xenfs hv_utils hv_vmbus hv_balloon cn"

+EOF

+

 #    Cleanup dangling symlinks

 rm -rf %{buildroot}/lib/modules/%{uname_r}/source

 rm -rf %{buildroot}/lib/modules/%{uname_r}/build

@@ -183,6 +190,8 @@ find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x

 # Linux version that was affected is 4.4.26

 make -C tools JOBS=1 DESTDIR=%{buildroot} prefix=%{_prefix} perf_install

+%include %{SOURCE2}

+

 %post

 /sbin/depmod -aq %{uname_r}

 ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

@@ -202,6 +211,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /boot/config-%{uname_r}

 /boot/vmlinuz-%{uname_r}

 %config(noreplace) /boot/%{name}-%{uname_r}.cfg

+%config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}

 /lib/firmware/*

 %defattr(0644,root,root)

 /lib/modules/%{uname_r}/*

@@ -243,6 +253,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Thu Apr 27 2017 Bo Gan <ganb@vmware.com> 4.9.24-2

+-   Support dynamic initrd generation

 *   Tue Apr 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.24-1

 -   Fix CVE-2017-6874 and CVE-2017-7618.

 -   Fix audit-devel BuildRequires.

@@ -410,8 +410,7 @@ class Installer(object):

     def adjust_packages_for_vmware_virt(self):

         try:

-            if (self.install_config['vmware_virt'] and

-                self.install_config['install_linux_esx']):

+            if self.install_config['install_linux_esx']:

                 selected_packages = self.install_config['packages']

                 try:

                     selected_packages.remove('linux')

@@ -184,9 +184,6 @@ class IsoInstaller(object):

             random_id = '%12x' % random.randrange(16**12)

             random_hostname = "photon-" + random_id.strip()

             install_config = {'iso_system': False}

-            install_config['vmware_virt'] = False

-            if self.is_vmware_virtualization():

-                install_config['vmware_virt'] = True

             license_agreement = License(self.maxy, self.maxx)

             select_disk = SelectDisk(self.maxy, self.maxx, install_config)

             select_partition = PartitionISO(self.maxy, self.maxx, install_config)

@@ -236,7 +233,7 @@ class IsoInstaller(object):

             items.append((select_disk.guided_partitions, False))

             items.append((package_selector.display, True))

             select_linux_index = -1

-            if install_config['vmware_virt'] == True:

+            if self.is_vmware_virtualization():

                 linux_selector   = LinuxSelector(self.maxy, self.maxx, install_config)

                 items.append((linux_selector.display, True))

                 select_linux_index = items.index((linux_selector.display, True))

@@ -247,6 +244,8 @@ class IsoInstaller(object):

         else:

             install_config = ks_config

             install_config['iso_system'] = False

+            if self.is_vmware_virtualization() and 'install_linux_esx' not in install_config:

+                 install_config['install_linux_esx'] = True

         installer = InstallerContainer(install_config, self.maxy, self.maxx, True, rpm_path=rpm_path, log_path="/var/log", ks_config=ks_config)

@@ -27,8 +27,8 @@ class LinuxSelector(object):

         self.menu_starty = self.win_starty + 3

         self.menu_items = []

-        self.menu_items.append(("1. linux", self.set_linux_esx_installation, False))

-        self.menu_items.append(("2. linux-esx", self.set_linux_esx_installation, True))

+        self.menu_items.append(("1. linux-esx", self.set_linux_esx_installation, True))

+        self.menu_items.append(("2. linux", self.set_linux_esx_installation, False))

         self.host_menu = Menu(self.menu_starty, self.maxx, self.menu_items,

                               default_selected = 0, tab_enable=False)