← Back to branch summary

~xnox/upstart/shrink-notifications

« back to all changes in this revision

Viewing changes to init/main.c

  • Committer: Dimitri John Ledkov
  • Date: 2014-06-05 22:35:01 UTC
  • mfrom: (1620.2.44 upstart-async)
  • Revision ID: dimitri.ledkov@canonical.com-20140605223501-z4hj7xddug95y59u
Merge cgroups work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/main.c
158
158
extern mode_t       initial_umask;
159
159
extern int          debug_stanza_enabled;
160
160
 
 
161
#ifdef ENABLE_CGROUPS
 
162
extern int          disable_cgroups;
 
163
#endif /* ENABLE_CGROUPS */
 
164
 
161
165
/**
162
166
 * options:
163
167
 *
179
183
        { 0, "logdir", N_("specify alternative directory to store job output logs in"),
180
184
                NULL, "DIR", &log_dir, NULL },
181
185
 
 
186
#ifdef ENABLE_CGROUPS
 
187
        { 0, "no-cgroups", N_("do not support cgroups"),
 
188
                NULL, NULL, &disable_cgroups, NULL },
 
189
#endif /* ENABLE_CGROUPS */
 
190
 
182
191
        { 0, "no-dbus", N_("do not connect to a D-Bus bus"),
183
192
                NULL, NULL, &disable_dbus, NULL },
184
193