sbsign: remove unused --no-pager option

diff --git a/man/systemd-sbsign.xml b/man/systemd-sbsign.xml
index 57b685f8c38204a19e80913e858c3e839b8d3d10..ef30cb0d671910c18e440dd1edd5a92592e0e77a 100644 (file)
--- a/man/systemd-sbsign.xml
+++ b/man/systemd-sbsign.xml
@@ -85,7 +85,6 @@
         <xi:include href="version-info.xml" xpointer="v257"/></listitem>
       </varlistentry>
 
-      <xi:include href="standard-options.xml" xpointer="no-pager"/>
       <xi:include href="standard-options.xml" xpointer="help"/>
       <xi:include href="standard-options.xml" xpointer="version"/>
     </variablelist>

diff --git a/src/sbsign/sbsign.c b/src/sbsign/sbsign.c
index 81970a7302b757442995e3bede6cb5f490095c74..d17fdfea5eddb00f9aca0bd9de7f9090ff2d8150 100644 (file)
--- a/src/sbsign/sbsign.c
+++ b/src/sbsign/sbsign.c
@@ -18,7 +18,6 @@
 #include "tmpfile-util.h"
 #include "verbs.h"
 
-static PagerFlags arg_pager_flags = 0;
 static char *arg_output = NULL;
 static char *arg_certificate = NULL;
 static CertificateSourceType arg_certificate_source_type = OPENSSL_CERTIFICATE_SOURCE_FILE;
@@ -48,7 +47,6 @@ static int help(int argc, char *argv[], void *userdata) {
                "\n%3$sOptions:%4$s\n"
                "  -h --help              Show this help\n"
                "     --version           Print version\n"
-               "     --no-pager          Do not pipe output into a pager\n"
                "     --output            Where to write the signed PE binary\n"
                "     --certificate=PATH|URI\n"
                "                         PEM certificate to use for signing, or a provider\n"
@@ -75,7 +73,6 @@ static int help(int argc, char *argv[], void *userdata) {
 static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
-                ARG_NO_PAGER,
                 ARG_OUTPUT,
                 ARG_CERTIFICATE,
                 ARG_CERTIFICATE_SOURCE,
@@ -85,7 +82,6 @@ static int parse_argv(int argc, char *argv[]) {
 
         static const struct option options[] = {
                 { "help",               no_argument,       NULL, 'h'                    },
-                { "no-pager",           no_argument,       NULL, ARG_NO_PAGER           },
                 { "version",            no_argument,       NULL, ARG_VERSION            },
                 { "output",             required_argument, NULL, ARG_OUTPUT             },
                 { "certificate",        required_argument, NULL, ARG_CERTIFICATE        },
@@ -110,10 +106,6 @@ static int parse_argv(int argc, char *argv[]) {
                 case ARG_VERSION:
                         return version();
 
-                case ARG_NO_PAGER:
-                        arg_pager_flags |= PAGER_DISABLE;
-                        break;
-
                 case ARG_OUTPUT:
                         r = parse_path_argument(optarg, /*suppress_root=*/ false, &arg_output);
                         if (r < 0)