Skip to content

Commit bfbfb9f

Browse files
authored
Merge pull request #17664 from hakman/ubuntu-questing
Initial support for Ubuntu 25.10 (Questing Quokka)
2 parents fd03a10 + 5bfb0f3 commit bfbfb9f

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

util/pkg/distributions/distributions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ var (
4848
DistributionUbuntu2004 = Distribution{packageFormat: "deb", project: "ubuntu", id: "focal", version: 20.04}
4949
DistributionUbuntu2204 = Distribution{packageFormat: "deb", project: "ubuntu", id: "jammy", version: 22.04}
5050
DistributionUbuntu2404 = Distribution{packageFormat: "deb", project: "ubuntu", id: "noble", version: 24.04}
51+
DistributionUbuntu2510 = Distribution{packageFormat: "deb", project: "ubuntu", id: "questing", version: 25.10}
5152

5253
// Redhat-family distros
5354
DistributionRhel8 = Distribution{packageFormat: "rpm", project: "rhel", id: "rhel8", version: 8}

util/pkg/distributions/identify.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ func FindDistribution(rootfs string) (Distribution, error) {
6868
return DistributionUbuntu2204, nil
6969
case "ubuntu-24.04":
7070
return DistributionUbuntu2404, nil
71+
case "ubuntu-25.10":
72+
return DistributionUbuntu2510, nil
7173
}
7274

7375
// Some distros have a more verbose VERSION_ID

util/pkg/distributions/identify_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ func TestFindDistribution(t *testing.T) {
138138
err: nil,
139139
expected: DistributionUbuntu2404,
140140
},
141+
{
142+
rootfs: "ubuntu2510",
143+
err: nil,
144+
expected: DistributionUbuntu2510,
145+
},
141146
{
142147
rootfs: "notfound",
143148
err: fmt.Errorf("reading /etc/os-release: open tests/notfound/etc/os-release: no such file or directory"),
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
PRETTY_NAME="Ubuntu 25.10"
2+
NAME="Ubuntu"
3+
VERSION_ID="25.10"
4+
VERSION="25.10 (Questing Quokka)"
5+
VERSION_CODENAME=questing
6+
ID=ubuntu
7+
ID_LIKE=debian
8+
HOME_URL="https://www.ubuntu.com/"
9+
SUPPORT_URL="https://help.ubuntu.com/"
10+
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
11+
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
12+
UBUNTU_CODENAME=questing
13+
LOGO=ubuntu-logo

0 commit comments

Comments
 (0)