From d9a5736bdfa9db29e94c5431bb8a9bc92a24585c Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@tele2.at>
Date: Fri, 23 Nov 2018 14:13:52 +0100
Subject: Remove some no longer needed cruft
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
---
cmd/Makemodule.am | 1 -
cmd/shutdown.c | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
(limited to 'cmd')
diff --git a/cmd/Makemodule.am b/cmd/Makemodule.am
index 07b50ce..c503215 100644
--- a/cmd/Makemodule.am
+++ b/cmd/Makemodule.am
@@ -2,7 +2,6 @@ shutdown_SOURCES = cmd/shutdown.c
shutdown_CPPFLAGS = $(AM_CPPFLAGS)
shutdown_CFLAGS = $(AM_CFLAGS)
shutdown_LDFLAGS = $(AM_LDFLAGS)
-shutdown_LDADD = libutil.a
runsvc_SOURCES = cmd/runsvc/runsvc.c cmd/runsvc/env.c cmd/runsvc/runsvc.h
runsvc_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/cmd/shutdown.c b/cmd/shutdown.c
index cc14e61..546b076 100644
--- a/cmd/shutdown.c
+++ b/cmd/shutdown.c
@@ -17,7 +17,6 @@
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
- { "version", no_argument, NULL, 'V' },
{ "poweroff", no_argument, NULL, 'p' },
{ "reboot", no_argument, NULL, 'r' },
{ "force", no_argument, NULL, 'f' },
@@ -25,7 +24,7 @@ static const struct option options[] = {
{ NULL, 0, NULL, 0 },
};
-static const char *shortopt = "hVprfn";
+static const char *shortopt = "hprfn";
static const char *defact_str = "power-off";
static int defact = RB_POWER_OFF;
@@ -78,8 +77,6 @@ int main(int argc, char **argv)
case 'r':
defact = RB_AUTOBOOT;
break;
- case 'V':
- print_version(ptr);
case 'h':
usage(ptr, EXIT_SUCCESS);
default:
--
cgit v1.2.3