← Back to branch summary

~vorlon/ubuntu/raring/upstart/lp.1199778

« back to all changes in this revision

Viewing changes to init/main.c

  • Committer: Scott James Remnant
  • Date: 2008-04-12 11:31:49 UTC
  • Revision ID: scott@netsplit.com-20080412113149-0oarkl49cowpev6x
* init/main.c: Use a better name for kbdrequest
* init/event.h (KBDREQUEST_EVENT): Rename event to keyboard-request

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/main.c
196
196
        if (! restart)
197
197
                nih_signal_reset ();
198
198
 
199
 
#ifndef DEBUG                                                   \
 
199
#ifndef DEBUG
200
200
        /* Catch fatal errors immediately rather than waiting for a new
201
201
         * iteration through the main loop.
202
202
         */
227
227
        NIH_MUST (nih_signal_add_handler (NULL, SIGINT, cad_handler, NULL));
228
228
 
229
229
        /* Ask the kernel to send us SIGWINCH when alt-uparrow is pressed;
230
 
         * generate a kbdrequest event.
 
230
         * generate a keyboard-request event.
231
231
         */
232
232
        if (ioctl (0, KDSIGACCEPT, SIGWINCH) == 0) {
233
233
                nih_signal_set_handler (SIGWINCH, nih_signal_handler);
271
271
 
272
272
        conf_reload ();
273
273
 
274
 
#ifndef DEBUG                                                           \
 
274
#ifndef DEBUG
275
275
        /* Now that the startup is complete, send all further logging output
276
276
         * to syslog instead of to the console.
277
277
         */