Magellan Linux

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

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

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

    trunk/grubby/new-kernel-pkg revision 1691 by niro, Fri Feb 17 23:10:15 2012 UTC tags/grubby-8_3/new-kernel-pkg revision 1713 by niro, Sat Feb 18 00:29:24 2012 UTC
    # Line 42  fi Line 42  fi
    42  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby
    43  [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot  [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot
    44    
    45    cfgGrub2=""
    46    cfgGrub2Efi=""
    47  cfgGrub=""  cfgGrub=""
    48  cfgLilo=""  cfgLilo=""
    49  cfguBoot=""  cfguBoot=""
    50  runLilo=""  runLilo=""
    51  grubConfig=""  grubConfig=""
    52    grub2Config=""
    53    grub2EfiConfig=""
    54    
    55  ARCH=$(uname -m)  ARCH=$(uname -m)
    56    
    # Line 96  else Line 100  else
    100   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    101   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    102   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    103     grub2Config=/boot/grub/grub.cfg
    104     grub2EfiConfig=/boot/grub/grub-efi.cfg
    105   bootPrefix=/boot   bootPrefix=/boot
    106   liloFlag=lilo   liloFlag=lilo
    107   isx86="yes"   isx86="yes"
    # Line 111  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 130  usage() Line 136  usage()
    136   exit 1   exit 1
    137  }  }
    138    
     run_grub2()  
     {  
      if [ -d /boot/grub -a -x /sbin/grub-mkconfig ]  
      then  
      cp /boot/grub/grub.cfg /boot/grub/grub.cfg.old  
      /sbin/grub-mkconfig -o /boot/grub/grub.cfg  
      fi  
     }  
       
    139  install()  install()
    140  {  {
    141   # XXX kernel should be able to be specified also (or work right on ia64)   # XXX kernel should be able to be specified also (or work right on ia64)
    # Line 176  install() Line 173  install()
    173   return   return
    174   fi   fi
    175    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    176   # get the root filesystem to use   # get the root filesystem to use
    177   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
    178    
    # Line 201  install() Line 195  install()
    195   else   else
    196   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    197   fi   fi
    198   ${grubby} --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}"
    203   else   else
    204   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    205     fi
    206     if [[ -n ${cfgGrub2} ]]
    207     then
    208     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    209    
    210     if [[ -n ${banner} ]]
    211     then
    212     title="${banner} (${version})"
    213     elif [ -f /etc/mageversion ]
    214     then
    215     title="Magellan Linux $(< /etc/mageversion) (${version})"
    216     else
    217     title="Magellan Linux (${version})"
    218     fi
    219     ${grubby} --grub2 -c ${grub2Config} \
    220     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    221     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    222     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    223     ${mbargs:+--mbargs="${mbargs}"} \
    224     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    225     else
    226     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    227     fi
    228     if [[ -n ${cfgGrub2Efi} ]]
    229     then
    230     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    231    
    232     if [[ -n ${banner} ]]
    233     then
    234     title="${banner} (${version})"
    235     elif [ -f /etc/mageversion ]
    236     then
    237     title="Magellan Linux $(< /etc/mageversion) (${version})"
    238     else
    239     title="Magellan Linux (${version})"
    240     fi
    241     ${grubby} --grub2 -c ${grub2EfiConfig} \
    242     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    243     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    244     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    245     ${mbargs:+--mbargs="${mbargs}"} \
    246     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    247     else
    248     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    249   fi   fi
    250    
    251   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 244  remove() Line 283  remove()
    283   return   return
    284   fi   fi
    285    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    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} --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"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    293     fi
    294     if [[ -n ${cfgGrub2} ]]
    295     then
    296     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    297     ${grubby} --grub2 -c ${grub2Config} \
    298     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    299     else
    300     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    301     fi
    302     if [[ -n ${cfgGrub2Efi} ]]
    303     then
    304     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    305     ${grubby} --grub2 -c ${grub2EfiConfig} \
    306     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    307     else
    308     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    309   fi   fi
    310    
    311   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 349  update() Line 402  update()
    402   fi   fi
    403   fi   fi
    404    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    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}"}
    # Line 363  update() Line 414  update()
    414   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    415   fi   fi
    416    
    417     if [[ -n ${cfgGrub2} ]]
    418     then
    419     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    420     ${grubby} --grub2 -c ${grub2Config} \
    421     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    422     ${INITRD} \
    423     ${kernargs:+--args="${kernargs}"} \
    424     ${removeargs:+--remove-args="${removeargs}"}
    425     else
    426     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    427     fi
    428    
    429     if [[ -n ${cfgGrub2Efi} ]]
    430     then
    431     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    432     ${grubby} --grub2 -c ${grub2EfiConfig} \
    433     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    434     ${INITRD} \
    435     ${kernargs:+--args="${kernargs}"} \
    436     ${removeargs:+--remove-args="${removeargs}"}
    437     else
    438     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    439     fi
    440    
    441   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    442   then   then
    443   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    # Line 679  then Line 754  then
    754  fi  fi
    755    
    756  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    757    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    758    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    759  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    760    
    761  # if we have a uBoot directory, check if it is mounted.  # if we have a uBoot directory, check if it is mounted.
    Legend:
    Removed from v.1691  
    changed lines
      Added in v.1713