Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: sphinx-pre-install: improve distro detection check

Browse Source 
The Arch-linux detection is hit by catting /etc/issue, whose
contents is (nowadays):

	Arch Linux \r (\l)

It sounds a little ackward to print such string, so,
instead, let's use the /etc/os-release file, with exists
on lots of distributions and should provide a more reliable
result.

We'll keep the old tests before it, in order to avoid possible
regressions with the other distros, although the new way should
probably work on all the currently supported distributions.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/472924557afdf2b5492ae2a48c5ecfae216d54e2.1586883286.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-14 18:56:08 +02:00 committed by Jonathan Corbet
parent d98dbbe0d3
commit d14d0c1aea
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/sphinx-pre-install
View File

@ -780,6 +780,24 @@ $system_release = catcheck("/etc/system-release") if !$system_release;
$system_release = catcheck("/etc/redhat-release") if !$system_release;
$system_release = catcheck("/etc/lsb-release") if !$system_release;
$system_release = catcheck("/etc/gentoo-release") if !$system_release;
# This seems more common than LSB these days
if (!$system_release) {
my %os_var;
if (open IN, "cat /etc/os-release|") {
while (<IN>) {
if (m/^([\w\d\_]+)=\"?([^\"]*)\"?\n/) {
$os_var{$1}=$2;
}
}
$system_release = $os_var{"NAME"};
if (defined($os_var{"VERSION_ID"})) {
$system_release .= " " . $os_var{"VERSION_ID"} if (defined($os_var{"VERSION_ID"}));
} else {
$system_release .= " " . $os_var{"VERSION"};
}
}
}
$system_release = catcheck("/etc/issue") if !$system_release;
$system_release =~ s/\s+$//;