diff options
Diffstat (limited to 'tiny-ec2-bootstrap')
-rw-r--r-- | tiny-ec2-bootstrap | 7 |
1 files 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 @@ | |||
3 | 3 | ||
4 | description="Provides EC2 cloud bootstrap" | 4 | description="Provides EC2 cloud bootstrap" |
5 | 5 | ||
6 | # override in /etc/conf.d/tiny-ec2-bootstrap | ||
7 | EC2_USER=${EC2_USER:-alpine} | ||
8 | |||
6 | depend() { | 9 | depend() { |
7 | need net | 10 | need net |
8 | provide cloud-final | 11 | provide cloud-final |
@@ -64,10 +67,6 @@ start() { | |||
64 | # Don't bootstrap if the host has already been bootstrapped | 67 | # Don't bootstrap if the host has already been bootstrapped |
65 | [ -f "/var/lib/cloud/.bootstrap-complete" ] && return 0 | 68 | [ -f "/var/lib/cloud/.bootstrap-complete" ] && return 0 |
66 | 69 | ||
67 | # load configuration, set defaults | ||
68 | [ -f "/etc/conf.d/tiny-ec2-bootstrap" ] && . /etc/conf.d/tiny-ec2-bootstrap | ||
69 | EC2_USER=${EC2_USER:-alpine} | ||
70 | |||
71 | [ -d "/var/lib/cloud" ] || mkdir -p /var/lib/cloud | 70 | [ -d "/var/lib/cloud" ] || mkdir -p /var/lib/cloud |
72 | 71 | ||
73 | ebegin "Disabling root password"; _disable_password root; eend $? | 72 | ebegin "Disabling root password"; _disable_password root; eend $? |