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 $?