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

 Summary:        Kernel

 Name:        linux-esx

 Version:    4.1.3

-Release:    2%{?dist}

+Release:    3%{?dist}

 License:    GPLv2

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

 Group:        System Environment/Kernel

@@ -103,13 +103,11 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 %post

 /sbin/depmod -aq %{version}-esx

-test -f /boot/grub/grub.cfg && sed -i '/set theme=/a \

-\

-menuentry "linux-esx-4.1.3" { \

-    insmod ext2 \

-    insmod part_gpt \

-    linux /boot/vmlinuz-esx-4.1.3 init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 root='`df | grep -e "\/$" | cut -f 1 -d " "`' rw systemd.show_status=0 elevator=noop quiet \

-}' /boot/grub/grub.cfg

+cat > /boot/photon.cfg << "EOF"

+# GRUB Environment Block

+photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop quiet

+photon_linux=/boot/vmlinuz-esx-%{version}

+EOF

 %files

 %defattr(-,root,root)

@@ -131,6 +129,8 @@ menuentry "linux-esx-4.1.3" { \

 /lib/modules/%{version}-esx/build

 %changelog

+*   Thu Aug 13 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-3

+-   Added environment file for grub.

 *   Tue Aug 11 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-2

     Added pci-probe-vmware.patch. Removed unused modules. Decreased boot time. 

 *   Tue Jul 28 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-1

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

 Summary:        Kernel

 Name:        linux

 Version:    4.0.9

-Release:    1%{?dist}

+Release:    2%{?dist}

 License:    GPLv2

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

 Group:        System Environment/Kernel

@@ -125,6 +125,12 @@ EOF

 %post

 /sbin/depmod -aq %{version}

+cat > /boot/photon.cfg << "EOF"

+# GRUB Environment Block

+photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet

+photon_linux=/boot/vmlinuz-%{version}

+photon_initrd=/boot/initrd.img-no-kmods

+EOF

 %post drivers-gpu

 /sbin/depmod -aq %{version}

@@ -164,6 +170,8 @@ EOF

 /lib/modules/%{version}/kernel/sound

 %changelog

+*   Thu Aug 13 2015 Alexey Makhalov <amakhalov@vmware.com> 4.0.9-2

+-   Added environment file for grub.

 *   Wed Aug 12 2015 Sharath George <sharathg@vmware.com> 4.0.9-1

 -   Upgrading kernel version.

 *   Wed Aug 12 2015 Alexey Makhalov <amakhalov@vmware.com> 3.19.2-5

@@ -75,16 +75,18 @@ mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

 cp boot/splash.tga ${BUILDROOT}/boot/grub2/themes/photon/photon.tga

 cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

 cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

-cat > "$BUILDROOT"/boot/grub2/grub.cfg << "EOF"

+cat > $BUILDROOT/boot/grub2/grub.cfg << EOF

 # Begin /boot/grub2/grub.cfg

 set default=0

 set timeout=5

-set root=(hd0,2)

+search -n -u $UUID -s

 loadfont /boot/grub2/unifont.pf2

 insmod gfxterm

 insmod vbe

 insmod tga

+insmod ext2

+insmod part_gpt

 set gfxmode="640x480"

 gfxpayload=keep

@@ -92,18 +94,17 @@ gfxpayload=keep

 terminal_output gfxterm

 set theme=/boot/grub2/themes/photon/theme.txt

+load_env -f /boot/photon.cfg

 menuentry "Photon" {

-	insmod ext2

-    insmod part_gpt

-	linux /boot/vmlinuz-4.0.9 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=3 ro

-	initrd /boot/initrd.img-no-kmods

+    linux \$photon_linux root=$PARTITION \$photon_cmdline

+    if [ "\$photon_initrd" ]; then

+        initrd \$photon_initrd

+    fi

 }

 # End /boot/grub2/grub.cfg

 EOF

-sed -i "s/UUID_PLACEHOLDER/$UUID/" "$BUILDROOT"/boot/grub2/grub.cfg > ${LOGFILE}	

-

 #Cleanup the workspace directory

 rm -rf "$BUILDROOT"/tools

 rm -rf "$BUILDROOT"/RPMS