/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-09-26 19:36:18 UTC
  • mfrom: (24.1.184 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/plymouth.c
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){
262
260
 
263
261
pid_t get_pid(void){
264
262
  int ret;
 
263
  FILE *pidfile = fopen(plymouth_pid, "r");
265
264
  uintmax_t maxvalue = 0;
266
 
  FILE *pidfile = fopen(plymouth_pid, "r");
267
 
  /* Try the new pid file location */
268
265
  if(pidfile != NULL){
269
266
    ret = fscanf(pidfile, "%" SCNuMAX, &maxvalue);
270
267
    if(ret != 1){
272
269
    }
273
270
    fclose(pidfile);
274
271
  }
275
 
  /* Try the old pid file location */
276
 
  if(maxvalue == 0){
277
 
    pidfile = fopen(plymouth_pid, "r");
278
 
    if(pidfile != NULL){
279
 
      ret = fscanf(pidfile, "%" SCNuMAX, &maxvalue);
280
 
      if(ret != 1){
281
 
        maxvalue = 0;
282
 
      }
283
 
      fclose(pidfile);
284
 
    }
285
 
  }
286
 
  /* Look for a plymouth process */
287
272
  if(maxvalue == 0){
288
273
    struct dirent **direntries = NULL;
289
274
    ret = scandir("/proc", &direntries, is_plymouth, alphasort);