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 1770 by niro, Sat Mar 3 15:22:47 2012 UTC revision 1843 by niro, Mon Jul 2 12:58:29 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 87  then Line 114  then
    114   isx86=""   isx86=""
    115  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
    116  then  then
      machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')  
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    # Line 99  then Line 125  then
    125   mounted=""   mounted=""
    126   liloFlag=""   liloFlag=""
    127   isx86=""   isx86=""
    128   if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]   if [[ -z ${UBOOT_IMGADDR} ]]
    129   then   then
    130   ubootAddress=0x80008000   machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    131     if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]
    132     then
    133     ubootAddress=0x80008000
    134     else
    135     ubootAddress=0x00008000
    136     fi
    137   else   else
    138   ubootAddress=0x00008000   ubootAddress="${UBOOT_IMGADDR}"
    139   fi   fi
    140  else  else
    141   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    # Line 202  install() Line 234  install()
    234   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    235   then   then
    236   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    237     elif [[ $(read_os_release id) = magellan ]]
    238     then
    239     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    240   else   else
    241   title="Magellan Linux [ ${version} ]"   title="Magellan Linux [ ${version} ]"
    242   fi   fi
    # Line 223  install() Line 258  install()
    258   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    259   then   then
    260   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    261     elif [[ $(read_os_release id) = magellan ]]
    262     then
    263     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    264   else   else
    265   title="Magellan Linux [ ${version} ]"   title="Magellan Linux [ ${version} ]"
    266   fi   fi
    # Line 245  install() Line 283  install()
    283   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    284   then   then
    285   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    286     elif [[ $(read_os_release id) = magellan ]]
    287     then
    288     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    289   else   else
    290   title="Magellan Linux [ ${version} ]"   title="Magellan Linux [ ${version} ]"
    291   fi   fi
    # Line 292  install() Line 333  install()
    333   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    334   then   then
    335   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    336     elif [[ $(read_os_release id) = magellan ]]
    337     then
    338     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    339   else   else
    340   title="Magellan Linux [ ${version} ]"   title="Magellan Linux [ ${version} ]"
    341   fi   fi
    Legend:
    Removed from v.1770  
    changed lines
      Added in v.1843