diff options
| author | Christian Poessinger <christian@poessinger.com> | 2017-12-27 22:29:53 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2017-12-27 23:33:29 +0100 |
| commit | 28ab553cfbe8d682314d61d0bac520deacfa14c7 (patch) | |
| tree | aaa114e2b5190ae3a90b7d6815eb9c02bef8a6de /scripts/vyatta-grub-setup | |
| parent | 9499b3e5f88ce72054046ac8a6c0da305f1b5fa4 (diff) | |
| download | vyatta-cfg-system-28ab553cfbe8d682314d61d0bac520deacfa14c7.tar.gz vyatta-cfg-system-28ab553cfbe8d682314d61d0bac520deacfa14c7.zip | |
T496: remove diagnostic partition for RAID1 installs
Diffstat (limited to 'scripts/vyatta-grub-setup')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index d263eff3..ea4dc905 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -133,11 +133,6 @@ if [ -n "$xen_kernel_version" ] || [ -n "$union_xen_kernel_version" ]; then default_console=0 fi -# Check for diagnostic partition residing in first partition of drive -# holding the root partition. - -diag_drive_number="" - if [ ${ROOT_PARTITION:0:2} = "md" ]; then # Select the first disk in the RAID group to look for diag partition on root_disks=`echo /sys/block/$ROOT_PARTITION/slaves/*` @@ -149,20 +144,6 @@ else root_disk=${ROOT_PARTITION:0:${#ROOT_PARTITION}-1} fi -# If the root partition is not occupying the first partition, then we -# can look for a diag partition there. -if [ "$ROOT_PARTITION" != "${root_disk}1" ]; then - first_part_fstype=`fdisk -l /dev/$root_disk | grep ^/dev/${root_disk}1 | awk '{ print $6 }'` - - if [ "$first_part_fstype" = "FAT16" -o "$first_part_fstype" = "Dell" ]; then - # Translate the Linux drive letter (e.g. the "a" in "/dev/sda") into - # a drive number that grub uses. i.e. "a" = 0, "b" = 1, etc. - diag_drive_letter=${root_disk:2:1} - diag_drive_number=`echo $diag_drive_letter | od -t u1 -N 1 | awk '{ print $2 }'` - let diag_drive_number-=97 - fi -fi - ( # create the grub.cfg file for grub # The "default=" line selects which boot option will be used by default. @@ -318,14 +299,6 @@ fi echo -e "\tinitrd $reset_boot_path/initrd.img" echo -e "}" - if [ -n "$diag_drive_number" ]; then - echo - echo -e "menuentry \"Diagnostics\" {" - echo -e "\tchainloader (hd$diag_drive_number,1)+1" - echo -e "}" - fi - - ) >"$ROOTFSDIR"/boot/grub/grub.cfg ( [ -s /boot/grub/menu.lst ] && |