summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-11-05 13:32:52 +0100
committervarac <varacanero@zeromail.org>2015-11-05 13:32:52 +0100
commit88a66ba981ef6467267531132836b03871858ca2 (patch)
treef77190dd05bbbed83d9f542fdcfd7a4aa0c956c4
parenta094ea23a71ce977e57b30785d70415aa1f4eef9 (diff)
Revert "for now, only support wheezy"
This reverts commit 80fb8674db6878a2deca1cdd0f6806a4a8310bff. It's needed for jessie hosts.
-rw-r--r--lib/leap_cli/remote/tasks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb
index 048238d..49b1cfd 100644
--- a/lib/leap_cli/remote/tasks.rb
+++ b/lib/leap_cli/remote/tasks.rb
@@ -57,7 +57,7 @@ task :install_prerequisites, :max_hosts => MAX_HOSTS do
run "( test -f /etc/init.d/ntp && /etc/init.d/ntp start ) || true"
end
leap.log :installing, "required packages" do
- run %[#{apt_get} install #{leap.required_wheezy_packages}]
+ run %[#{apt_get} install $( (grep -q wheezy /etc/debian_version && echo #{leap.required_wheezy_packages}) || echo #{leap.required_packages} )]
end
#run "locale-gen"
leap.mkdirs("/etc/leap", "/srv/leap")