more

4 files changed, 0 insertions, 256 deletions

diff --git a/src/grp-initutils/systemd-detect-virt/Makefile b/src/grp-initutils/systemd-detect-virt/Makefile
deleted file mode 100644
index 7b9b9f667b..0000000000
--- a/src/grp-initutils/systemd-detect-virt/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*-
-#
-#  This file is part of systemd.
-#
-#  Copyright 2010-2012 Lennart Poettering
-#  Copyright 2010-2012 Kay Sievers
-#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
-#  Copyright 2013 David Strauss
-#  Copyright 2016 Luke Shumaker
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
-include $(topsrcdir)/build-aux/Makefile.head.mk
-
-bin_PROGRAMS += systemd-detect-virt
-systemd_detect_virt_SOURCES = \
-	src/detect-virt/detect-virt.c
-
-systemd_detect_virt_LDADD = \
-	libshared.la
-
-INSTALL_EXEC_HOOKS += \
-	systemd-detect-virt-install-hook
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-initutils/systemd-detect-virt/detect-virt.c b/src/grp-initutils/systemd-detect-virt/detect-virt.c
deleted file mode 100644
index 06cdab5297..0000000000
--- a/src/grp-initutils/systemd-detect-virt/detect-virt.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <getopt.h>
-#include <stdbool.h>
-#include <stdlib.h>
-
-#include "basic/util.h"
-#include "basic/virt.h"
-
-static bool arg_quiet = false;
-static enum {
-        ANY_VIRTUALIZATION,
-        ONLY_VM,
-        ONLY_CONTAINER,
-        ONLY_CHROOT,
-} arg_mode = ANY_VIRTUALIZATION;
-
-static void help(void) {
-        printf("%s [OPTIONS...]\n\n"
-               "Detect execution in a virtualized environment.\n\n"
-               "  -h --help             Show this help\n"
-               "     --version          Show package version\n"
-               "  -c --container        Only detect whether we are run in a container\n"
-               "  -v --vm               Only detect whether we are run in a VM\n"
-               "  -r --chroot           Detect whether we are run in a chroot() environment\n"
-               "  -q --quiet            Don't output anything, just set return value\n"
-               , program_invocation_short_name);
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_VERSION = 0x100
-        };
-
-        static const struct option options[] = {
-                { "help",      no_argument,       NULL, 'h'           },
-                { "version",   no_argument,       NULL, ARG_VERSION   },
-                { "container", no_argument,       NULL, 'c'           },
-                { "vm",        no_argument,       NULL, 'v'           },
-                { "chroot",    no_argument,       NULL, 'r'           },
-                { "quiet",     no_argument,       NULL, 'q'           },
-                {}
-        };
-
-        int c;
-
-        assert(argc >= 0);
-        assert(argv);
-
-        while ((c = getopt_long(argc, argv, "hqcvr", options, NULL)) >= 0)
-
-                switch (c) {
-
-                case 'h':
-                        help();
-                        return 0;
-
-                case ARG_VERSION:
-                        return version();
-
-                case 'q':
-                        arg_quiet = true;
-                        break;
-
-                case 'c':
-                        arg_mode = ONLY_CONTAINER;
-                        break;
-
-                case 'v':
-                        arg_mode = ONLY_VM;
-                        break;
-
-                case 'r':
-                        arg_mode = ONLY_CHROOT;
-                        break;
-
-                case '?':
-                        return -EINVAL;
-
-                default:
-                        assert_not_reached("Unhandled option");
-                }
-
-        if (optind < argc) {
-                log_error("%s takes no arguments.", program_invocation_short_name);
-                return -EINVAL;
-        }
-
-        return 1;
-}
-
-int main(int argc, char *argv[]) {
-        int r;
-
-        /* This is mostly intended to be used for scripts which want
-         * to detect whether we are being run in a virtualized
-         * environment or not */
-
-        log_parse_environment();
-        log_open();
-
-        r = parse_argv(argc, argv);
-        if (r <= 0)
-                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-
-        switch (arg_mode) {
-
-        case ONLY_VM:
-                r = detect_vm();
-                if (r < 0) {
-                        log_error_errno(r, "Failed to check for VM: %m");
-                        return EXIT_FAILURE;
-                }
-
-                break;
-
-        case ONLY_CONTAINER:
-                r = detect_container();
-                if (r < 0) {
-                        log_error_errno(r, "Failed to check for container: %m");
-                        return EXIT_FAILURE;
-                }
-
-                break;
-
-        case ONLY_CHROOT:
-                r = running_in_chroot();
-                if (r < 0) {
-                        log_error_errno(r, "Failed to check for chroot() environment: %m");
-                        return EXIT_FAILURE;
-                }
-
-                return r ? EXIT_SUCCESS : EXIT_FAILURE;
-
-        case ANY_VIRTUALIZATION:
-        default:
-                r = detect_virtualization();
-                if (r < 0) {
-                        log_error_errno(r, "Failed to check for virtualization: %m");
-                        return EXIT_FAILURE;
-                }
-
-                break;
-        }
-
-        if (!arg_quiet)
-                puts(virtualization_to_string(r));
-
-        return r != VIRTUALIZATION_NONE ? EXIT_SUCCESS : EXIT_FAILURE;
-}
diff --git a/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.bash b/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.bash
deleted file mode 100644
index df06c29841..0000000000
--- a/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.bash
+++ /dev/null
@@ -1,40 +0,0 @@
-# systemd-detect-virt(1) completion             -*- shell-script -*-
-#
-# This file is part of systemd.
-#
-# Copyright 2014 Thomas H.P. Andersen
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__contains_word() {
-        local w word=$1; shift
-        for w in "$@"; do
-                [[ $w = "$word" ]] && return
-        done
-}
-
-_systemd_detect_virt() {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local i verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='-h --help --version -c --container -v --vm -q --quiet'
-        )
-
-        _init_completion || return
-
-        COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
-}
-
-complete -F _systemd_detect_virt systemd-detect-virt
diff --git a/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.zsh b/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.zsh
deleted file mode 100644
index a0c7df727c..0000000000
--- a/src/grp-initutils/systemd-detect-virt/systemd-detect-virt.completion.zsh
+++ /dev/null
@@ -1,11 +0,0 @@
-#compdef systemd-detect-virt
-
-local curcontext="$curcontext" state lstate line
-_arguments \
-    {-h,--help}'[Show this help]' \
-    '--version[Show package version]' \
-    {-c,--container}'[Only detect whether we are run in a container]' \
-    {-v,--vm}'[Only detect whether we are run in a VM]' \
-    {-q,--quiet}"[Don't output anything, just set return value]"
-
-#vim: set ft=zsh sw=4 ts=4 et