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 2244 by niro, Mon Oct 21 13:52:07 2013 UTC revision 2964 by niro, Wed Jun 29 14:45:50 2016 UTC
    # Line 79  grubConfig="" Line 79  grubConfig=""
    79  grub2Config=""  grub2Config=""
    80  grub2EfiConfig=""  grub2EfiConfig=""
    81  extlinuxConfig=""  extlinuxConfig=""
    82    ubootScript="/boot/boot.scr"
    83    
    84  ARCH=$(uname -m)  ARCH=$(uname -m)
    85    
    # Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]] Line 117  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    117  then  then
    118   liloConfig=""   liloConfig=""
    119   bootPrefix=/boot   bootPrefix=/boot
    120     extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
    121   ubootDir=${UBOOT_DIR:-"/boot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    122   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    123   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    # Line 144  initrd="" Line 146  initrd=""
    146  dracut=""  dracut=""
    147  dracuthostonly=""  dracuthostonly=""
    148  initrdfile=""  initrdfile=""
    149    devtreefile=""
    150  moddep=""  moddep=""
    151  verbose=""  verbose=""
    152  makedefault=""  makedefault=""
    # Line 152  mbkernel="${HYPERVISOR}" Line 155  mbkernel="${HYPERVISOR}"
    155  mbargs="${HYPERVISOR_ARGS}"  mbargs="${HYPERVISOR_ARGS}"
    156  adddracutargs=""  adddracutargs=""
    157  addplymouthinitrd=""  addplymouthinitrd=""
    158    DEBUGARG="systemd.debug"
    159    
    160  usage()  usage()
    161  {  {
    # Line 161  usage() Line 165  usage()
    165   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    166   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    167   echo "       [--add-plymouth-initrd]" >&2   echo "       [--add-plymouth-initrd]" >&2
    168   echo "       [--host-only]" >&2   echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
    169   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    170   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    171   exit 1   exit 1
    172  }  }
    173    
    174    rungrubby()
    175    {
    176     if [[ $1 == --debug ]]
    177     then
    178     [[ ${MAKEDEBUG} != yes ]] && return 0
    179     [[ -n ${verbose} ]] && echo "- First, making a debug entry."
    180     declare -x debugtitle=" with debugging"
    181     declare -x debugargs="${DEBUGARG}"
    182     shift
    183     else
    184     [[ -n ${verbose} ] && echo "- Making a normal entry."
    185     fi
    186     $(eval $grubby $@)
    187     export -n debugargs
    188     export -n debugtitle
    189     unset debugargs
    190     unset debugtitle
    191    }
    192    
    193    set_title()
    194    {
    195     if [[ -n ${banner} ]]
    196     then
    197     if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    198     then
    199     title=$(echo ${banner} | sed 's/ /_/g')
    200     else
    201     title="${banner} [ ${version} ]"
    202     fi
    203     elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    204     then
    205     title=$(echo ${version} | sed 's/ /_/g')
    206     elif [ -f /etc/os-release ]
    207     then
    208     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    209     elif [ -f /etc/mageversion ]
    210     then
    211     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    212     else
    213     title="Magellan Linux [ ${version} ]"
    214     fi
    215    }
    216    
    217  install()  install()
    218  {  {
    219   # 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 188  install() Line 235  install()
    235   fi   fi
    236   fi   fi
    237    
    238     DEVTREE=""
    239     if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]
    240     then
    241     [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    242     DEVTREE="--devtree ${devtreefile}"
    243     fi
    244    
    245   # FIXME: is this a good heuristic to find out if we're on iSeries?   # FIXME: is this a good heuristic to find out if we're on iSeries?
    246   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    247   then   then
    # Line 217  install() Line 271  install()
    271   cfgLilo=""   cfgLilo=""
    272   fi   fi
    273    
    274   if [[ -n ${banner} ]]   set_title
      then  
      title="${banner} [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    275    
    276   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    277   then   then
    278   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
    279    
    280   ${grubby} --grub -c ${grubConfig} \   ARGS="--grub -c ${grubConfig} --add-kernel=${kernelImage} ${INITRD} \
    281   --add-kernel=${kernelImage} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    282   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    283   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   --title=\"${title}\${debugtitle}\" --copy-default \
    284   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    285     --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    286     rungrubby --debug ${ARGS}
    287     rungrubby ${ARGS} ${makedefault}
    288   else   else
    289   [[ -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"
    290   fi   fi
    # Line 246  install() Line 292  install()
    292   then   then
    293   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    294    
    295   ${grubby} --grub2 -c ${grub2Config} \   ARGS="--grub2 -c ${grub2Config} --add-kernel=${kernelImage} ${INITRD} \
    296   --add-kernel=${kernelImage} \   --copy-default --title \"${title}\${debugtitle}\" \
    297   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    298   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    299   ${mbargs:+--mbargs="${mbargs}"} \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    300   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    301     rungrubby --debug ${ARGS}
    302     rungrubby ${ARGS} ${makedefault}
    303   else   else
    304   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    305   fi   fi
    # Line 259  install() Line 307  install()
    307   then   then
    308   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    309    
    310   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ARGS="--grub2 -c ${grub2EfiConfig} --efi \
    311   --add-kernel=${kernelImage} \   --add-kernel=${kernelImage} ${DEVTREE} ${INITRD} \
    312   ${INITRD} --copy-default ${makedefault} --title "${title}" \   --copy-default --title \"${title}\${debugtitle}\" \
    313   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    314   ${mbargs:+--mbargs="${mbargs}"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    315   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    316     --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    317     rungrubby --debug ${ARGS}
    318     rungrubby ${ARGS} ${makedefault}
    319   else   else
    320   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    321   fi   fi
    # Line 273  install() Line 324  install()
    324   then   then
    325   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
    326    
    327   ${grubby} --add-kernel=${kernelImage} ${INITRD} \   ARGS="--${liloFlag} --add-kernel=${kernelImage} ${INITRD} \
    328   --copy-default ${makedefault} --title ${version} \   --copy-default --title \"${title}\${debugtitle}\" \
    329   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    330   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    331   --${liloFlag}   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    332     --remove-kernel=\"TITLE=${version}\""
    333     rungrubby --debug ${ARGS}
    334     rungrubby ${ARGS} ${makedefault}
    335    
    336   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    337   then   then
    # Line 297  install() Line 351  install()
    351   then   then
    352   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    353    
    354   ${grubby} --extlinux -c ${extlinuxConfig} \   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
    355   --add-kernel=${kernelImage} \   ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
    356   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    357   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    358   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    359     --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    360     rungrubby --debug ${ARGS}
    361     rungrubby ${ARGS} ${makedefault}
    362   else   else
    363   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    364   fi   fi
    # Line 404  remove() Line 461  remove()
    461   fi   fi
    462    
    463   mv ${tmpKList} ${ubootDir}/${ubootKList}   mv ${tmpKList} ${ubootDir}/${ubootKList}
    464     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    465   else   else
    466   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    467   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    # Line 433  update() Line 491  update()
    491   return   return
    492   fi   fi
    493    
    494     set_title
    495    
    496   INITRD=""   INITRD=""
    497   if [ -f ${initrdfile} ]   if [ -f ${initrdfile} ]
    498   then   then
    # Line 448  update() Line 508  update()
    508   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    509   then   then
    510   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    511   ${grubby} --grub -c ${grubConfig} \   ARGS="--grub -c ${grubConfig} --update-kernel=${kernelImage} ${INITRD} \
    512   --update-kernel=${kernelImage} \   ${kernargs:+--args=\"${kernargs}\"} \
    513   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    514   ${kernargs:+--args="${kernargs}"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    515   ${removeargs:+--remove-args="${removeargs}"}   --title=\"${title}\${debugtitle}\""
    516     rungrubby --debug ${ARGS}
    517     rungrubby ${ARGS}
    518   else   else
    519   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    520   fi   fi
    # Line 460  update() Line 522  update()
    522   if [[ -n ${cfgGrub2} ]]   if [[ -n ${cfgGrub2} ]]
    523   then   then
    524   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    525   ${grubby} --grub2 -c ${grub2Config} \   ARGS="--grub2 -c ${grub2Config} --update-kernel=${kernelImage} ${INITRD} \
    526   --update-kernel=${kernelImage} \   ${kernargs:+--args=\"${kernargs}\"} \
    527   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    528   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    529   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    530     rungrubby ${ARGS}
    531   else   else
    532   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    533   fi   fi
    # Line 472  update() Line 535  update()
    535   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    536   then   then
    537   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    538   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ARGS="--grub2 -c ${grub2EfiConfig} --efi --update-kernel=${kernelImage} \
    539   --update-kernel=${kernelImage} \   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    540   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    541   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    542   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    543     rungrubby ${ARGS}
    544   else   else
    545   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    546   fi   fi
    # Line 484  update() Line 548  update()
    548   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    549   then   then
    550   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    551   ${grubby} --update-kernel=${kernelImage} \   ARGS="--${liloFlag} --update-kernel=${kernelImage} ${INITRD} \
    552   ${INITRD} \   ${kernargs:+--args=\"${kernargs}\"} \
    553   ${kernargs:+--args="${kernargs}"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    554   ${removeargs:+--remove-args="${removeargs}"} \   --title=\"${title}\${debugtitle}\""
    555   --${liloFlag}   rungrubby --debug ${ARGS}
    556     rungrubby ${ARGS}
    557    
    558   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    559   then   then
    # Line 530  update() Line 595  update()
    595   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    596   fi   fi
    597   echo ${version} >> ${ubootDir}/${ubootKList}   echo ${version} >> ${ubootDir}/${ubootKList}
    598     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    599   else   else
    600   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    601   fi   fi
    # Line 540  update() Line 606  update()
    606   if [[ -n ${cfgExtlinux} ]]   if [[ -n ${cfgExtlinux} ]]
    607   then   then
    608   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    609   ${grubby} --extlinux -c ${extlinuxConfig} \   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
    610   --update-kernel=${kernelImage} \   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    611   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    612   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    613   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    614     rungrubby ${ARGS}
    615   else   else
    616   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    617   fi   fi
    # Line 602  do Line 669  do
    669   initrd="remove"   initrd="remove"
    670   ;;   ;;
    671    
    672     --devtree*)
    673     if [[ $1 == --devtree\=* ]]
    674     then
    675     devtreefile="${1#--devtreefile=}"
    676     else
    677     devtreefile="$2"
    678     shift
    679     fi
    680     ;;
    681    
    682   --dracut)   --dracut)
    683   dracut=--dracut   dracut=--dracut
    684   ;;   ;;
    # Line 830  then Line 907  then
    907  fi  fi
    908    
    909  # set this as the default if we have the package and it matches  # set this as the default if we have the package and it matches
    910  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
      [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]  
    911  then  then
    912   makedefault="--make-default"   if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
    913   [[ -n ${verbose} ]] && echo "making it the default based on config"   then
    914     makedefault="--make-default"
    915     [[ -n ${verbose} ]] && echo "making it the default based on config"
    916     fi
    917  fi  fi
    918    
    919  if [[ ${moddep} = make ]]  if [[ ${moddep} = make ]]
    Legend:
    Removed from v.2244  
    changed lines
      Added in v.2964