8322783: prioritize /etc/os-release over /etc/SuSE-release in hs_err/info output
Reviewed-by: dholmes, mdoerr
This commit is contained in:
parent
cbe329b90a
commit
a8e4229852
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2024 SAP SE. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -2097,7 +2097,6 @@ const char* distro_files[] = {
|
||||
"/etc/mandrake-release",
|
||||
"/etc/sun-release",
|
||||
"/etc/redhat-release",
|
||||
"/etc/SuSE-release",
|
||||
"/etc/lsb-release",
|
||||
"/etc/turbolinux-release",
|
||||
"/etc/gentoo-release",
|
||||
@ -2105,6 +2104,7 @@ const char* distro_files[] = {
|
||||
"/etc/angstrom-version",
|
||||
"/etc/system-release",
|
||||
"/etc/os-release",
|
||||
"/etc/SuSE-release", // Deprecated in favor of os-release since SuSE 12
|
||||
nullptr };
|
||||
|
||||
void os::Linux::print_distro_info(outputStream* st) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user