From 8b933685a49d804a37d497f352285f3c15c458e7 Mon Sep 17 00:00:00 2001
From: Jake Buchholz <tomalok@gmail.com>
Date: Mon, 3 Jun 2019 22:13:27 -0700
Subject: openrc-run auto-loads /etc/conf.d/tiny-ec2-bootstrap

---
 tiny-ec2-bootstrap | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tiny-ec2-bootstrap b/tiny-ec2-bootstrap
index 83aeba7..6ef4eb9 100644
--- a/tiny-ec2-bootstrap
+++ b/tiny-ec2-bootstrap
@@ -3,6 +3,9 @@
 
 description="Provides EC2 cloud bootstrap"
 
+# override in /etc/conf.d/tiny-ec2-bootstrap
+EC2_USER=${EC2_USER:-alpine}
+
 depend() {
     need net
     provide cloud-final
@@ -64,10 +67,6 @@ start() {
     # Don't bootstrap if the host has already been bootstrapped
     [ -f "/var/lib/cloud/.bootstrap-complete" ] && return 0
 
-    # load configuration, set defaults
-    [ -f "/etc/conf.d/tiny-ec2-bootstrap" ] && . /etc/conf.d/tiny-ec2-bootstrap
-    EC2_USER=${EC2_USER:-alpine}
-
     [ -d "/var/lib/cloud" ] || mkdir -p /var/lib/cloud
 
     ebegin "Disabling root password"; _disable_password root; eend $?
-- 
cgit v1.2.3