| … | |
… | |
| 46 | int |
46 | int |
| 47 | write_pidfile (void) |
47 | write_pidfile (void) |
| 48 | { |
48 | { |
| 49 | int pid; |
49 | int pid; |
| 50 | |
50 | |
| 51 | pid = check_pid (pidfilename); |
51 | pid = check_pid (conf.pidfilename); |
| 52 | |
52 | |
| 53 | if (pid) |
53 | if (pid) |
| 54 | { |
54 | { |
| 55 | fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); |
55 | fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); |
| 56 | return 1; |
56 | return 1; |
| 57 | } |
57 | } |
| 58 | |
58 | |
| 59 | /* if it's locked, write-protected, or whatever */ |
59 | /* if it's locked, write-protected, or whatever */ |
| 60 | if (!write_pid (pidfilename)) |
60 | if (!write_pid (conf.pidfilename)) |
| 61 | return 1; |
61 | return 1; |
| 62 | |
62 | |
| 63 | return 0; |
63 | return 0; |
| 64 | } |
64 | } |
| 65 | |
65 | |
| 66 | int |
66 | int |
| 67 | kill_other (int signal) |
67 | kill_other (int signal) |
| 68 | { |
68 | { |
| 69 | int pid; |
69 | int pid; |
| 70 | |
70 | |
| 71 | pid = read_pid (pidfilename); |
71 | pid = read_pid (conf.pidfilename); |
| 72 | |
72 | |
| 73 | if (!pid) |
73 | if (!pid) |
| 74 | { |
74 | { |
| 75 | fprintf (stderr, _("No other vped is running.\n")); |
75 | fprintf (stderr, _("No other vped is running.\n")); |
| 76 | return 1; |
76 | return 1; |
| … | |
… | |
| 82 | if (kill (pid, signal) && errno == ESRCH) |
82 | if (kill (pid, signal) && errno == ESRCH) |
| 83 | { |
83 | { |
| 84 | fprintf (stderr, _("The vped is no longer running. ")); |
84 | fprintf (stderr, _("The vped is no longer running. ")); |
| 85 | |
85 | |
| 86 | fprintf (stderr, _("Removing stale lock file.\n")); |
86 | fprintf (stderr, _("Removing stale lock file.\n")); |
| 87 | remove_pid (pidfilename); |
87 | remove_pid (conf.pidfilename); |
| 88 | } |
88 | } |
| 89 | |
89 | |
| 90 | return 0; |
90 | return 0; |
| 91 | } |
91 | } |
| 92 | |
92 | |
| … | |
… | |
| 112 | return -1; |
112 | return -1; |
| 113 | } |
113 | } |
| 114 | |
114 | |
| 115 | /* Now UPDATE the pid in the pidfile, because we changed it... */ |
115 | /* Now UPDATE the pid in the pidfile, because we changed it... */ |
| 116 | |
116 | |
| 117 | if (!write_pid (pidfilename)) |
117 | if (!write_pid (conf.pidfilename)) |
| 118 | return -1; |
118 | return -1; |
| 119 | |
119 | |
| 120 | log_to (LOGTO_SYSLOG); |
120 | log_to (LOGTO_SYSLOG); |
| 121 | } |
121 | } |
| 122 | else |
122 | else |
| … | |
… | |
| 128 | } |
128 | } |
| 129 | |
129 | |
| 130 | void |
130 | void |
| 131 | make_names (void) |
131 | make_names (void) |
| 132 | { |
132 | { |
| 133 | if (!pidfilename) |
133 | if (!conf.pidfilename) |
| 134 | pidfilename = LOCALSTATEDIR "/run/vped.pid"; |
134 | conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid"); |
| 135 | |
135 | |
| 136 | if (!confbase) |
136 | if (!confbase) |
| 137 | asprintf (&confbase, "%s/vpe", CONFDIR); |
137 | asprintf (&confbase, "%s/vpe", CONFDIR); |
| 138 | } |
138 | } |
| 139 | |
139 | |
