aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-09-21 18:50:47 -0700
committerelijah <elijah@riseup.net>2013-09-21 18:50:47 -0700
commit5e021210f883ffa72dbadee75bd02a7f7319ca17 (patch)
tree7a0534e106de827a89ee4e5e57b5b89042d7e5ef /lib
parent16cec251edc8fa3761efa588bedd2730cf1153b3 (diff)
downloadleap_cli-5e021210f883ffa72dbadee75bd02a7f7319ca17.tar.gz
leap_cli-5e021210f883ffa72dbadee75bd02a7f7319ca17.tar.bz2
fix for: locale-gen should be run after package "locales" is installed (Bug #3741)
Diffstat (limited to 'lib')
-rw-r--r--lib/leap_cli/remote/leap_plugin.rb2
-rw-r--r--lib/leap_cli/remote/tasks.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/leap_cli/remote/leap_plugin.rb b/lib/leap_cli/remote/leap_plugin.rb
index f5bf490..04b1e2c 100644
--- a/lib/leap_cli/remote/leap_plugin.rb
+++ b/lib/leap_cli/remote/leap_plugin.rb
@@ -6,7 +6,7 @@
module LeapCli; module Remote; module LeapPlugin
def required_packages
- "puppet ruby-hiera-puppet rsync lsb-release"
+ "puppet ruby-hiera-puppet rsync lsb-release locales"
end
def log(*args, &block)
diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb
index 0721c34..5b0418a 100644
--- a/lib/leap_cli/remote/tasks.rb
+++ b/lib/leap_cli/remote/tasks.rb
@@ -14,13 +14,13 @@ end
task :install_prerequisites, :max_hosts => MAX_HOSTS do
leap.mkdirs LeapCli::PUPPET_DESTINATION
- run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen; locale-gen"
leap.log :updating, "package list" do
run "apt-get update"
end
leap.log :installing, "required packages" do
run "DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold install #{leap.required_packages}"
end
+ run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen; locale-gen"
leap.mkdirs("/etc/leap", "/srv/leap")
leap.mark_initialized
end