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 3005 by niro, Tue Jun 27 14:23:32 2017 UTC revision 3006 by niro, Tue Jun 27 14:26:38 2017 UTC
    # Line 295  install() Line 295  install()
    295   --title=\"${title}\${debugtitle}\" --copy-default \   --title=\"${title}\${debugtitle}\" --copy-default \
    296   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    297   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    298   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    299     rungrubby --debug ${ARGS}
    300   else   else
    301   [[ -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"
    302   fi   fi
    # Line 310  install() Line 310  install()
    310   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    311   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    312   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    313   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    314     rungrubby --debug ${ARGS}
    315   else   else
    316   [[ -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"
    317   fi   fi
    # Line 326  install() Line 326  install()
    326   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    327   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    328   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    329   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    330     rungrubby --debug ${ARGS}
    331   else   else
    332   [[ -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"
    333   fi   fi
    # Line 342  install() Line 342  install()
    342   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    343   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    344   --remove-kernel=\"TITLE=${version}\""   --remove-kernel=\"TITLE=${version}\""
      rungrubby --debug ${ARGS}  
    345   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    346     rungrubby --debug ${ARGS}
    347    
    348   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    349   then   then
    # Line 370  install() Line 370  install()
    370   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    371   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    372   --remove-kernel=\"TITLE=${title}\${debugtitle}\""   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    373   rungrubby ${ARGS} ${makedefault}   rungrubby ${ARGS} ${makedefault}
    374     rungrubby --debug ${ARGS}
    375   else   else
    376   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    377   fi   fi
    # Line 540  update() Line 540  update()
    540   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    541   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    542   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    543   rungrubby ${ARGS}   rungrubby ${ARGS}
    544     rungrubby --debug ${ARGS}
    545   else   else
    546   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    547   fi   fi
    # Line 553  update() Line 553  update()
    553   ${kernargs:+--args=\"${kernargs}\"} \   ${kernargs:+--args=\"${kernargs}\"} \
    554   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    555   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    556   rungrubby ${ARGS}   rungrubby ${ARGS}
    557     rungrubby --debug ${ARGS}
    558   else   else
    559   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    560   fi   fi
    # Line 566  update() Line 566  update()
    566   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    567   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    568   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    569   rungrubby ${ARGS}   rungrubby ${ARGS}
    570     rungrubby --debug ${ARGS}
    571   else   else
    572   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    573   fi   fi
    # Line 579  update() Line 579  update()
    579   ${kernargs:+--args=\"${kernargs}\"} \   ${kernargs:+--args=\"${kernargs}\"} \
    580   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    581   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    582   rungrubby ${ARGS}   rungrubby ${ARGS}
    583     rungrubby --debug ${ARGS}
    584    
    585   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    586   then   then
    # Line 637  update() Line 637  update()
    637   ${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \   ${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    638   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    639   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
      rungrubby --debug ${ARGS}  
    640   rungrubby ${ARGS}   rungrubby ${ARGS}
    641     rungrubby --debug ${ARGS}
    642   else   else
    643   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    644   fi   fi
    Legend:
    Removed from v.3005  
    changed lines
      Added in v.3006