diff options
| -rw-r--r-- | Makefile.am | 57 | ||||
| -rw-r--r-- | src/shared/path-lookup.c | 15 | ||||
| -rw-r--r-- | src/shared/path-lookup.h | 2 |
3 files changed, 1 insertions, 73 deletions
diff --git a/Makefile.am b/Makefile.am index 67f57eb661..d56edec2ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,32 +54,13 @@ bashcompletiondir=@bashcompletiondir@ zshcompletiondir=@zshcompletiondir@ varlogdir=$(localstatedir)/log elogindstatedir=$(localstatedir)/lib/elogind -catalogstatedir=$(elogindstatedir)/catalog -xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/elogind -userunitdir=$(prefix)/lib/elogind/user -userpresetdir=$(prefix)/lib/elogind/user-preset -tmpfilesdir=$(prefix)/lib/tmpfiles.d -sysusersdir=$(prefix)/lib/sysusers.d -sysctldir=$(prefix)/lib/sysctl.d -binfmtdir=$(prefix)/lib/binfmt.d -modulesloaddir=$(prefix)/lib/modules-load.d -networkdir=$(rootprefix)/lib/elogind/network pkgincludedir=$(includedir)/elogind -systemgeneratordir=$(rootlibexecdir)/system-generators -usergeneratordir=$(prefix)/lib/elogind/user-generators -systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemsleepdir=$(rootlibexecdir)/system-sleep -systemunitdir=$(rootprefix)/lib/elogind/system -systempresetdir=$(rootprefix)/lib/elogind/system-preset udevrulesdir=$(rootprefix)/lib/udev/rules.d -catalogdir=$(prefix)/lib/elogind/catalog -kernelinstalldir = $(prefix)/lib/kernel/install.d factory_etcdir = $(prefix)/share/factory/etc factory_pamdir = $(prefix)/share/factory/etc/pam.d -bootlibdir = $(prefix)/lib/elogind/boot/efi # And these are the special ones for / rootprefix=@rootprefix@ @@ -108,8 +89,6 @@ nodist_pkgsysconf_DATA = dist_pkgdata_DATA = dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = -dist_systemunit_DATA_busnames = -dist_sysusers_DATA = check_PROGRAMS = check_DATA = tests= @@ -145,20 +124,9 @@ AM_CPPFLAGS = \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ - -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \ - -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ - -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \ -DROOTPREFIX=\"$(rootprefix)\" \ - -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/elogind/\" \ - -DRANDOM_SEED=\"$(localstatedir)/lib/elogind/random-seed\" \ - -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ - -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ - -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ - -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \ - -DELOGIND_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \ - -DX_SERVER=\"$(bindir)/X\" \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ @@ -303,7 +271,6 @@ AM_V_RM_0 = @echo " RM " $@; rootbin_PROGRAMS = bin_PROGRAMS = rootlibexec_PROGRAMS = -systemgenerator_PROGRAMS = dist_bashcompletion_DATA = dist_zshcompletion_DATA = @@ -962,43 +929,21 @@ substitutions = \ '|rootbindir=$(rootbindir)|' \ '|bindir=$(bindir)|' \ '|pkgsysconfdir=$(pkgsysconfdir)|' \ - '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \ - '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \ '|pkgdatadir=$(pkgdatadir)|' \ - '|systemunitdir=$(systemunitdir)|' \ - '|userunitdir=$(userunitdir)|' \ - '|systempresetdir=$(systempresetdir)|' \ - '|userpresetdir=$(userpresetdir)|' \ '|udevrulesdir=$(udevrulesdir)|' \ - '|catalogdir=$(catalogdir)|' \ - '|tmpfilesdir=$(tmpfilesdir)|' \ - '|sysusersdir=$(sysusersdir)|' \ - '|sysctldir=$(sysctldir)|' \ - '|systemgeneratordir=$(systemgeneratordir)|' \ - '|usergeneratordir=$(usergeneratordir)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \ - '|RANDOM_SEED_DIR=$(localstatedir)/lib/elogind/|' \ - '|RANDOM_SEED=$(localstatedir)/lib/elogind/random-seed|' \ '|prefix=$(prefix)|' \ '|exec_prefix=$(exec_prefix)|' \ '|libdir=$(libdir)|' \ '|includedir=$(includedir)|' \ '|VERSION=$(VERSION)|' \ '|rootprefix=$(rootprefix)|' \ - '|udevlibexecdir=$(udevlibexecdir)|' \ '|MKDIR_P=$(MKDIR_P)|' \ - '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \ '|VARLOGDIR=$(varlogdir)|' \ - '|PYTHON=$(PYTHON)|' \ - '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ - '|systemgidmax=$(SYSTEM_GID_MAX)|' \ - '|systemsleepdir=$(systemsleepdir)|' \ - '|systemshutdowndir=$(systemshutdowndir)|' \ - '|binfmtdir=$(binfmtdir)|' \ - '|modulesloaddir=$(modulesloaddir)|' + '|systemgidmax=$(SYSTEM_GID_MAX)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 83abf53faa..3d16e37d02 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -218,21 +218,6 @@ static char** user_dirs( return tmp; } -char **generator_paths(SystemdRunningAs running_as) { - if (running_as == SYSTEMD_USER) - return strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", - "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_PATH, - NULL); - else - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH, - NULL); -} - int lookup_paths_init( LookupPaths *p, SystemdRunningAs running_as, diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 2e0d3f7bda..3982974bad 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -39,8 +39,6 @@ typedef enum SystemdRunningAs { int user_config_home(char **config_home); int user_runtime_dir(char **runtime_dir); -char **generator_paths(SystemdRunningAs running_as); - int lookup_paths_init(LookupPaths *p, SystemdRunningAs running_as, bool personal, |