Merge authors:
Dmitrijs Ledkovs (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/compiler-warnings/+merge/181266
proposed by: Dmitrijs Ledkovs (xnox)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1521 [merge]
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: upstart
timestamp: Thu 2013-08-22 12:28:20 +0100
message:
Use nih_warn
modified:
util/reboot.c
util/shutdown.c
util/telinit.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'util/reboot.c'
--- util/reboot.c 2013-08-21 11:24:56 +0000
+++ util/reboot.c 2013-08-22 11:13:41 +0000
@@ -166,7 +166,7 @@
/* Check we're root */
if (setuid (geteuid ()) < 0)
- nih_info (_("Couldn't set uid."));
+ nih_warn (_("Couldn't set uid."));
if (getuid ()) {
nih_fatal (_("Need to be root"));
=== modified file 'util/shutdown.c'
--- util/shutdown.c 2013-08-21 11:24:56 +0000
+++ util/shutdown.c 2013-08-22 11:13:41 +0000
@@ -367,7 +367,7 @@
/* Check we're root, or setuid root */
if (setuid (geteuid ()) < 0)
- nih_info (_("Couldn't set uid."));
+ nih_warn (_("Couldn't set uid."));
if (getuid ()) {
nih_fatal (_("Need to be root"));
=== modified file 'util/telinit.c'
--- util/telinit.c 2013-08-21 11:24:56 +0000
+++ util/telinit.c 2013-08-22 11:13:41 +0000
@@ -244,7 +244,7 @@
/* Check we're root */
if (setuid (geteuid ()) < 0)
- nih_info (_("Couldn't set uid."));
+ nih_warn (_("Couldn't set uid."));
if (getuid ()) {
nih_fatal (_("Need to be root"));
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
