Merge pull request #13246 from keszybz/add-SystemdOptions-efi-variable
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 3 Oct 2019 10:19:44 +0000 (12:19 +0200)
committerGitHub <noreply@github.com>
Thu, 3 Oct 2019 10:19:44 +0000 (12:19 +0200)
Add efi variable to augment /proc/cmdline

13 files changed:
1  2 
docs/ENVIRONMENT.md
src/basic/cgroup-util.c
src/basic/cgroup-util.h
src/core/cgroup.c
src/core/execute.c
src/core/load-fragment.c
src/core/mount-setup.c
src/core/unit.c
src/login/logind-dbus.c
src/nspawn/nspawn.c
src/shared/bootspec.c
src/shared/bus-unit-util.c
src/shared/unit-file.c

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