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 1697 by niro, Sat Feb 18 00:15:09 2012 UTC revision 1710 by niro, Sat Feb 18 00:28:45 2012 UTC
    # Line 49  cfgLilo="" Line 49  cfgLilo=""
    49  cfguBoot=""  cfguBoot=""
    50  runLilo=""  runLilo=""
    51  grubConfig=""  grubConfig=""
    52    grub2Config=""
    53    grub2EfiConfig=""
    54    
    55  ARCH=$(uname -m)  ARCH=$(uname -m)
    56    
    # Line 115  moddep="" Line 117  moddep=""
    117  verbose=""  verbose=""
    118  makedefault=""  makedefault=""
    119  package=""  package=""
    120  mbkernel=""  mbkernel="${HYPERVISOR}"
    121  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    122  adddracutargs=""  adddracutargs=""
    123  addplymouthinitrd=""  addplymouthinitrd=""
    124    
    # Line 193  install() Line 195  install()
    195   else   else
    196   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    197   fi   fi
    198   ${grubby} --grub --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    199     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    200   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    201   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    202   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    # Line 213  install() Line 216  install()
    216   else   else
    217   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    218   fi   fi
    219   ${grubby} --grub2 -c ${grub2Cfg} \   ${grubby} --grub2 -c ${grub2Config} \
    220   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    221   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    222   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    # Line 235  install() Line 238  install()
    238   else   else
    239   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    240   fi   fi
    241   ${grubby} --grub2 -c ${grub2EfiCfg} \   ${grubby} --grub2 -c ${grub2EfiConfig} \
    242   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    243   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    244   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    # Line 283  remove() Line 286  remove()
    286   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    287   then   then
    288   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    289   ${grubby} --grub --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    290     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    291   else   else
    292   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    293   fi   fi
    # Line 401  update() Line 405  update()
    405   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    406   then   then
    407   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    408   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    409     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    410   ${INITRD} \   ${INITRD} \
    411   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    412   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    Legend:
    Removed from v.1697  
    changed lines
      Added in v.1710