linux-kernel - RE: [PATCH 1/6] scripts: sphinx-pre-install: improve distro detection check

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <MWHPR13MB08950C5CC92A0C0FE0532AFAFDC00@MWHPR13MB0895.namprd13.prod.outlook.com>
Date:   Wed, 8 Apr 2020 17:01:20 +0000
From:   "Bird, Tim" <Tim.Bird@...y.com>
To:     Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Linux Doc Mailing List <linux-doc@...r.kernel.org>
CC:     "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Jonathan Corbet <corbet@....net>,
        Markus Heiser <markus.heiser@...marit.de>
Subject: RE: [PATCH 1/6] scripts: sphinx-pre-install: improve distro detection
 check



> -----Original Message-----
> From: Mauro Carvalho Chehab <mchehab@...nel.org> On Behalf Of Mauro Carvalho Chehab
> 
> 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@...nel.org>
> ---
>  scripts/sphinx-pre-install | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index fa3fb05cd54b..c2071a1c69ea 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -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 those days
should 'those' be 'these'?

> +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+$//;
> 
> --
> 2.25.2