mirror of
https://github.com/troglobit/finit.git
synced 2026-10-15 10:29:35 +00:00
Fix #77: Remove deprecated startx and user .conf settings
It is strongly recommended to instead use the service stanza to start XDM/GDM, or use startx after a regular login. Note: the `user NAME` setting was always reserved for use with startx Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
1 parent
1de540dd67
commit
a2f4b35e4e
5 files changed
+1
-24
No files matched your search
-12
@@ -226,12 +226,6 @@ static void parse_static(char *line)
|
||||
char *x;
|
||||
char cmd[CMD_SIZE];
|
||||
|
||||
if (MATCH_CMD(line, "user ", x)) {
|
||||
if (username) free(username);
|
||||
username = strdup(strip_line(x));
|
||||
return;
|
||||
}
|
||||
|
||||
if (MATCH_CMD(line, "host ", x)) {
|
||||
if (hostname) free(hostname);
|
||||
hostname = strdup(strip_line(x));
|
||||
@@ -283,11 +277,6 @@ static void parse_static(char *line)
|
||||
return;
|
||||
}
|
||||
|
||||
if (MATCH_CMD(line, "startx ", x)) {
|
||||
service_register(SVC_TYPE_SERVICE, strip_line(x), NULL, username);
|
||||
return;
|
||||
}
|
||||
|
||||
if (MATCH_CMD(line, "shutdown ", x)) {
|
||||
if (sdown) free(sdown);
|
||||
sdown = strdup(strip_line(x));
|
||||
@@ -529,7 +518,6 @@ void conf_reload_dynamic(void)
|
||||
|
||||
int conf_parse_config(void)
|
||||
{
|
||||
username = strdup(DEFUSER);
|
||||
hostname = strdup(DEFHOST);
|
||||
|
||||
return parse_conf(FINIT_CONF);
|
||||
|
||||
Reference in new issue
Block a user