Changes

grub.conf

@@ -25,8 +25,8 @@ title System Upgrade (redhat-upgrade-tool)
         initrd /initramfs-redhat-upgrade-tool.img
 title Oracle Linux Server Red Hat Compatible Kernel (2.6.32-573.el6.x86_64)
         root (hd0,0)
-        kernel /vmlinuz-2.6.32-573.el6.x86_64 ro root=/dev/mapper/VolGroup-lv_root rd_NO_LUKS LANG=en_US.UTF-8 rd_LVM_LV=VolGroup/lv_swap rd_NO_MD SYSFONT=latarcyrheb-sun16 crashkernel=auto rd_LVM_LV=VolGroup/lv_root  KEYBOARDTYPE=pc KEYTABLE=us rd_NO_DM rhgb quiet
-        initrd /initramfs-2.6.32-573.el6.x86_64.img
+        kernel /__VMLINUZ_TO_BE_REPLACED__ ro root=/dev/mapper/VolGroup-lv_root rd_NO_LUKS LANG=en_US.UTF-8 rd_LVM_LV=VolGroup/lv_swap rd_NO_MD SYSFONT=latarcyrheb-sun16 crashkernel=auto rd_LVM_LV=VolGroup/lv_root  KEYBOARDTYPE=pc KEYTABLE=us rd_NO_DM rhgb quiet
+        initrd /__INITRAMFS_TO_BE_REPLACED__
 title Oracle Linux Server Unbreakable Enterprise Kernel (4.1.12-124.48.6.el6uek.x86_64)
         root (hd0,0)
         kernel /vmlinuz-4.1.12-124.48.6.el6uek.x86_64 ro root=/dev/mapper/VolGroup-lv_root rd_NO_LUKS LANG=en_US.UTF-8 rd_LVM_LV=VolGroup/lv_swap rd_NO_MD SYSFONT=latarcyrheb-sun16 crashkernel=auto rd_LVM_LV=VolGroup/lv_root  KEYBOARDTYPE=pc KEYTABLE=us rd_NO_DM rhgb quiet
@@ -34,5 +34,5 @@ title Oracle Linux Server Unbreakable Enterprise Kernel (4.1.12-124.48.6.el6uek.
 
 title CentOS 6 (2.6.32-573.el6.x86_64)
 	root (hd0,0)
-	kernel /vmlinuz-2.6.32-573.el6.x86_64 ro root=/dev/mapper/VolGroup-lv_root rd_NO_LUKS LANG=en_US.UTF-8 rd_NO_MD rd_LVM_LV=VolGroup/lv_swap SYSFONT=latarcyrheb-sun16 crashkernel=auto rd_LVM_LV=VolGroup/lv_root  KEYBOARDTYPE=pc KEYTABLE=us rd_NO_DM rhgb quiet
-	initrd /initramfs-2.6.32-573.el6.x86_64.img
+	kernel /__VMLINUZ_TO_BE_REPLACED__ ro root=/dev/mapper/VolGroup-lv_root rd_NO_LUKS LANG=en_US.UTF-8 rd_NO_MD rd_LVM_LV=VolGroup/lv_swap SYSFONT=latarcyrheb-sun16 crashkernel=auto rd_LVM_LV=VolGroup/lv_root  KEYBOARDTYPE=pc KEYTABLE=us rd_NO_DM rhgb quiet
+	initrd /__INITRAMFS_TO_BE_REPLACED__

oracle6-oracle7

@@ -124,31 +124,13 @@ fi
 ####################################################################
 
 if [[ $MY_PARAM -le 4 ]]
-then
-   echo "${green}Updating the grub.conf file${reset}"
-
-   rm -vf /boot/grub/grub.conf
-   curl https://dms-git.ameyo.net:8265/UpgradeOStoOracle/OracleLinux/raw/branch/master/grub.conf --output /boot/grub/grub.conf
-
-   if [[ $? -ne 0 ]]; then
-      echo "${red}ERROR...!  Download failes, please re-run the script with argument '4'.${reset}"
-      exit 1
-   else
-      echo "${green}grub.conf updated successfully${reset}"
-      echo -e "\n\n\n"
-   fi
-fi
-
-####################################################################
-
-if [[ $MY_PARAM -le 5 ]]
 then
    echo "${green}Downloading the future required scripts${reset}"
 
    curl https://dms-git.ameyo.net:8265/UpgradeOStoOracle/OracleLinux/raw/branch/master/upgrade-oracle7 --output /usr/bin/upgrade-oracle7
 
    if [[ $? -ne 0 ]]; then
-      echo "${red}ERROR...!  ISO download failed, please re-run the script with argument '5'.${reset}"
+      echo "${red}ERROR...!  ISO download failed, please re-run the script with argument '4'.${reset}"
       exit 1
    else
       echo "${green}Scripts downloaded successfuly${reset}"
@@ -158,7 +140,7 @@ fi
 
 ####################################################################
 
-if [[ $MY_PARAM -le 6 ]]
+if [[ $MY_PARAM -le 5 ]]
 then
    echo "${green}Adding execute permissions to future scripts${reset}"
 
@@ -166,7 +148,7 @@ then
    # Runs the centos2ol script
 
    if [[ $? -ne 0 ]]; then
-      echo "${red}ERROR...!  please check the /tmp/oracle6-7/future.log file for the logs and run the script with argument '6'.${reset}"
+      echo "${red}ERROR...!  please check the /tmp/oracle6-7/future.log file for the logs and run the script with argument '5'.${reset}"
       exit 1
    else
       echo "${green}Execute permissions added successfuly${reset}"