From patchwork Tue Jul 21 10:36:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3268 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4B9w4x49cVz3xKT for ; Tue, 21 Jul 2020 10:36:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4B9w4v2Gglz1rl; Tue, 21 Jul 2020 10:36:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4B9w4v114Wz2ylK; Tue, 21 Jul 2020 10:36:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4B9w4s4372z2y9h for ; Tue, 21 Jul 2020 10:36:45 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4B9w4r5J71z1rl; Tue, 21 Jul 2020 10:36:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1595327804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=h/LJEPVHmEKwFA+u0zzhqk3lZlFxGLrKjBanTdwerzc=; b=pAPnRqYBdXtjIoQNtiIX8JGaZXIVMEqweal/yppgeeyIQVxoPCo4r99kxe1fA37O0ahOv0 XWYrHwBagCO9d5Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1595327804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=h/LJEPVHmEKwFA+u0zzhqk3lZlFxGLrKjBanTdwerzc=; b=r4+bSVJ8FQE9kO5GMbs13Xg5VfJPwmicOIsHqO8aHM5W8Usp+mYLtj0bTqMP36ipwGNlMO lVL+cubcfXNYKtpdgpMGTTEh0RM40xhVhvMg82acfYucT18u49ikTk9kcrfWFgT1ccT4tj 53Mx0VpM+qwucNZAs+S4IMU/MYfuarIj1zRC17vMhbqrB39IpOL2OAKwuNyHTEkZop9QJ3 eevGcytI84FT4qSR9658jxmEOR+/12I5GO8eM4ZXKUtMKlDas2KisaRfX5lI8bLFF5Kg3a 5Vv5cl7bljq+SR1iixt42CqQXS9N5ytu467OoiNV5Xa9l8hrF77idKN0xId+1Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] oci: Add detection for Oracle Cloud Date: Tue, 21 Jul 2020 10:36:39 +0000 Message-Id: <20200721103641.30305-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/initscripts/system/cloud-init | 2 ++ src/initscripts/system/functions | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/initscripts/system/cloud-init b/src/initscripts/system/cloud-init index 284e24d7b..d39552b01 100644 --- a/src/initscripts/system/cloud-init +++ b/src/initscripts/system/cloud-init @@ -15,6 +15,8 @@ case "${1}" in scriptname="/etc/rc.d/helper/azure-setup" elif running_on_gcp; then scriptname="/etc/rc.d/helper/gcp-setup" + elif running_on_oci; then + scriptname="/etc/rc.d/helper/oci-setup" else # This system is not running in the cloud exit 0 diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index b6e6507d6..30119918c 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -834,4 +834,15 @@ running_on_gcp() { return 1 } +running_on_oci() { + if [ -r "/sys/devices/virtual/dmi/id/chassis_asset_tag" ]; then + local asset_tag="$(