Skip to content

Commit

Permalink
8322783: prioritize /etc/os-release over /etc/SuSE-release in hs_err/…
Browse files Browse the repository at this point in the history
…info output

Reviewed-by: stuefe
Backport-of: 33af09083493940667958f951080e9d8700f784b
  • Loading branch information
MBaesken committed Apr 19, 2024
1 parent a33a174 commit 215cf9b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/hotspot/os/linux/os_linux.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1999, 2022, 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
Expand Down Expand Up @@ -2313,14 +2313,14 @@ 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",
"/etc/ltib-release",
"/etc/angstrom-version",
"/etc/system-release",
"/etc/os-release",
"/etc/SuSE-release", // Deprecated in favor of os-release since SuSE 12
NULL };

void os::Linux::print_distro_info(outputStream* st) {
Expand Down

1 comment on commit 215cf9b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.