forked from pool/systemd
Accepting request 487022 from home:fbui:systemd:Factory
- Import commit f0325620d23a247682c629d28883a364e4a7a8c4 327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487) f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263) 44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183) 64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615) 77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398) 336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610) - Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290) OBS-URL: https://build.opensuse.org/request/show/487022 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=975
This commit is contained in:
parent
7811be6b3a
commit
bc61a4f7fb
@ -57,9 +57,26 @@ on_exit() {
|
||||
}
|
||||
|
||||
#
|
||||
# If something is already mounted don't try to fix anything, the
|
||||
# subvolume has already been created by either mksubvolume(8) or by
|
||||
# the admin. In the later case we don't want to screw up his setup.
|
||||
# If there's already an entry in fstab for /var/lib/machines, it
|
||||
# means that:
|
||||
#
|
||||
# - the installer initialized /var/lib/machines correctly (default)
|
||||
# - we already fixed it
|
||||
# - the sysadmin added it manually
|
||||
#
|
||||
# In any cases we should exit.
|
||||
#
|
||||
# Note: we can't simply check if /var/lib/machines has been mounted
|
||||
# because an update through a chroot might be in progress (see
|
||||
# bsc#1030290).
|
||||
#
|
||||
if mount --fake /var/lib/machines 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.
|
||||
#
|
||||
if mountpoint -q /var/lib/machines; then
|
||||
exit
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b18396fcc866a33113def88f733742525aee7017ae7d3f593c69e7534414150
|
||||
size 3212320
|
||||
oid sha256:51c12300bec369cb034266fc885beaefd9460ed04b039b341bc7dc39157aa5f8
|
||||
size 3212352
|
||||
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com
|
||||
|
||||
- Import commit f0325620d23a247682c629d28883a364e4a7a8c4
|
||||
|
||||
327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487)
|
||||
f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263)
|
||||
44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183)
|
||||
64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615)
|
||||
77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398)
|
||||
336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 22 13:24:57 UTC 2017 - fbui@suse.com
|
||||
|
||||
- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com
|
||||
|
||||
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com
|
||||
|
||||
- Import commit f0325620d23a247682c629d28883a364e4a7a8c4
|
||||
|
||||
327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487)
|
||||
f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263)
|
||||
44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183)
|
||||
64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615)
|
||||
77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398)
|
||||
336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 22 13:24:57 UTC 2017 - fbui@suse.com
|
||||
|
||||
- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user