/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-10-02 13:47:52 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111002134752-c5g5ibcga4biz7ob
* plugins.d/plymouth.c (plymouth_pid): Changed to
                                       "/run/initramfs/plymouth.pid".
  (plymouth_old_pid): New; set to "/dev/.initramfs/plymouth.pid".
  (get_pid): Try both 'plymouth_pid' and 'plymouth_old_pid'.

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
 
const char plymouth_pid[] = "/dev/.initramfs/plymouth.pid";
 
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
 
58
63
const char plymouth_path[] = "/bin/plymouth";
59
64
const char plymouthd_path[] = "/sbin/plymouthd";
60
65
const char *plymouthd_default_argv[] = {"/sbin/plymouthd",
61
66
                                        "--mode=boot",
62
67
                                        "--attach-to-session",
63
 
                                        "--pid-file="
64
 
                                        "/dev/.initramfs/"
65
 
                                        "plymouth.pid",
66
68
                                        NULL };
67
69
 
68
70
static void termination_handler(__attribute__((unused))int signum){
260
262
 
261
263
pid_t get_pid(void){
262
264
  int ret;
 
265
  uintmax_t maxvalue = 0;
263
266
  FILE *pidfile = fopen(plymouth_pid, "r");
264
 
  uintmax_t maxvalue = 0;
 
267
  /* Try the new pid file location */
265
268
  if(pidfile != NULL){
266
269
    ret = fscanf(pidfile, "%" SCNuMAX, &maxvalue);
267
270
    if(ret != 1){
269
272
    }
270
273
    fclose(pidfile);
271
274
  }
 
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 */
272
287
  if(maxvalue == 0){
273
288
    struct dirent **direntries = NULL;
274
289
    ret = scandir("/proc", &direntries, is_plymouth, alphasort);