Accepting request 317557 from home:michael-chang:branches:Base:System

- Replace 12.1 with 12 SP1 for the list of snapshots (bsc#934252)
  * modified grub2-snapper-plugin.sh

OBS-URL: https://build.opensuse.org/request/show/317557
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=171
This commit is contained in:
Andrei Borzenkov 2015-07-20 05:59:33 +00:00 committed by Git OBS Bridge
parent edf621776c
commit f7e986d5af
2 changed files with 16 additions and 1 deletions

View File

@ -62,6 +62,10 @@ snapshot_submenu () {
kernel_ver=`readlink ${snapshot}/boot/image | sed -e 's/^image-//' -e 's/-default$//'`
fi
eval `cat ${snapshot}/etc/os-release`
# bsc#934252 - Replace SLES 12.1 with SLES12-SP1 for the list of snapshots
if test "${NAME}" = "SLES" -o "${NAME}" = "SLED"; then
VERSION=`echo ${VERSION} | sed -e 's!^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)$!\1-SP\2!'`
fi
# FATE#318101
# Show user defined comments in grub2 menu for snapshots
@ -85,7 +89,12 @@ snapshot_submenu () {
test "$stype" = "single" && stype=""
test -z "$stype" || stype=",$stype"
test -z "$desc" || desc=",$desc"
title="${important}${NAME} $VERSION ($kernel_ver,$date$stype$desc)"
if test "${NAME}" = "SLES" -o "${NAME}" = "SLED"; then
title="${important}${NAME}${VERSION} ($kernel_ver,$date$stype$desc)"
else
title="${important}${NAME} ${VERSION} ($kernel_ver,$date$stype$desc)"
fi
cat <<EOF

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 17 08:44:24 UTC 2015 - mchang@suse.com
- Replace 12.1 with 12 SP1 for the list of snapshots (bsc#934252)
* modified grub2-snapper-plugin.sh
-------------------------------------------------------------------
Thu Jun 18 08:43:07 UTC 2015 - mchang@suse.com