]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #3170 from poettering/v230-preparation-fixes
authorLennart Poettering <lennart@poettering.net>
Wed, 4 May 2016 08:46:13 +0000 (10:46 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 4 May 2016 08:46:13 +0000 (10:46 +0200)
make virtualization detection quieter, rework unit start limit logic, detect unit file drop-in changes correctly, fix autofs state propagation

1  2 
src/core/automount.c
src/core/busname.c
src/core/mount.c
src/core/swap.c
src/core/unit.c
src/core/unit.h

Simple merge
Simple merge
Simple merge
diff --cc src/core/swap.c
Simple merge
diff --cc src/core/unit.c
Simple merge
diff --cc src/core/unit.h
Simple merge