forked from rpms/cloud-init
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From 0aba80bf749458960945acf106833b098c3c5c97 Mon Sep 17 00:00:00 2001
|
||
|
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
Date: Fri, 14 Jan 2022 16:50:44 +0100
|
||
|
Subject: [PATCH 4/5] Revert unnecesary lcase in ds-identify (#978)
|
||
|
|
||
|
RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
RH-MergeRequest: 17: Datasource for VMware
|
||
|
RH-Commit: [4/5] 334aae223b966173238a905150cf7bc07829c255 (eesposit/cloud-init-centos-)
|
||
|
RH-Bugzilla: 2040090
|
||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
||
|
commit f516a7d37c1654addc02485e681b4358d7e7c0db
|
||
|
Author: Andrew Kutz <101085+akutz@users.noreply.github.com>
|
||
|
Date: Fri Aug 13 14:30:55 2021 -0500
|
||
|
|
||
|
Revert unnecesary lcase in ds-identify (#978)
|
||
|
|
||
|
This patch reverts an unnecessary lcase optimization in the
|
||
|
ds-identify script. SystemD documents the values produced by
|
||
|
the systemd-detect-virt command are lower case, and the mapping
|
||
|
table used by the FreeBSD check is also lower-case.
|
||
|
|
||
|
The optimization added two new forked processes, needlessly
|
||
|
causing overhead.
|
||
|
|
||
|
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
---
|
||
|
tools/ds-identify | 2 +-
|
||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
||
|
diff --git a/tools/ds-identify b/tools/ds-identify
|
||
|
index 0e12298f..7b782462 100755
|
||
|
--- a/tools/ds-identify
|
||
|
+++ b/tools/ds-identify
|
||
|
@@ -449,7 +449,7 @@ detect_virt() {
|
||
|
read_virt() {
|
||
|
cached "$DI_VIRT" && return 0
|
||
|
detect_virt
|
||
|
- DI_VIRT="$(echo "${_RET}" | tr '[:upper:]' '[:lower:]')"
|
||
|
+ DI_VIRT="${_RET}"
|
||
|
}
|
||
|
|
||
|
is_container() {
|
||
|
--
|
||
|
2.27.0
|
||
|
|