Magellan Linux

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

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

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

    revision 1431 by niro, Tue Jul 19 17:02:36 2011 UTC revision 1728 by niro, Sat Feb 18 00:59:04 2012 UTC
    # Line 40  else Line 40  else
    40  fi  fi
    41    
    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
    44    
    45    cfgGrub2=""
    46    cfgGrub2Efi=""
    47  cfgGrub=""  cfgGrub=""
    48  cfgLilo=""  cfgLilo=""
    49    cfgExtlinux=""
    50    cfguBoot=""
    51  runLilo=""  runLilo=""
    52  grubConfig=""  grubConfig=""
    53    grub2Config=""
    54    grub2EfiConfig=""
    55    extlinuxConfig=""
    56    
    57  ARCH=$(uname -m)  ARCH=$(uname -m)
    58    
    # Line 77  then Line 85  then
    85   lilo=/sbin/zipl   lilo=/sbin/zipl
    86   runLilo="yes"   runLilo="yes"
    87   isx86=""   isx86=""
    88    elif [[ ${ARCH} = armv7l ]]
    89    then
    90     liloConfig=""
    91     bootPrefix=/boot
    92     ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    93     ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    94     ubootKList=${UBOOT_KLIST:-"klist.txt"}
    95     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    96     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    97     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    98     mounted=""
    99     liloFlag=""
    100     isx86=""
    101  else  else
    102   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    103   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    104   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    105     grub2Config=/boot/grub/grub.cfg
    106     grub2EfiConfig=/boot/grub/grub-efi.cfg
    107     extlinuxConfig=/boot/extlinux/extlinux.conf
    108   bootPrefix=/boot   bootPrefix=/boot
    109   liloFlag=lilo   liloFlag=lilo
    110   isx86="yes"   isx86="yes"
    # Line 96  moddep="" Line 120  moddep=""
    120  verbose=""  verbose=""
    121  makedefault=""  makedefault=""
    122  package=""  package=""
    123  mbkernel=""  mbkernel="${HYPERVISOR}"
    124  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    125  adddracutargs=""  adddracutargs=""
    126  addplymouthinitrd=""  addplymouthinitrd=""
    127    
    # Line 115  usage() Line 139  usage()
    139   exit 1   exit 1
    140  }  }
    141    
     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  
     }  
       
    142  install()  install()
    143  {  {
    144   # 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 161  install() Line 176  install()
    176   return   return
    177   fi   fi
    178    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    179   # get the root filesystem to use   # get the root filesystem to use
    180   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
    181    
    # Line 186  install() Line 198  install()
    198   else   else
    199   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    200   fi   fi
    201   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    202     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    203   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    204   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    205   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    206   else   else
    207   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    208     fi
    209     if [[ -n ${cfgGrub2} ]]
    210     then
    211     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    212    
    213     if [[ -n ${banner} ]]
    214     then
    215     title="${banner} (${version})"
    216     elif [ -f /etc/mageversion ]
    217     then
    218     title="Magellan Linux $(< /etc/mageversion) (${version})"
    219     else
    220     title="Magellan Linux (${version})"
    221     fi
    222     ${grubby} --grub2 -c ${grub2Config} \
    223     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    224     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    225     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    226     ${mbargs:+--mbargs="${mbargs}"} \
    227     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    228     else
    229     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    230     fi
    231     if [[ -n ${cfgGrub2Efi} ]]
    232     then
    233     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    234    
    235     if [[ -n ${banner} ]]
    236     then
    237     title="${banner} (${version})"
    238     elif [ -f /etc/mageversion ]
    239     then
    240     title="Magellan Linux $(< /etc/mageversion) (${version})"
    241     else
    242     title="Magellan Linux (${version})"
    243     fi
    244     ${grubby} --grub2 -c ${grub2EfiConfig} \
    245     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    246     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    247     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    248     ${mbargs:+--mbargs="${mbargs}"} \
    249     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    250     else
    251     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    252   fi   fi
    253    
    254   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 217  install() Line 274  install()
    274   else   else
    275   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    276   fi   fi
    277    
    278     if [[ -n ${cfgExtlinux} ]]
    279     then
    280     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    281    
    282     if [[ -n ${banner} ]]
    283     then
    284     title="${banner} (${version})"
    285     elif [ -f /etc/mageversion ]
    286     then
    287     title="Magellan Linux $(< /etc/mageversion) (${version})"
    288     else
    289     title="Magellan Linux (${version})"
    290     fi
    291     ${grubby} --extlinux -c ${extlinuxConfig} \
    292     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    293     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    294     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    295     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    296     else
    297     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    298     fi
    299  }  }
    300    
    301  remove()  remove()
    # Line 229  remove() Line 308  remove()
    308   return   return
    309   fi   fi
    310    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    311   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    312   then   then
    313   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    314   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    315     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    316   else   else
    317   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    318     fi
    319     if [[ -n ${cfgGrub2} ]]
    320     then
    321     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    322     ${grubby} --grub2 -c ${grub2Config} \
    323     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    324     else
    325     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    326     fi
    327     if [[ -n ${cfgGrub2Efi} ]]
    328     then
    329     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    330     ${grubby} --grub2 -c ${grub2EfiConfig} \
    331     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    332     else
    333     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    334   fi   fi
    335    
    336   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 258  remove() Line 351  remove()
    351   else   else
    352   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    353   fi   fi
    354    
    355     if [[ -n ${cfguBoot} ]]
    356     then
    357     [[ -n ${verbose} ]] && echo "removing ${version} from ${ubootDir}..."
    358    
    359     if [ -f ${ubootDir}/${ubootKList} ]
    360     then
    361     tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    362     curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    363     sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    364     newversion=$(tail -n1 ${tmpKList})
    365     if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    366     then
    367     if [[ ${curversion} != ${newversion} ]]
    368     then
    369     cp -fp ${ubootDir}/uImage-${newversion} ${ubootDir}/${ubootDefaultImage}
    370     if [ $? -ne 0 ]
    371     then
    372     [[ -n ${verbose} ]] && echo "copy uImage-${newversion} error, default kernel not replaced!" && exit
    373     fi
    374     cp -fp ${ubootDir}/uInitrd-${newversion} ${ubootDir}/${ubootDefaultInitrd}
    375     if [ $? -ne 0 ]
    376     then
    377     [[ -n ${verbose} ]] && echo "copy uInitrd-${newversion} error, default Initrd not replaced!" && exit
    378     fi
    379     fi
    380    
    381     [[ -n ${verbose} ]] && echo "removing uImage-${version}"
    382     if [ -f ${ubootDir}/uImage-${version} ]
    383     then
    384     rm -f ${ubootDir}/uImage-${version}
    385     else
    386     [[ -n ${verbose} ]] && echo "uImage-${version} did not exist!"
    387     fi
    388    
    389     [[ -n ${verbose} ]] && echo "removing uInitrd-${version}"
    390     if [ -f ${ubootDir}/uInitrd-${version} ]
    391     then
    392     rm -f ${ubootDir}/uInitrd-${version}
    393     else
    394     [[ -n ${verbose} ]] && echo "uInitrd-${version} did not exist!"
    395     fi
    396    
    397     mv ${tmpKList} ${ubootDir}/${ubootKList}
    398     else
    399     [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    400     [ -f ${tmpKList} ] && rm -f ${tmpKList}
    401     fi
    402     else
    403     [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"
    404     fi
    405     else
    406     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    407     fi
    408    
    409     if [[ -n ${cfgExtlinux} ]]
    410     then
    411     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    412     ${grubby} --extlinux -c ${extlinuxConfig} \
    413     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    414     else
    415     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    416     fi
    417  }  }
    418    
    419  update()  update()
    # Line 280  update() Line 436  update()
    436   fi   fi
    437   fi   fi
    438    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    439   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    440   then   then
    441   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    442   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    443     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    444   ${INITRD} \   ${INITRD} \
    445   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    446   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 294  update() Line 448  update()
    448   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    449   fi   fi
    450    
    451     if [[ -n ${cfgGrub2} ]]
    452     then
    453     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    454     ${grubby} --grub2 -c ${grub2Config} \
    455     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    456     ${INITRD} \
    457     ${kernargs:+--args="${kernargs}"} \
    458     ${removeargs:+--remove-args="${removeargs}"}
    459     else
    460     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    461     fi
    462    
    463     if [[ -n ${cfgGrub2Efi} ]]
    464     then
    465     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    466     ${grubby} --grub2 -c ${grub2EfiConfig} \
    467     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    468     ${INITRD} \
    469     ${kernargs:+--args="${kernargs}"} \
    470     ${removeargs:+--remove-args="${removeargs}"}
    471     else
    472     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    473     fi
    474    
    475   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    476   then   then
    477   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    # Line 316  update() Line 494  update()
    494   else   else
    495   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    496   fi   fi
    497    
    498     if [[ -n ${cfguBoot} ]]
    499     then
    500     [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    501    
    502     [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    503     mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \
    504     -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    505    
    506     [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    507     mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    508     -n initramfs -d ${initrdfile} ${ubootDir}/uInitrd-${version}
    509    
    510     if [ -f ${ubootDir}/uImage-${version} ] && [ -f ${ubootDir}/uInitrd-${version} ]
    511     then
    512     cp -fp ${ubootDir}/uImage-${version} ${ubootDir}/${ubootDefaultImage}
    513     if [ $? -ne 0 ]
    514     then
    515     [[ -n ${verbose} ]] && echo "copy uImage-${version} error, kernel not installed!" && exit
    516     fi
    517     cp -fp ${ubootDir}/uInitrd-${version} ${ubootDir}/${ubootDefaultInitrd}
    518     if [ $? -ne 0 ]
    519     then
    520     [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    521     fi
    522     echo ${version} >> ${ubootDir}/${ubootKList}
    523     else
    524     [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    525     fi
    526     else
    527     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    528     fi
    529    
    530     if [[ -n ${cfgExtlinux} ]]
    531     then
    532     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    533     ${grubby} --extlinux -c ${extlinuxConfig} \
    534     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    535     ${INITRD} \
    536     ${kernargs:+--args="${kernargs}"} \
    537     ${removeargs:+--remove-args="${removeargs}"}
    538     else
    539     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    540     fi
    541  }  }
    542    
    543  mkinitrd()  mkinitrd()
    544  {  {
    545   if [[ -n ${dracut} ]]   if [[ -n ${dracut} ]]
    546   then   then
    547   tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}"   tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    548   else   else
    549   tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"   tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"
    550   fi   fi
    # Line 578  then Line 800  then
    800  fi  fi
    801    
    802  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    803    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    804    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    805  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    806    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    807    
    808    # if we have a uBoot directory, check if it is mounted.
    809    # if not, mount it. Then check if a boot script exists.
    810    if [[ -n ${ubootDir} ]]
    811    then
    812     mountEntry=$(mount | grep ${ubootDir})
    813     if [[ -z ${mountEntry} ]]
    814     then
    815     mount ${ubootDevice} ${ubootDir}
    816     mounted=1
    817     fi
    818     [ -f ${ubootScript} ] && cfguBoot=1
    819    fi
    820    
    821  # if we have a lilo config on an x86 box, see if the default boot loader  # if we have a lilo config on an x86 box, see if the default boot loader
    822  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    Legend:
    Removed from v.1431  
    changed lines
      Added in v.1728