From 5098d98976b4173fd3ce492d8a0c1179ccf787aa Mon Sep 17 00:00:00 2001
From: lguohan <lguohan@gmail.com>
Date: Fri, 8 Sep 2017 08:26:30 -0700
Subject: [PATCH] [dell]: remove nos_to_sonic_grub.cfg (#943)

no longer needed in the build image
---
 build_image.sh                                |  4 --
 .../nos_to_sonic_grub.cfg                     | 44 -------------------
 .../nos_to_sonic_grub.cfg                     | 44 -------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 device/dell/x86_64-dell_s6100_c2538-r0/nos_to_sonic_grub.cfg
 delete mode 100644 device/dell/x86_64-dell_z9100_c2538-r0/nos_to_sonic_grub.cfg

diff --git a/build_image.sh b/build_image.sh
index 2d229c2d194b..ee7fb8a75823 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -25,10 +25,6 @@ generate_onie_installer_image()
                 cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
             fi
 
-            if [ "$IMAGE_TYPE" = "raw" ] && [ -f ./device/$VENDOR/$PLATFORM/nos_to_sonic_grub.cfg ]; then
-                sed -i -e "s/%%IMAGE_VERSION%%/$IMAGE_VERSION/g" ./device/$VENDOR/$PLATFORM/nos_to_sonic_grub.cfg
-                echo "IMAGE_VERSION is $IMAGE_VERSION"
-            fi
         done
     done
 
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/nos_to_sonic_grub.cfg b/device/dell/x86_64-dell_s6100_c2538-r0/nos_to_sonic_grub.cfg
deleted file mode 100644
index 058b1a9ea118..000000000000
--- a/device/dell/x86_64-dell_s6100_c2538-r0/nos_to_sonic_grub.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Grub config to launch SONiC
-# with ONIE boot option
-
-insmod serial
-# Initialize USB-Serial com2 port
-serial --unit=1 --speed=9600
-#Serial port config;Defaults: COM1,9600
-serial --unit=0 --speed=9600
-terminal_output serial_com0
-terminal_input serial_com0
-#terminfo added to prevent text wrap issue.
-terminfo -g 80x100 serial_com0
-terminfo -g 80x100 serial_com1
-
-echo -n "Press Esc to stop autoboot ... "
-if sleep --verbose --interruptible 5 ; then
-        insmod gzio
-        insmod part_msdos
-        insmod ext2
-        set root='(hd0,gpt8)'
-        linux   /image-%%IMAGE_VERSION%%/boot/vmlinuz-3.16.0-4-amd64 root=/dev/sda8 rw console=tty0 console=ttyS1,9600n8 loop=image-%%IMAGE_VERSION%%/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor
-        initrd  /image-%%IMAGE_VERSION%%/boot/initrd.img-3.16.0-4-amd64
-        boot
-else
-    menuentry 'SONiC' {
-        insmod gzio
-        insmod part_msdos
-        insmod ext2
-        set root='(hd0,gpt8)'
-        linux   /image-%%IMAGE_VERSION%%/boot/vmlinuz-3.16.0-4-amd64 root=/dev/sda8 rw console=tty0 console=ttyS1,9600n8 loop=image-%%IMAGE_VERSION%%/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor
-        initrd  /image-%%IMAGE_VERSION%%/boot/initrd.img-3.16.0-4-amd64
-        boot
-    }
-
-    menuentry 'ONIE' {
-        insmod force10
-        onieboot
-    }
-
-    menuentry 'DELL-DIAG' {
-        delldiagboot
-    }
-fi
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/nos_to_sonic_grub.cfg b/device/dell/x86_64-dell_z9100_c2538-r0/nos_to_sonic_grub.cfg
deleted file mode 100644
index 058b1a9ea118..000000000000
--- a/device/dell/x86_64-dell_z9100_c2538-r0/nos_to_sonic_grub.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Grub config to launch SONiC
-# with ONIE boot option
-
-insmod serial
-# Initialize USB-Serial com2 port
-serial --unit=1 --speed=9600
-#Serial port config;Defaults: COM1,9600
-serial --unit=0 --speed=9600
-terminal_output serial_com0
-terminal_input serial_com0
-#terminfo added to prevent text wrap issue.
-terminfo -g 80x100 serial_com0
-terminfo -g 80x100 serial_com1
-
-echo -n "Press Esc to stop autoboot ... "
-if sleep --verbose --interruptible 5 ; then
-        insmod gzio
-        insmod part_msdos
-        insmod ext2
-        set root='(hd0,gpt8)'
-        linux   /image-%%IMAGE_VERSION%%/boot/vmlinuz-3.16.0-4-amd64 root=/dev/sda8 rw console=tty0 console=ttyS1,9600n8 loop=image-%%IMAGE_VERSION%%/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor
-        initrd  /image-%%IMAGE_VERSION%%/boot/initrd.img-3.16.0-4-amd64
-        boot
-else
-    menuentry 'SONiC' {
-        insmod gzio
-        insmod part_msdos
-        insmod ext2
-        set root='(hd0,gpt8)'
-        linux   /image-%%IMAGE_VERSION%%/boot/vmlinuz-3.16.0-4-amd64 root=/dev/sda8 rw console=tty0 console=ttyS1,9600n8 loop=image-%%IMAGE_VERSION%%/fs.squashfs loopfstype=squashfs apparmor=1 security=apparmor
-        initrd  /image-%%IMAGE_VERSION%%/boot/initrd.img-3.16.0-4-amd64
-        boot
-    }
-
-    menuentry 'ONIE' {
-        insmod force10
-        onieboot
-    }
-
-    menuentry 'DELL-DIAG' {
-        delldiagboot
-    }
-fi