/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/plymouth.c

  • Committer: Teddy Hogeborn
  • Date: 2011-07-16 00:29:19 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110716002919-r77yikuiulj42o40
* initramfs-tools-script: Abort if plugin-runner is missing.  Removed
                          workaround for Debian bug #633582; the
                          workaround required getopt, which can not be
                          guaranteed.
* plugin-runner.c (main): Work around Debian bug #633582.
* plugins.d/mandos-client.c (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/plymouth.c
19
19
 * along with this program.  If not, see
20
20
 * <http://www.gnu.org/licenses/>.
21
21
 * 
22
 
 * Contact the authors at <mandos@recompile.se>.
 
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
23
23
 */
24
24
 
25
25
#define _GNU_SOURCE             /* asprintf(), TEMP_FAILURE_RETRY() */
54
54
#include <stdarg.h>             /* va_list, va_start(), ... */
55
55
 
56
56
sig_atomic_t interrupted_by_signal = 0;
57
 
 
58
 
/* Used by Ubuntu 11.04 (Natty Narwahl) */
59
 
const char plymouth_old_pid[] = "/dev/.initramfs/plymouth.pid";
60
 
/* Used by Ubuntu 11.10 (Oneiric Ocelot) */
61
 
const char plymouth_pid[] = "/run/initramfs/plymouth.pid";
62
 
 
 
57
const char plymouth_pid[] = "/dev/.initramfs/plymouth.pid";
63
58
const char plymouth_path[] = "/bin/plymouth";
64
59
const char plymouthd_path[] = "/sbin/plymouthd";
65
60
const char *plymouthd_default_argv[] = {"/sbin/plymouthd",
66
61
                                        "--mode=boot",
67
62
                                        "--attach-to-session",
 
63
                                        "--pid-file="
 
64
                                        "/dev/.initramfs/"
 
65
                                        "plymouth.pid",
68
66
                                        NULL };
69
67
 
70
68
static void termination_handler(__attribute__((unused))int signum){
75
73
}
76
74
 
77
75
/* Function to use when printing errors */
78
 
__attribute__((format (gnu_printf, 3, 4)))
79
76
void error_plus(int status, int errnum, const char *formatstring,
80
77
                ...){
81
78
  va_list ap;
154
151
  return true;
155
152
}
156
153
 
157
 
__attribute__((nonnull (2, 3)))
158
154
bool exec_and_wait(pid_t *pid_return, const char *path,
159
155
                   const char **argv, bool interruptable,
160
156
                   bool daemonize){
214
210
  return false;
215
211
}
216
212
 
217
 
__attribute__((nonnull))
218
213
int is_plymouth(const struct dirent *proc_entry){
219
214
  int ret;
220
215
  {
265
260
 
266
261
pid_t get_pid(void){
267
262
  int ret;
 
263
  FILE *pidfile = fopen(plymouth_pid, "r");
268
264
  uintmax_t maxvalue = 0;
269
 
  FILE *pidfile = fopen(plymouth_pid, "r");
270
 
  /* Try the new pid file location */
271
265
  if(pidfile != NULL){
272
266
    ret = fscanf(pidfile, "%" SCNuMAX, &maxvalue);
273
267
    if(ret != 1){
275
269
    }
276
270
    fclose(pidfile);
277
271
  }
278
 
  /* Try the old pid file location */
279
 
  if(maxvalue == 0){
280
 
    pidfile = fopen(plymouth_pid, "r");
281
 
    if(pidfile != NULL){
282
 
      ret = fscanf(pidfile, "%" SCNuMAX, &maxvalue);
283
 
      if(ret != 1){
284
 
        maxvalue = 0;
285
 
      }
286
 
      fclose(pidfile);
287
 
    }
288
 
  }
289
 
  /* Look for a plymouth process */
290
272
  if(maxvalue == 0){
291
273
    struct dirent **direntries = NULL;
292
274
    ret = scandir("/proc", &direntries, is_plymouth, alphasort);