← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to src/notify.c

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/notify.c
27
27
#include <stdlib.h>
28
28
#include <string.h>
29
29
 
 
30
#include <systemd/sd-daemon.h>
 
31
 
30
32
#include "strv.h"
31
33
#include "util.h"
32
34
#include "log.h"
33
 
#include "sd-daemon.h"
34
35
#include "sd-readahead.h"
 
36
#include "build.h"
35
37
 
36
38
static bool arg_ready = false;
37
39
static pid_t arg_pid = 0;
44
46
        printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
45
47
               "Notify the init system about service status updates.\n\n"
46
48
               "  -h --help             Show this help\n"
 
49
               "     --version          Show package version\n"
47
50
               "     --ready            Inform the init system about service start-up completion\n"
48
51
               "     --pid[=PID]        Set main pid of daemon\n"
49
52
               "     --status=TEXT      Set status text\n"
58
61
 
59
62
        enum {
60
63
                ARG_READY = 0x100,
 
64
                ARG_VERSION,
61
65
                ARG_PID,
62
66
                ARG_STATUS,
63
67
                ARG_BOOTED,
66
70
 
67
71
        static const struct option options[] = {
68
72
                { "help",      no_argument,       NULL, 'h'           },
 
73
                { "version",   no_argument,       NULL, ARG_VERSION   },
69
74
                { "ready",     no_argument,       NULL, ARG_READY     },
70
75
                { "pid",       optional_argument, NULL, ARG_PID       },
71
76
                { "status",    required_argument, NULL, ARG_STATUS    },
87
92
                        help();
88
93
                        return 0;
89
94
 
 
95
                case ARG_VERSION:
 
96
                        puts(PACKAGE_STRING);
 
97
                        puts(DISTRIBUTION);
 
98
                        puts(SYSTEMD_FEATURES);
 
99
                        return 0;
 
100
 
90
101
                case ARG_READY:
91
102
                        arg_ready = true;
92
103
                        break;