From a7bb55b72fc3473416c93827aa5ceb36f5e6bc5d Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sat, 11 Sep 2021 08:56:33 +0300 Subject: [PATCH] Recognize Ubuntu 21.10 (Impish Indri) --- util/pkg/distributions/distributions.go | 1 + util/pkg/distributions/identify.go | 2 ++ util/pkg/distributions/identify_test.go | 5 +++++ .../distributions/tests/ubuntu2110/etc/os-release | 12 ++++++++++++ 4 files changed, 20 insertions(+) create mode 100644 util/pkg/distributions/tests/ubuntu2110/etc/os-release diff --git a/util/pkg/distributions/distributions.go b/util/pkg/distributions/distributions.go index afee27447ae3b..4df5ab3e97018 100644 --- a/util/pkg/distributions/distributions.go +++ b/util/pkg/distributions/distributions.go @@ -45,6 +45,7 @@ var ( DistributionUbuntu2004 = Distribution{packageFormat: "deb", project: "ubuntu", id: "focal", version: 20.04} DistributionUbuntu2010 = Distribution{packageFormat: "deb", project: "ubuntu", id: "groovy", version: 20.10} DistributionUbuntu2104 = Distribution{packageFormat: "deb", project: "ubuntu", id: "hirsute", version: 21.04} + DistributionUbuntu2110 = Distribution{packageFormat: "deb", project: "ubuntu", id: "impish", version: 21.10} DistributionAmazonLinux2 = Distribution{packageFormat: "rpm", project: "amazonlinux2", id: "amazonlinux2", version: 0} DistributionRhel7 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel7", version: 7} DistributionCentos7 = Distribution{packageFormat: "rpm", project: "centos", id: "centos7", version: 7} diff --git a/util/pkg/distributions/identify.go b/util/pkg/distributions/identify.go index 3b3dd6da8d284..8f42eb30bd38d 100644 --- a/util/pkg/distributions/identify.go +++ b/util/pkg/distributions/identify.go @@ -70,6 +70,8 @@ func FindDistribution(rootfs string) (Distribution, error) { return DistributionUbuntu2010, nil case "ubuntu-21.04": return DistributionUbuntu2104, nil + case "ubuntu-21.10": + return DistributionUbuntu2110, nil } // Some distros have a more verbose VERSION_ID diff --git a/util/pkg/distributions/identify_test.go b/util/pkg/distributions/identify_test.go index 94160c16ee557..e2dacb3b256b8 100644 --- a/util/pkg/distributions/identify_test.go +++ b/util/pkg/distributions/identify_test.go @@ -114,6 +114,11 @@ func TestFindDistribution(t *testing.T) { err: nil, expected: DistributionUbuntu2104, }, + { + rootfs: "ubuntu2110", + err: nil, + expected: DistributionUbuntu2110, + }, { rootfs: "notfound", err: fmt.Errorf("reading /etc/os-release: open tests/notfound/etc/os-release: no such file or directory"), diff --git a/util/pkg/distributions/tests/ubuntu2110/etc/os-release b/util/pkg/distributions/tests/ubuntu2110/etc/os-release new file mode 100644 index 0000000000000..f7db53aedb3ca --- /dev/null +++ b/util/pkg/distributions/tests/ubuntu2110/etc/os-release @@ -0,0 +1,12 @@ +PRETTY_NAME="Ubuntu Impish Indri" +NAME="Ubuntu" +VERSION_ID="21.10" +VERSION="21.10 (Impish Indri)" +VERSION_CODENAME=impish +ID=ubuntu +ID_LIKE=debian +HOME_URL="https://www.ubuntu.com/" +SUPPORT_URL="https://help.ubuntu.com/" +BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" +PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" +UBUNTU_CODENAME=impish