Magellan Linux

Diff of /trunk/grubby/new-kernel-pkg

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

revision 1709 by niro, Sat Feb 18 00:23:51 2012 UTC revision 1710 by niro, Sat Feb 18 00:28:45 2012 UTC
# Line 195  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 285  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 403  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.1709  
changed lines
  Added in v.1710