* move example tiny-cloud config to /lib/tiny-cloud/tiny-cloud.conf

* installation of various cloud-specific configs will be handled by post-install scripts

Makefile

@@ -4,19 +4,18 @@ SUBPACKAGES = core network openrc aws azure gcp oci nocloud
 
 .PHONY: install $(SUBPACKAGES)
 
-# installs all subpackages, then replaces cloud-specific config with example
 install: $(SUBPACKAGES)
-	mv "$(PREFIX)"/etc/conf.d/tiny-cloud.example "$(PREFIX)"/etc/conf.d/tiny-cloud
+	install -Dm644 lib/tiny-cloud.conf \
+		"$(PREFIX)"/etc/conf.d/tiny-cloud
 
 core:
 	install -Dm755 -t "$(PREFIX)"/bin \
 		bin/imds
-	install -Dm644 -t "$(PREFIX)"/etc/conf.d \
-		etc/conf.d/tiny-cloud.example
 	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud \
 		lib/tiny-cloud/common \
 		lib/tiny-cloud/init-* \
-		lib/tiny-cloud/mdev
+		lib/tiny-cloud/mdev \
+		lib/tiny-cloud/tiny-cloud.conf
 
 network:
 	install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \
@@ -37,33 +36,22 @@ aws: conf_dir
 		lib/mdev/nvme-ebs-links
 	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/aws \
 		lib/tiny-cloud/aws/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=aws/' \
-		-Ee 's/^#?HOTPLUG_MODULES=.*/HOTPLUG_MODULES="vnic_eth_hotplug nvme_ebs_links"/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 azure: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/azure \
 		lib/tiny-cloud/azure/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=azure/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 gcp: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/gcp \
 		lib/tiny-cloud/gcp/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=gcp/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 oci: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/oci \
 		lib/tiny-cloud/oci/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=oci/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 nocloud: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/nocloud \
 		lib/tiny-cloud/nocloud/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=nocloud/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 conf_dir:
 	mkdir -p "$(PREFIX)"/etc/conf.d

README.md

@@ -82,8 +82,8 @@ rc-update add tiny-cloud-final default
 ## Configuration
 
 By default, Tiny Cloud expects configuration at `/etc/conf.d/tiny-cloud`,
-The stock [`etc/conf.d/tiny-cloud`](etc/conf.d/tiny-cloud) file contains
-details of all tuneable settings.
+The stock [lib/tiny-cloud/tiny-cloud.conf`](lib/tiny-cloud/tiny-cloud.conf)
+file contains details of all tuneable settings.
 
 _Because Tiny Cloud does not currently do auto-detection, you **MUST** set a
 configuration value for `CLOUD` indicating which cloud provider will be used.

lib/tiny-cloud/tiny-cloud.conf

@@ -1,4 +1,5 @@
 # Tiny Cloud configuration
+# /etc/conf.d/tiny-cloud
 
 # REQUIRED: The instance's cloud provider
 # valid: aws, azure, gcp, oci, nocloud