fix for: locale-gen should be run after package "locales" is installed (Bug #3741)

diff --git a/lib/leap_cli/remote/leap_plugin.rb b/lib/leap_cli/remote/leap_plugin.rb
index f5bf4900bcb8178ad76d2b41cde15bdec68c257d..04b1e2cc905cfc2a9d404e2423b2700a9bd2ff90 100644 (file)
--- 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 0721c3482eaf7d5a96d8d0b143e54a631b801abf..5b0418aa6ee6867aec1b4baf85737dfea0c95354 100644 (file)
--- 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