Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
steam
systemd
Commits
4697132b
Commit
4697132b
authored
May 14, 2010
by
Lennart Poettering
Browse files
manager: merge /etc/xdg/systemd/session and /etc/systemd/session
parent
4e85aff4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
4697132b
...
...
@@ -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
manager.c
View file @
4697132b
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment