Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_40_20170706/new-kernel-pkg

    Diff of /tags/grubby-8_40_20170706/new-kernel-pkg

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2238 by niro, Mon Oct 21 13:22:57 2013 UTC revision 2239 by niro, Mon Oct 21 13:28:04 2013 UTC
    # Line 217  install() Line 217  install()
    217   cfgLilo=""   cfgLilo=""
    218   fi   fi
    219    
    220     if [[ -n ${banner} ]]
    221     then
    222     title="${banner} [ ${version} ]"
    223     elif [[ $(read_os_release id) = magellan ]]
    224     then
    225     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    226     elif [ -f /etc/mageversion ]
    227     then
    228     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    229     else
    230     title="Magellan Linux [ ${version} ]"
    231     fi
    232    
    233   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    234   then   then
    235   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
    236    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    237   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    238   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    239   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # Line 245  install() Line 246  install()
    246   then   then
    247   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    248    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    249   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    250   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    251   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # Line 270  install() Line 259  install()
    259   then   then
    260   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    261    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    262   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    263   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    264   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # Line 320  install() Line 297  install()
    297   then   then
    298   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    299    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    300   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    301   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    302   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    Legend:
    Removed from v.2238  
    changed lines
      Added in v.2239