summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-02-20 20:04:57 -0600
committerWilliam Hubbs <williamh@gentoo.org>2012-02-20 20:04:57 -0600
commit04db6c3d39f1c2e81e7d6d98f17388e2003bc17f (patch)
treed67dce587603be929af6223a0d0e2011b7143102
parent3c602e7422019430737cbf67f26f9cc30fb00f87 (diff)
downloadopenrc-04db6c3d39f1c2e81e7d6d98f17388e2003bc17f.tar.gz
openrc-04db6c3d39f1c2e81e7d6d98f17388e2003bc17f.tar.bz2
openrc-04db6c3d39f1c2e81e7d6d98f17388e2003bc17f.tar.xz
rc: remove calls to rc_sys_v2 and rc_sys_v1
These separate calls are no longer needed since we do not warn about falling back to automatic detection.
-rw-r--r--src/rc/rc.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/rc/rc.c b/src/rc/rc.c
index 40b6293..4cf0374 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -826,15 +826,9 @@ main(int argc, char **argv)
eerrorx("%s: %s", applet, strerror(errno));
/* NOTREACHED */
case 'S':
- if (rc_conf_value("rc_sys")) {
- bootlevel = rc_sys_v2();
- if (bootlevel)
- printf("%s\n", bootlevel);
- } else {
- bootlevel = rc_sys_v1();
- if (bootlevel)
- printf("%s\n", bootlevel);
- }
+ bootlevel = rc_sys();
+ if (bootlevel)
+ printf("%s\n", bootlevel);
exit(EXIT_SUCCESS);
/* NOTREACHED */
case_RC_COMMON_GETOPT