wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-25 12:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make startx command configurable from finit.conf

Browse Source 
Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
This commit is contained in:
Claudio Matsuoka committed 2008-10-01 16:50:38 -03:00
1 parent 1843a0e66f
commit 29ab953a87
3 files changed
+54 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

finit-alt.c
+9 -4
View File
@@ -200,6 +200,7 @@ int main()
char username[USERNAME_SIZE] = DEFUSER;
char hostname[HOSTNAME_SIZE] = "eviltwin";
char cmd[CMD_SIZE];
char startx[CMD_SIZE] = "xinit";
#ifdef USE_ETC_RESOLVCONF_RUN
DIR *dir;
struct dirent *d;
@@ -279,6 +280,11 @@ int main()
build_cmd(username, x, USERNAME_SIZE);
continue;
}
if (MATCH_CMD(line, "startx ", x)) {
*startx = 0;
build_cmd(startx, x, CMD_SIZE);
continue;
}
if (MATCH_CMD(line, "host ", x)) {
*hostname = 0;
build_cmd(hostname, x, HOSTNAME_SIZE);
@@ -298,7 +304,6 @@ int main()
*/
if (MATCH_CMD(line, "mountdev", x)) {
mount("none", "/dev", "tmpfs", 0, "mode=0755");
blkdev("/dev/sda", 0660, 8, 0);
blkdev("/dev/sda1", 0660, 8, 1);
blkdev("/dev/sda2", 0660, 8, 2);
blkdev("/dev/sda3", 0660, 8, 3);
@@ -529,13 +534,13 @@ int main()
_d("start X as %s\n", username);
if (debug) {
snprintf(line, LINE_SIZE,
"su -c xinit -l %s\n", username);
"su -l %s -c \"%s\"", username, startx);
system(line);
system("/bin/sh");
} else {
snprintf(line, LINE_SIZE,
"su -c xinit -l %s\n &> /dev/null",
username);
"su -l %s -c \"%s\" &> /dev/null",
username, startx);
system(line);
}
}