From 04db6c3d39f1c2e81e7d6d98f17388e2003bc17f Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 20 Feb 2012 20:04:57 -0600 Subject: 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. --- src/rc/rc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/rc/rc.c b/src/rc/rc.c index 40b62932..4cf0374d 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 -- cgit v1.2.3