From 8bd0c4b17dfdf27dc072c4032d88cf2676f6fd51 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Jun 2019 11:22:28 +0100
Subject: [PATCH] cloud-init: Move detection functions into initscript function
 library

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/initscripts/system/cloud-init | 38 -------------------------------
 src/initscripts/system/functions  | 38 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/initscripts/system/cloud-init b/src/initscripts/system/cloud-init
index f385ce5d19..79a762b2d1 100644
--- a/src/initscripts/system/cloud-init
+++ b/src/initscripts/system/cloud-init
@@ -6,44 +6,6 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances.html
-running_on_ec2() {
-	local uuid
-
-	# Check if the hypervisor UUID starts with ec2
-	if [ -r "/sys/hypervisor/uuid" ]; then
-		uuid=$(</sys/hypervisor/uuid)
-
-		[ "${uuid:0:3}" = "ec2" ] && return 0
-	fi
-
-	# Check if the DMI product UUID starts with EC2
-	if [ -r "/sys/devices/virtual/dmi/id/product_uuid" ]; then
-		uuid=$(</sys/devices/virtual/dmi/id/product_uuid)
-
-		[ "${uuid:0:3}" = "EC2" ] && return 0
-	fi
-
-	# We are not running on AWS EC2
-	return 1
-}
-
-running_on_azure() {
-	# Check if the vendor is Microsoft
-	if [ -r "/sys/devices/virtual/dmi/id/sys_vendor" ] && \
-			[ "$(</sys/devices/virtual/dmi/id/sys_vendor)" = "Microsoft Corporation" ]; then
-		# Check if this product is a "Virtual Machine"
-		if [ -r "/sys/devices/virtual/dmi/id/product_name" ] && \
-				[ "$(</sys/devices/virtual/dmi/id/product_name)" = "Virtual Machine" ]; then
-			# Yes, we are running on Azure
-			return 0
-		fi
-	fi
-
-	# We are not running on Azure
-	return 1
-}
-
 case "${1}" in
 	start)
 		# Check if we are running in the cloud
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index c00f65922c..2870729a50 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -784,4 +784,42 @@ umount_ramdisk() {
 	rm -rf "${path_tmpfs}"
 }
 
+# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/identify_ec2_instances.html
+running_on_ec2() {
+	local uuid
+
+	# Check if the hypervisor UUID starts with ec2
+	if [ -r "/sys/hypervisor/uuid" ]; then
+		uuid=$(</sys/hypervisor/uuid)
+
+		[ "${uuid:0:3}" = "ec2" ] && return 0
+	fi
+
+	# Check if the DMI product UUID starts with EC2
+	if [ -r "/sys/devices/virtual/dmi/id/product_uuid" ]; then
+		uuid=$(</sys/devices/virtual/dmi/id/product_uuid)
+
+		[ "${uuid:0:3}" = "EC2" ] && return 0
+	fi
+
+	# We are not running on AWS EC2
+	return 1
+}
+
+running_on_azure() {
+	# Check if the vendor is Microsoft
+	if [ -r "/sys/devices/virtual/dmi/id/sys_vendor" ] && \
+			[ "$(</sys/devices/virtual/dmi/id/sys_vendor)" = "Microsoft Corporation" ]; then
+		# Check if this product is a "Virtual Machine"
+		if [ -r "/sys/devices/virtual/dmi/id/product_name" ] && \
+				[ "$(</sys/devices/virtual/dmi/id/product_name)" = "Virtual Machine" ]; then
+			# Yes, we are running on Azure
+			return 0
+		fi
+	fi
+
+	# We are not running on Azure
+	return 1
+}
+
 # End $rc_base/init.d/functions
-- 
2.39.2