From 5af38b9aa6ed95edd5521b8b423ad933ad34393b6ff096f61110868397672514 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 15 Jan 2018 10:27:52 +0000 Subject: [PATCH 1/2] Accepting request 563822 from home:RBrownSUSE:branches:Base:System - Edit scripts-systemd-fix-machines-btrfs-subvol.sh We shouldn't be creating a /var/lib/machines subvolume if /var is already a seperate partition or subvolume. /var/lib/machines will already be excluded from snapper & similar tooling in this case. OBS-URL: https://build.opensuse.org/request/show/563822 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1003 --- scripts-systemd-fix-machines-btrfs-subvol.sh | 12 ++++++++++++ systemd.changes | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/scripts-systemd-fix-machines-btrfs-subvol.sh b/scripts-systemd-fix-machines-btrfs-subvol.sh index a1b0832e..6ff4f688 100644 --- a/scripts-systemd-fix-machines-btrfs-subvol.sh +++ b/scripts-systemd-fix-machines-btrfs-subvol.sh @@ -74,6 +74,18 @@ if mount --fake /var/lib/machines 2>/dev/null; then exit fi +# +# If there is already an entry in fstab for /var, it means that: +# +# - the system has a seperate /var subvolume (default from Feb 2018) +# - the system has a seperate /var partition +# +# In any case we should exit +# +if mount --fake /var 2>/dev/null; then + exit +fi + # # If something is already mounted don't try to fix anything, it's been # done manually by the sysadmin. diff --git a/systemd.changes b/systemd.changes index e8400dc3..556fbd6d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com + +- Edit scripts-systemd-fix-machines-btrfs-subvol.sh + + We shouldn't be creating a /var/lib/machines subvolume if /var is + already a seperate partition or subvolume. /var/lib/machines will + already be excluded from snapper & similar tooling in this case. + ------------------------------------------------------------------- Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com From 54a19df9756c6de3236794c151b522ac438b526c4f448bf913d52ce9da706762 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 16 Jan 2018 11:09:48 +0000 Subject: [PATCH 2/2] Accepting request 566368 from home:fbui:systemd:Factory - Import commit cc94ce8513221061898c83f57862544b16021f0e aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) 77c5065f9 delta: check if a prefix needs to be skipped only once db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) 3a95f69bf tmpfiles: downgrade warning about duplicate line - Edit scripts-systemd-fix-machines-btrfs-subvol.sh We shouldn't be creating a /var/lib/machines subvolume if /var is already a seperate partition or subvolume. /var/lib/machines will already be excluded from snapper & similar tooling in this case. OBS-URL: https://build.opensuse.org/request/show/566368 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1004 --- systemd-234.tar.xz | 4 ++-- systemd-mini.changes | 22 ++++++++++++++++++++++ systemd.changes | 13 +++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 39b59e1a..ce8e2fb9 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b761b2045a378ccd840e3e95257adc1de122b6864706a3a521f86ceff7782fc -size 3353740 +oid sha256:dfe3727ab7449e20a9534d6eeb531d7cf49a74c894c8bcf964df2cda034aeda8 +size 3353636 diff --git a/systemd-mini.changes b/systemd-mini.changes index e8400dc3..4bc688e0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com + +- Import commit cc94ce8513221061898c83f57862544b16021f0e + + aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX + b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) + 77c5065f9 delta: check if a prefix needs to be skipped only once + db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) + 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) + 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) + 3a95f69bf tmpfiles: downgrade warning about duplicate line + +------------------------------------------------------------------- +Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com + +- Edit scripts-systemd-fix-machines-btrfs-subvol.sh + + We shouldn't be creating a /var/lib/machines subvolume if /var is + already a seperate partition or subvolume. /var/lib/machines will + already be excluded from snapper & similar tooling in this case. + ------------------------------------------------------------------- Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index 556fbd6d..4bc688e0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com + +- Import commit cc94ce8513221061898c83f57862544b16021f0e + + aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX + b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) + 77c5065f9 delta: check if a prefix needs to be skipped only once + db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) + 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) + 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) + 3a95f69bf tmpfiles: downgrade warning about duplicate line + ------------------------------------------------------------------- Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com