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 1691 by niro, Fri Feb 17 23:10:15 2012 UTC revision 1770 by niro, Sat Mar 3 15:22:47 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    cfgExtlinux=""
    50  cfguBoot=""  cfguBoot=""
    51  runLilo=""  runLilo=""
    52  grubConfig=""  grubConfig=""
    53    grub2Config=""
    54    grub2EfiConfig=""
    55    extlinuxConfig=""
    56    
    57  ARCH=$(uname -m)  ARCH=$(uname -m)
    58    
    # Line 79  then Line 85  then
    85   lilo=/sbin/zipl   lilo=/sbin/zipl
    86   runLilo="yes"   runLilo="yes"
    87   isx86=""   isx86=""
    88  elif [[ ${ARCH} = armv7l ]]  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
    89  then  then
    90     machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    91   liloConfig=""   liloConfig=""
    92   bootPrefix=/boot   bootPrefix=/boot
    93   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    # Line 92  then Line 99  then
    99   mounted=""   mounted=""
    100   liloFlag=""   liloFlag=""
    101   isx86=""   isx86=""
    102     if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
    103     then
    104     ubootAddress=0x80008000
    105     else
    106     ubootAddress=0x00008000
    107     fi
    108  else  else
    109   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    110   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    111   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    112     grub2Config=/boot/grub/grub.cfg
    113     grub2EfiConfig=/boot/grub/grub-efi.cfg
    114     extlinuxConfig=/boot/extlinux/extlinux.conf
    115   bootPrefix=/boot   bootPrefix=/boot
    116   liloFlag=lilo   liloFlag=lilo
    117   isx86="yes"   isx86="yes"
    # Line 111  moddep="" Line 127  moddep=""
    127  verbose=""  verbose=""
    128  makedefault=""  makedefault=""
    129  package=""  package=""
    130  mbkernel=""  mbkernel="${HYPERVISOR}"
    131  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    132  adddracutargs=""  adddracutargs=""
    133  addplymouthinitrd=""  addplymouthinitrd=""
    134    
    # Line 130  usage() Line 146  usage()
    146   exit 1   exit 1
    147  }  }
    148    
     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  
     }  
       
    149  install()  install()
    150  {  {
    151   # 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 183  install()
    183   return   return
    184   fi   fi
    185    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    186   # get the root filesystem to use   # get the root filesystem to use
    187   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
    188    
    # Line 194  install() Line 198  install()
    198    
    199   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    200   then   then
    201   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    202   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    203   then   then
    204   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    205   else   else
    206   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    207   fi   fi
    208   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    209     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    210   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    211   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    212   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    213   else   else
    214   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    215     fi
    216     if [[ -n ${cfgGrub2} ]]
    217     then
    218     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    219    
    220     if [[ -n ${banner} ]]
    221     then
    222     title="${banner} [ ${version} ]"
    223     elif [ -f /etc/mageversion ]
    224     then
    225     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    226     else
    227     title="Magellan Linux [ ${version} ]"
    228     fi
    229     ${grubby} --grub2 -c ${grub2Config} \
    230     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    231     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    232     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    233     ${mbargs:+--mbargs="${mbargs}"} \
    234     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    235     else
    236     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    237     fi
    238     if [[ -n ${cfgGrub2Efi} ]]
    239     then
    240     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    241    
    242     if [[ -n ${banner} ]]
    243     then
    244     title="${banner} [ ${version} ]"
    245     elif [ -f /etc/mageversion ]
    246     then
    247     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    248     else
    249     title="Magellan Linux [ ${version} ]"
    250     fi
    251     ${grubby} --grub2 -c ${grub2EfiConfig} \
    252     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    253     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    254     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    255     ${mbargs:+--mbargs="${mbargs}"} \
    256     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    257     else
    258     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    259   fi   fi
    260    
    261   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 232  install() Line 281  install()
    281   else   else
    282   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    283   fi   fi
    284    
    285     if [[ -n ${cfgExtlinux} ]]
    286     then
    287     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    288    
    289     if [[ -n ${banner} ]]
    290     then
    291     title="${banner} [ ${version} ]"
    292     elif [ -f /etc/mageversion ]
    293     then
    294     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    295     else
    296     title="Magellan Linux [ ${version} ]"
    297     fi
    298     ${grubby} --extlinux -c ${extlinuxConfig} \
    299     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    300     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    301     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    302     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    303     else
    304     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    305     fi
    306  }  }
    307    
    308  remove()  remove()
    # Line 244  remove() Line 315  remove()
    315   return   return
    316   fi   fi
    317    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    318   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    319   then   then
    320   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    321   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    322     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    323   else   else
    324   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    325     fi
    326     if [[ -n ${cfgGrub2} ]]
    327     then
    328     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    329     ${grubby} --grub2 -c ${grub2Config} \
    330     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    331     else
    332     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    333     fi
    334     if [[ -n ${cfgGrub2Efi} ]]
    335     then
    336     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    337     ${grubby} --grub2 -c ${grub2EfiConfig} \
    338     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    339     else
    340     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    341   fi   fi
    342    
    343   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 322  remove() Line 407  remove()
    407   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    408   fi   fi
    409   else   else
    410   [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"   [[ -n ${verbose} ]] && echo "No previous kernel version.  U-Boot images not removed!"
    411   fi   fi
    412   else   else
    413   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    414   fi   fi
    415    
    416     if [[ -n ${cfgExtlinux} ]]
    417     then
    418     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    419     ${grubby} --extlinux -c ${extlinuxConfig} \
    420     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    421     else
    422     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    423     fi
    424  }  }
    425    
    426  update()  update()
    # Line 349  update() Line 443  update()
    443   fi   fi
    444   fi   fi
    445    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    446   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    447   then   then
    448   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    449   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    450     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    451   ${INITRD} \   ${INITRD} \
    452   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    453   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 363  update() Line 455  update()
    455   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    456   fi   fi
    457    
    458     if [[ -n ${cfgGrub2} ]]
    459     then
    460     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    461     ${grubby} --grub2 -c ${grub2Config} \
    462     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    463     ${INITRD} \
    464     ${kernargs:+--args="${kernargs}"} \
    465     ${removeargs:+--remove-args="${removeargs}"}
    466     else
    467     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    468     fi
    469    
    470     if [[ -n ${cfgGrub2Efi} ]]
    471     then
    472     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    473     ${grubby} --grub2 -c ${grub2EfiConfig} \
    474     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    475     ${INITRD} \
    476     ${kernargs:+--args="${kernargs}"} \
    477     ${removeargs:+--remove-args="${removeargs}"}
    478     else
    479     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    480     fi
    481    
    482   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    483   then   then
    484   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    # Line 391  update() Line 507  update()
    507   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    508    
    509   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    510   mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    511   -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -e ${ubootAddress} -n ${version} \
    512     -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    513    
    514   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    515   mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \   mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    # Line 417  update() Line 534  update()
    534   else   else
    535   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    536   fi   fi
    537    
    538     if [[ -n ${cfgExtlinux} ]]
    539     then
    540     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    541     ${grubby} --extlinux -c ${extlinuxConfig} \
    542     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    543     ${INITRD} \
    544     ${kernargs:+--args="${kernargs}"} \
    545     ${removeargs:+--remove-args="${removeargs}"}
    546     else
    547     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    548     fi
    549  }  }
    550    
    551  mkinitrd()  makeinitrd()
    552  {  {
    553   if [[ -n ${dracut} ]]   if [[ -n ${dracut} ]]
    554   then   then
    555   tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}"   tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    556   else   else
    557   tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"   tool="mkinitrd --allow-missing -f ${initrdfile} ${version}"
    558   fi   fi
    559   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    560   ${tool}   ${tool}
    # Line 666  fi Line 795  fi
    795    
    796  if [[ ${initrd} = make ]]  if [[ ${initrd} = make ]]
    797  then  then
    798   mkinitrd   makeinitrd
    799  elif [[ ${initrd} = remove ]]  elif [[ ${initrd} = remove ]]
    800  then  then
    801   rminitrd   rminitrd
    # Line 679  then Line 808  then
    808  fi  fi
    809    
    810  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    811    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    812    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    813  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    814    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    815    
    816  # if we have a uBoot directory, check if it is mounted.  # if we have a U-Boot directory, but no boot script, check if the directory
    817  # if not, mount it. Then check if a boot script exists.  # is mounted.  If not, mount it, and then check if a boot script exists.
    818  if [[ -n ${ubootDir} ]]  if [[ -n ${ubootDir} ]]
    819  then  then
    820   mountEntry=$(mount | grep ${ubootDir})   if [ -f ${ubootScript} ]
      if [[ -z ${mountEntry} ]]  
    821   then   then
    822   mount ${ubootDevice} ${ubootDir}   cfguBoot=1
    823   mounted=1   else
    824     mountEntry=$(mount | grep ${ubootDir})
    825     if [[ -z ${mountEntry} ]]
    826     then
    827     mount ${ubootDevice} ${ubootDir}
    828     mounted=1
    829     fi
    830     [ -f ${ubootScript} ] && cfguBoot=1
    831   fi   fi
      [ -f ${ubootScript} ] && cfguBoot=1  
    832  fi  fi
    833    
    834  # 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
    # Line 712  then Line 849  then
    849   update   update
    850  fi  fi
    851    
    852    # if we mounted the U-Boot directory, unmount it.
    853    [[ -n ${mounted} ]] && umount ${ubootDir}
    854    
    855  exit 0  exit 0
    Legend:
    Removed from v.1691  
    changed lines
      Added in v.1770