From 446f77bbb6b8cd8d38eb23e40f2232fc20ca43e26d9bf9242c9235ccbd9f15b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Feb 2018 09:44:46 +0000 Subject: [PATCH] Accepting request 576013 from Base:System OBS-URL: https://build.opensuse.org/request/show/576013 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=177 --- 80_suse_btrfs_snapshot | 2 +- grub2.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/80_suse_btrfs_snapshot b/80_suse_btrfs_snapshot index 11eb75f..7589358 100644 --- a/80_suse_btrfs_snapshot +++ b/80_suse_btrfs_snapshot @@ -3,7 +3,7 @@ set -e SNAPSHOTS="/.snapshots" if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && [ "x${GRUB_FS}" = "xbtrfs" ] && - [ -f "${SNAPSHOTS}/grub-snapshot.cfg" ]; then + [ -d "${SNAPSHOTS}" ]; then SNAPSHOT_RID=`btrfs inspect-internal rootid ${SNAPSHOTS}` ROOT_RID=`btrfs inspect-internal rootid /` if [ -n "${SNAPSHOT_RID}" -a "${SNAPSHOT_RID}" != "${ROOT_RID}" ]; then diff --git a/grub2.changes b/grub2.changes index 5da4228..de6a9db 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 13 09:05:45 UTC 2018 - mchang@suse.com + +- Fix incorrect check preventing the script from running (bsc#1078481) + * 80_suse_btrfs_snapshot + ------------------------------------------------------------------- Wed Feb 7 09:58:26 UTC 2018 - mchang@suse.com