Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2018-02-09 15:45:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Fri Feb 9 15:45:30 2018 rev:176 rq:574507 version:2.02 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2018-02-02 22:19:59.808277231 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-02-09 15:45:33.219683812 +0100 @@ -1,0 +2,19 @@ +Wed Feb 7 09:58:26 UTC 2018 - [email protected] + +- Fix disappeared snapshot menu entry (bsc#1078481) + * 80_suse_btrfs_snapshot + +------------------------------------------------------------------- +Tue Feb 6 09:44:26 UTC 2018 - [email protected] + +- Fix unquoted string error and add some more checks (bsc#1079330) + * grub2-check-default.sh + +------------------------------------------------------------------- +Mon Feb 5 08:52:20 UTC 2018 - [email protected] + +- The %prep section applies patches, the %build section builds. + Remove mixup of patching and building from %prep for quilt setup + Related to bsc#1065703 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.mBHEUe/_old 2018-02-09 15:45:36.379570350 +0100 +++ /var/tmp/diff_new_pack.mBHEUe/_new 2018-02-09 15:45:36.383570206 +0100 @@ -544,6 +544,8 @@ %patch420 -p1 %patch421 -p1 %patch430 -p1 + +%build # patches above may update the timestamp of grub.texi # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare [ -z "$SOURCE_DATE_EPOCH" ] ||\ @@ -574,7 +576,6 @@ mkdir build-emu %endif -%build export PYTHON=%{_bindir}/python3 # autogen calls autoreconf -vi ./autogen.sh ++++++ 80_suse_btrfs_snapshot ++++++ --- /var/tmp/diff_new_pack.mBHEUe/_old 2018-02-09 15:45:36.499566042 +0100 +++ /var/tmp/diff_new_pack.mBHEUe/_new 2018-02-09 15:45:36.499566042 +0100 @@ -1,10 +1,22 @@ #! /bin/sh set -e +SNAPSHOTS="/.snapshots" if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && - [ "x${GRUB_FS}" = "xbtrfs" ] ; then + [ "x${GRUB_FS}" = "xbtrfs" ] && + [ -f "${SNAPSHOTS}/grub-snapshot.cfg" ]; then + SNAPSHOT_RID=`btrfs inspect-internal rootid ${SNAPSHOTS}` + ROOT_RID=`btrfs inspect-internal rootid /` + if [ -n "${SNAPSHOT_RID}" -a "${SNAPSHOT_RID}" != "${ROOT_RID}" ]; then + SNAPSHOT_SUBVOL=`btrfs inspect-internal subvolid-resolve ${SNAPSHOT_RID} /` + ROOT_SUBVOL=`btrfs inspect-internal subvolid-resolve ${ROOT_RID} /` + INODE=`stat -c '%i' ${SNAPSHOTS}` + if [ "x${INODE}" = "x256" -a "x${ROOT_SUBVOL}${SNAPSHOTS}" != "x${SNAPSHOT_SUBVOL}" ]; then + echo "btrfs-mount-subvol (\$root) ${SNAPSHOTS} ${SNAPSHOT_SUBVOL}" + fi + fi cat <<EOF -if [ -f "/.snapshots/grub-snapshot.cfg" ]; then - source "/.snapshots/grub-snapshot.cfg" +if [ -f "${SNAPSHOTS}/grub-snapshot.cfg" ]; then + source "${SNAPSHOTS}/grub-snapshot.cfg" fi EOF fi ++++++ grub2-check-default.sh ++++++ --- /var/tmp/diff_new_pack.mBHEUe/_old 2018-02-09 15:45:36.631561302 +0100 +++ /var/tmp/diff_new_pack.mBHEUe/_new 2018-02-09 15:45:36.631561302 +0100 @@ -39,7 +39,9 @@ debug_print "SAVED_ENTRY=$SAVED_ENTRY" -[ -z "$SAVED_ENTRY" ] && exit 0 +if [ -z "$SAVED_ENTRY" ] || expr match "$SAVED_ENTRY" "^[0-9]\+$" >/dev/null; then + exit 0 +fi MENU_ENTRIES=`awk ' BEGIN { @@ -103,13 +105,13 @@ debug_print "NEW_SAVED_ENTRY=$NEW_SAVED_ENTRY" -if [ "$NEW_SAVED_ENTRY" = "$SAVED_ENTRY" ]; then +if [ -z "$NEW_SAVED_ENTRY" -o "$NEW_SAVED_ENTRY" = "$SAVED_ENTRY" ]; then exit 0 fi IFS=$'\n' for i in $MENU_ENTRIES; do - if [ $NEW_SAVED_ENTRY = $i ]; then + if [ "$NEW_SAVED_ENTRY" = "$i" ]; then run_command ${GRUB_SET_DEFAULT} "$NEW_SAVED_ENTRY" exit 0 fi
