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 1691 by niro, Fri Feb 17 23:10:15 2012 UTC revision 1702 by niro, Sat Feb 18 00:21:34 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 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 --add-kernel=${bootPrefix}/${kernelName}-${version} \
    199   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    200   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    201   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    202   else   else
    203   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    204     fi
    205     if [[ -n ${cfgGrub2} ]]
    206     then
    207     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    208    
    209     if [[ -n ${banner} ]]
    210     then
    211     title="${banner} (${version})"
    212     elif [ -f /etc/mageversion ]
    213     then
    214     title="Magellan Linux $(< /etc/mageversion) (${version})"
    215     else
    216     title="Magellan Linux (${version})"
    217     fi
    218     ${grubby} --grub2 -c ${grub2Config} \
    219     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    220     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    221     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    222     ${mbargs:+--mbargs="${mbargs}"} \
    223     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    224     else
    225     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    226     fi
    227     if [[ -n ${cfgGrub2Efi} ]]
    228     then
    229     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    230    
    231     if [[ -n ${banner} ]]
    232     then
    233     title="${banner} (${version})"
    234     elif [ -f /etc/mageversion ]
    235     then
    236     title="Magellan Linux $(< /etc/mageversion) (${version})"
    237     else
    238     title="Magellan Linux (${version})"
    239     fi
    240     ${grubby} --grub2 -c ${grub2EfiConfig} \
    241     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    242     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    243     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    244     ${mbargs:+--mbargs="${mbargs}"} \
    245     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    246     else
    247     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    248   fi   fi
    249    
    250   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 244  remove() Line 282  remove()
    282   return   return
    283   fi   fi
    284    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    285   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    286   then   then
    287   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    288   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub --remove-kernel=${bootPrefix}/${kernelName}-${version}
    289   else   else
    290   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    291     fi
    292     if [[ -n ${cfgGrub2} ]]
    293     then
    294     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    295     ${grubby} --grub2 -c ${grub2Config} \
    296     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    297     else
    298     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    299     fi
    300     if [[ -n ${cfgGrub2Efi} ]]
    301     then
    302     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    303     ${grubby} --grub2 -c ${grub2EfiConfig} \
    304     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    305     else
    306     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    307   fi   fi
    308    
    309   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 349  update() Line 400  update()
    400   fi   fi
    401   fi   fi
    402    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    403   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    404   then   then
    405   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    # Line 363  update() Line 411  update()
    411   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    412   fi   fi
    413    
    414     if [[ -n ${cfgGrub2} ]]
    415     then
    416     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    417     ${grubby} --grub2 -c ${grub2Config} \
    418     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    419     ${INITRD} \
    420     ${kernargs:+--args="${kernargs}"} \
    421     ${removeargs:+--remove-args="${removeargs}"}
    422     else
    423     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    424     fi
    425    
    426     if [[ -n ${cfgGrub2Efi} ]]
    427     then
    428     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    429     ${grubby} --grub2 -c ${grub2EfiConfig} \
    430     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    431     ${INITRD} \
    432     ${kernargs:+--args="${kernargs}"} \
    433     ${removeargs:+--remove-args="${removeargs}"}
    434     else
    435     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    436     fi
    437    
    438   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    439   then   then
    440   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    # Line 679  then Line 751  then
    751  fi  fi
    752    
    753  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    754    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    755    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    756  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    757    
    758  # 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.1702