From f6a701090ca53de4c955091108cc44d3a96d5f76 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 12 Feb 2022 13:55:07 -0800 Subject: [PATCH] =?UTF-8?q?setup-apt-repos:=20Don=E2=80=99t=20install=20ls?= =?UTF-8?q?b=5Frelease.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- puppet/zulip_ops/files/teleport_node.yaml | 3 ++- scripts/lib/setup-apt-repo | 2 +- tools/setup/dev-vagrant-docker/Dockerfile | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/puppet/zulip_ops/files/teleport_node.yaml b/puppet/zulip_ops/files/teleport_node.yaml index 164e587d0e..87955f0df3 100644 --- a/puppet/zulip_ops/files/teleport_node.yaml +++ b/puppet/zulip_ops/files/teleport_node.yaml @@ -16,7 +16,8 @@ ssh_service: command: ["/usr/bin/uptrack-uname", "-r"] period: 1h0m0s - name: distro - command: ["/usr/bin/lsb_release", "-ds"] + command: + ["/bin/sh", "-c", '. /etc/os-release && printf "%s\n" "$PRETTY_NAME"'] period: 1h0m0s - name: classes command: diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo index b35d8e9e0e..7c4a4c2fba 100755 --- a/scripts/lib/setup-apt-repo +++ b/scripts/lib/setup-apt-repo @@ -83,7 +83,7 @@ fi # Hash to check if the configuration is changed by the script later. hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true) -pre_setup_deps=(lsb-release apt-transport-https ca-certificates gnupg curl) +pre_setup_deps=(apt-transport-https ca-certificates gnupg curl) if ! apt-get -dy install "${pre_setup_deps[@]}"; then apt-get update fi diff --git a/tools/setup/dev-vagrant-docker/Dockerfile b/tools/setup/dev-vagrant-docker/Dockerfile index 98fa714888..2560bd17cc 100644 --- a/tools/setup/dev-vagrant-docker/Dockerfile +++ b/tools/setup/dev-vagrant-docker/Dockerfile @@ -11,7 +11,6 @@ RUN echo locales locales/default_environment_locale select C.UTF-8 | debconf-set ca-certificates \ curl \ locales \ - lsb-release \ openssh-server \ python3 \ sudo \