picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

manager: merge /etc/xdg/systemd/session and /etc/systemd/session

Browse source
This commit is contained in:
Lennart Poettering 2010-05-14 02:50:19 +02:00
parent 4e85aff465
commit 4697132b91
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -250,3 +250,8 @@ CLEANFILES = \
systemadm.c \
systemd-initctl.service \
systemd-logger.service
install-data-hook:
$(MKDIR_P) $(DESTDIR)$(pkgsysconfdir)/system $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd
rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session

10
manager.c
View file

@ -149,12 +149,12 @@ static char** session_dirs(void) {
}
if ((e = getenv("XDG_CONFIG_DIRS")))
config_dirs = strv_split(e, ":");
else
config_dirs = strv_new("/etc/xdg", NULL);
if (!(config_dirs = strv_split(e, ":")))
goto fail;
if (!config_dirs)
goto fail;
/* We don't treat /etc/xdg/systemd here as the spec
* suggests because we assume that that is a link to
* /etc/systemd/ anyway. */
if ((e = getenv("XDG_DATA_HOME"))) {
if (asprintf(&data_home, "%s/systemd/session", e) < 0)