Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/new-kernel-pkg

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

    revision 1756 by niro, Sat Feb 18 11:05:14 2012 UTC revision 1803 by niro, Mon Apr 16 17:51:27 2012 UTC
    # Line 25  Line 25 
    25  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    26  #  #
    27    
    28    read_os_release()
    29    {
    30     local NAME
    31     local ID
    32     local Version
    33     local Version_ID
    34     local PRETTY_NAME
    35     local ANSI_COLOR
    36     local CPE_NAME
    37    
    38     if [[ -f /etc/os-release ]]
    39     then
    40     source /etc/os-release
    41    
    42     case $1 in
    43     name) echo "${NAME}" ;;
    44     id) echo "${ID}" ;;
    45     version) echo "${Version}" ;;
    46     version_id) echo "${Version_ID}" ;;
    47     pretty_name) echo "${PRETTY_NAME}" ;;
    48     ansi_color) echo "${ANSI_COLOR}" ;;
    49     cpe_name) echo "${CPE_NAME}" ;;
    50     esac
    51     fi
    52    }
    53    
    54  PATH=/sbin:/bin:$PATH  PATH=/sbin:/bin:$PATH
    55    
    56  lilo=/sbin/lilo  lilo=/sbin/lilo
    # Line 65  then Line 91  then
    91  elif [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  elif [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    92  then  then
    93   liloConfig=/etc/yaboot.conf   liloConfig=/etc/yaboot.conf
    94     grub2Config=/boot/grub/grub.cfg
    95   bootPrefix=/boot   bootPrefix=/boot
    96   lilo=/sbin/ybin   lilo=/sbin/ybin
    97   liloFlag=yaboot   liloFlag=yaboot
    # Line 85  then Line 112  then
    112   lilo=/sbin/zipl   lilo=/sbin/zipl
    113   runLilo="yes"   runLilo="yes"
    114   isx86=""   isx86=""
    115  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]]  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
    116  then  then
    117   machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')   machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    118   liloConfig=""   liloConfig=""
    # Line 198  install() Line 225  install()
    225    
    226   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    227   then   then
    228   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    229   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    230   then   then
    231   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    232     elif [[ $(read_os_release id) = magellan ]]
    233     then
    234     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    235   else   else
    236   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    237   fi   fi
    238   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    239   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    # Line 219  install() Line 249  install()
    249    
    250   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    251   then   then
    252   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    253   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    254   then   then
    255   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    256     elif [[ $(read_os_release id) = magellan ]]
    257     then
    258     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    259   else   else
    260   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    261   fi   fi
    262   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    263   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    # Line 241  install() Line 274  install()
    274    
    275   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    276   then   then
    277   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    278   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    279   then   then
    280   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    281     elif [[ $(read_os_release id) = magellan ]]
    282     then
    283     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    284   else   else
    285   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    286   fi   fi
    287   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} \
    288   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    # Line 288  install() Line 324  install()
    324    
    325   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    326   then   then
    327   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    328   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    329   then   then
    330   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    331     elif [[ $(read_os_release id) = magellan ]]
    332     then
    333     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    334   else   else
    335   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    336   fi   fi
    337   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    338   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    Legend:
    Removed from v.1756  
    changed lines
      Added in v.1803