diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2009-03-05 16:09:38 +0000 |
|---|---|---|
| committer | Bazaar Package Importer <jamesw@ubuntu.com> | 2009-03-05 16:09:38 +0000 |
| commit | 2d667f57536a532d84872404e19e777820692665 (patch) | |
| tree | 31824cd5b9112f731a75b9ca990f6ab1b4557e91 /debian/init | |
| parent | ecc2046ac6f51196bc0aa2d940aa64b5a789060c (diff) | |
| download | vyos-cloud-init-2d667f57536a532d84872404e19e777820692665.tar.gz vyos-cloud-init-2d667f57536a532d84872404e19e777820692665.zip | |
* ec2-fetch-credentials.py:
- Allow user to choose which user they wish to configure for.
- Allow user to disable root user if they wish to.
* ec2-set-defaults.py:
- Set default timezone to UTC.
- Set locale depending on zone.
* debian/init:
- Removed nash plugin.
- Add ec2-set-defaults.
Diffstat (limited to 'debian/init')
| -rw-r--r-- | debian/init | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/debian/init b/debian/init index 59fe686b..ea4f0acf 100644 --- a/debian/init +++ b/debian/init @@ -22,6 +22,14 @@ fi case "$1" in start) + log_daemon_msg "Setting EC2 defaults" + if ec2-set-defaults 2> /dev/null + then + log_end_msg 0 + else + log_end_msg 1 + fi + log_daemon_msg "Fetching EC2 login credentials" if ec2-fetch-credentials 2> /dev/null then @@ -31,23 +39,13 @@ case "$1" in fi log_daemon_msg "Running EC2 user data" - if ec2-run-user-data 2>&1 | tee /var/log/ec2-user-data.log + if ec2-run-user-data 2>&1 | logger -t "user-data" then log_end_msg 0 else log_end_msg 1 fi - if pgrep nash-hotplug > /dev/null - then - log_daemon_msg "Killing nash-hotplug" - if pkill nash-hotplug; - then - log_end_msg 0 - else - log_end_msg 1 - fi - fi log_daemon_msg "Setting hostname to EC2 public_hostname" if ec2-set-hostname 2> /dev/null then |