← Back to branch summary

~jamesodhunt/ubuntu/vivid/upstart/bug-1447756

« back to all changes in this revision

Viewing changes to init/main.c

  • Committer: James Hunt
  • Date: 2013-08-27 09:17:21 UTC
  • mfrom: (1436.2.3)
  • mto: This revision was merged to the branch mainline in revision 1492.
  • Revision ID: james.hunt@ubuntu.com-20130827091721-w8t6f1i3lil6wrix
https://launchpad.net/bugs/1199778
https://launchpad.net/bugs/1200264
https://launchpad.net/bugs/1201865
New upstream release (LP: #1199778, #1200264, #1201865).

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/main.c
391
391
                }
392
392
 
393
393
        } else {
394
 
                nih_log_set_priority (NIH_LOG_DEBUG);
395
394
                nih_debug ("Running with UID %d as PID %d (PPID %d)",
396
395
                                (int)getuid (), (int)getpid (), (int)getppid ());
397
396
        }
772
771
        nih_main_loop_interrupt ();
773
772
        ret = nih_main_loop ();
774
773
 
 
774
        /* Cleanup */
 
775
        conf_destroy ();
 
776
        session_destroy ();
 
777
        control_cleanup ();
 
778
 
775
779
        return ret;
776
780
}
777
781