From a839ee77c786a8200c76ca92f697eebf6bcc9aa3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 18 May 2013 06:31:53 +0200 Subject: qga: save state directory in ga_install_service() If the user selects a non-default state directory at service installation time, we should remember it in the registered service. Signed-off-by: Laszlo Ersek Signed-off-by: Michael Roth --- qga/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'qga/main.c') diff --git a/qga/main.c b/qga/main.c index 5f2d141431..0e04e7395c 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1022,7 +1022,16 @@ int main(int argc, char **argv) case 's': service = optarg; if (strcmp(service, "install") == 0) { - return ga_install_service(path, log_filepath); + const char *fixed_state_dir; + + /* If the user passed the "-t" option, we save that state dir + * in the service. Otherwise we let the service fetch the state + * dir from the environment when it starts. + */ + fixed_state_dir = (state_dir == dfl_pathnames.state_dir) ? + NULL : + state_dir; + return ga_install_service(path, log_filepath, fixed_state_dir); } else if (strcmp(service, "uninstall") == 0) { return ga_uninstall_service(); } else { -- cgit v1.2.1