--- trunk/grubby/new-kernel-pkg 2012/03/03 15:22:47 1770 +++ trunk/grubby/new-kernel-pkg 2012/03/03 16:05:42 1778 @@ -25,6 +25,32 @@ # along with this program. If not, see . # +read_os_release() +{ + local NAME + local ID + local Version + local Version_ID + local PRETTY_NAME + local ANSI_COLOR + local CPE_NAME + + if [[ -f /etc/os-release ]] + then + source /etc/os-release + + case $1 in + name) echo "${NAME}" ;; + id) echo "${ID}" ;; + version) echo "${Version}" ;; + version_id) echo "${Version_ID}" ;; + pretty_name) echo "${PRETTY_NAME}" ;; + ansi_color) echo "${ANSI_COLOR}" ;; + cpe_name) echo "${CPE_NAME}" ;; + esac + fi +} + PATH=/sbin:/bin:$PATH lilo=/sbin/lilo @@ -202,6 +228,9 @@ elif [ -f /etc/mageversion ] then title="Magellan Linux $(< /etc/mageversion) [ ${version} ]" + elif [[ $(read_os_release id) = magellan ]] + then + title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]" else title="Magellan Linux [ ${version} ]" fi @@ -223,6 +252,9 @@ elif [ -f /etc/mageversion ] then title="Magellan Linux $(< /etc/mageversion) [ ${version} ]" + elif [[ $(read_os_release id) = magellan ]] + then + title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]" else title="Magellan Linux [ ${version} ]" fi @@ -245,6 +277,9 @@ elif [ -f /etc/mageversion ] then title="Magellan Linux $(< /etc/mageversion) [ ${version} ]" + elif [[ $(read_os_release id) = magellan ]] + then + title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]" else title="Magellan Linux [ ${version} ]" fi @@ -292,6 +327,9 @@ elif [ -f /etc/mageversion ] then title="Magellan Linux $(< /etc/mageversion) [ ${version} ]" + elif [[ $(read_os_release id) = magellan ]] + then + title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]" else title="Magellan Linux [ ${version} ]" fi