@@ -44,10 +44,6 @@ if [[ $IMG_NAME == ova* ]]

   then

     command -v ovftool >/dev/null 2>&1 || { echo "Ovftool not installed. Aborting." >&2; exit 1; }

 fi

-if [[ $IMG_NAME != ova* ]]

-  then

-    cp ${BUILD_SCRIPTS_PATH}/mk-setup-grub.sh .

-fi

 if [ -e ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh ]

   then

@@ -63,7 +63,8 @@ fi

 #

 #	Install grub2.

 #

-UUID=$(blkid -s UUID -o value $ROOT_PARTITION_PATH)

+UUID_VAL=$(blkid -s UUID -o value $ROOT_PARTITION_PATH)

+PARTUUID_VAL=$(blkid -s PARTUUID -o value $ROOT_PARTITION_PATH)

 BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

 echo "Changing boot loader to MBR type on raw disk"

@@ -93,7 +94,7 @@ if [ "$BOOTMODE" == "efi" ]; then

     grub_efi_install

 fi

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

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

 # Begin /boot/grub2/grub.cfg

 #

 # DO NOT EDIT THIS FILE

@@ -103,12 +104,12 @@ cat > "$BUILDROOT"/boot/grub2/grub.cfg << "EOF"

 #

 ### BEGIN /etc/grub.d/00_header ###

-if [ -s $prefix/grubenv ]; then

+if [ -s \$prefix/grubenv ]; then

   load_env

 fi

 set default="0"

-if [ x"${feature_menuentry_id}" = xy ]; then

+if [ x"\${feature_menuentry_id}" = xy ]; then

   menuentry_id_option="--id"

 else

   menuentry_id_option=""

@@ -116,9 +117,10 @@ fi

 export menuentry_id_option

 load_env -f "$BOOT_DIRECTORY"photon.cfg

+set rootpartition=PARTUUID=$PARTUUID_VAL

-if [ "${prev_saved_entry}" ]; then

-  set saved_entry="${prev_saved_entry}"

+if [ "\${prev_saved_entry}" ]; then

+  set saved_entry="\${prev_saved_entry}"

   save_env saved_entry

   set prev_saved_entry=

   save_env prev_saved_entry

@@ -126,14 +128,14 @@ if [ "${prev_saved_entry}" ]; then

 fi

 function savedefault {

-  if [ -z "${boot_once}" ]; then

-    saved_entry="${chosen}"

+  if [ -z "\${boot_once}" ]; then

+    saved_entry="\${chosen}"

     save_env saved_entry

   fi

 }

 function load_video {

-  if [ x$feature_all_video_module = xy ]; then

+  if [ x\$feature_all_video_module = xy ]; then

     insmod all_video

   else

     insmod efi_gop

@@ -153,51 +155,51 @@ set timeout=5

 ### END /etc/grub.d/00_header ###

 ### BEGIN /etc/grub.d/10_linux ###

-menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-UUID_PLACEHOLDER' {

+menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os \$menuentry_id_option 'gnulinux-simple-UUID_PLACEHOLDER' {

     load_video

     set gfxpayload=keep

     insmod gzio

     insmod part_msdos

     insmod ext2

     set root='hd0,msdos2'

-    if [ x$feature_platform_search_hint = xy ]; then

+    if [ x\$feature_platform_search_hint = xy ]; then

       search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

     else

       search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

     fi

-    echo    'Loading Linux $photon_linux ...'

-    linux   "$BOOT_DIRECTORY"\$photon_linux root=UUID_PLACEHOLDER ro console=ttyS0,38400n8 

+    echo    'Loading Linux \$photon_linux ...'

+    linux   "$BOOT_DIRECTORY"\$photon_linux root=/dev/sda2 ro console=ttyS0,38400n8 

 }

-submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced-UUID_PLACEHOLDER' {

-    menuentry 'GNU/Linux, with Linux $photon_linux' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-$photon_linux-advanced-UUID_PLACEHOLDER' {

+submenu 'Advanced options for GNU/Linux' \$menuentry_id_option 'gnulinux-advanced-UUID_PLACEHOLDER' {

+    menuentry 'GNU/Linux, with Linux \$photon_linux' --class gnu-linux --class gnu --class os \$menuentry_id_option 'gnulinux-\$photon_linux-advanced-UUID_PLACEHOLDER' {

         load_video

         set gfxpayload=keep

         insmod gzio

         insmod part_msdos

         insmod ext2

         set root='hd0,msdos2'

-        if [ x$feature_platform_search_hint = xy ]; then

+        if [ x\$feature_platform_search_hint = xy ]; then

           search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

         else

           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

         fi

-        echo    'Loading Linux $photon_linux ...'

-        linux   "$BOOT_DIRECTORY"\$photon_linux root=UUID_PLACEHOLDER ro console=ttyS0,38400n8 

+        echo    'Loading Linux \$photon_linux ...'

+        linux   "$BOOT_DIRECTORY"\$photon_linux root=/dev/sda2 ro console=ttyS0,38400n8 

     }

-    menuentry 'GNU/Linux, with Linux $photon_linux (recovery mode)' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-$photon_linux-recovery-UUID_PLACEHOLDER' {

+    menuentry 'GNU/Linux, with Linux \$photon_linux (recovery mode)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'gnulinux-\$photon_linux-recovery-UUID_PLACEHOLDER' {

         load_video

         set gfxpayload=keep

         insmod gzio

         insmod part_msdos

         insmod ext2

         set root='hd0,msdos2'

-        if [ x$feature_platform_search_hint = xy ]; then

+        if [ x\$feature_platform_search_hint = xy ]; then

           search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

         else

           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

         fi

-        echo    'Loading Linux $photon_linux ...'

-        linux   "$BOOT_DIRECTORY"\$photon_linux root=/UUID_PLACEHOLDER ro single console=ttyS0,38400n8

+        echo    'Loading Linux \$photon_linux ...'

+        linux   "$BOOT_DIRECTORY"\$photon_linux root=/dev/sda2 ro single console=ttyS0,38400n8

     }

 }

@@ -217,17 +219,17 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced

 ### END /etc/grub.d/40_custom ###

 ### BEGIN /etc/grub.d/41_custom ###

-if [ -f  ${config_directory}/custom.cfg ]; then

-  source ${config_directory}/custom.cfg

-elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then

-  source $prefix/custom.cfg;

+if [ -f  \${config_directory}/custom.cfg ]; then

+  source \${config_directory}/custom.cfg

+elif [ -z "\${config_directory}" -a -f  \$prefix/custom.cfg ]; then

+  source \$prefix/custom.cfg;

 fi

 ### END /etc/grub.d/41_custom ###

 # End /boot/grub2/grub.cfg

 EOF

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

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

 #Cleanup the workspace directory

 #find "$BUILDROOT"/{,usr/}{lib,bin,sbin} -type f -exec strip --strip-debug --strip-unneeded '{}' ';' > /dev/null 2>&1

@@ -1,3 +1,3 @@

 #!/bin/bash

 echo -e "changeme\nchangeme" | passwd root

-chage -d 0 root

\ No newline at end of file

+chage -d 0 root