Accepting request 566373 from Base:System

OBS-URL: https://build.opensuse.org/request/show/566373
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=268

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.

systemd-234.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b761b2045a378ccd840e3e95257adc1de122b6864706a3a521f86ceff7782fc
+oid sha256:dfe3727ab7449e20a9534d6eeb531d7cf49a74c894c8bcf964df2cda034aeda8
-size 3353740
+size 3353636

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
 

systemd.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