From 907e523201dc10c2a8cf25b3405185bb7a9e93d8 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 14 Jun 2013 10:53:43 +0000
Subject: testing/opennebula: multiple fixes

---
 testing/opennebula/APKBUILD                        | 12 ++++++++----
 testing/opennebula/opennebula-node-kvm.pre-install |  7 ++++++-
 testing/opennebula/opennebula.pre-install          |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'testing/opennebula')

diff --git a/testing/opennebula/APKBUILD b/testing/opennebula/APKBUILD
index c0bc46954f..2c5731f24a 100644
--- a/testing/opennebula/APKBUILD
+++ b/testing/opennebula/APKBUILD
@@ -2,14 +2,15 @@
 # Maintainer:
 pkgname=opennebula
 pkgver=4.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing"
 url="http://opennebula.org"
 arch="all"
 license="Apache"
 depends="ruby-json ruby-sequel ruby-nokogiri ruby-sqlite ruby-mysql2 ruby-nokogiri
 	ruby-rack14 ruby-sinatra ruby-thin ruby-crack ruby-thin ruby-net-ldap
-	ruby-uuidtools ruby-curb ruby-amazon-ec2 ruby-io-console ruby-gems bash"
+	ruby-uuidtools ruby-curb ruby-amazon-ec2 ruby-io-console ruby-gems bash
+	curl wget"
 depends_dev="xmlrpc-c-dev sqlite-dev openssl-dev libxml2-dev curl-dev"
 makedepends="$depends_dev scons ruby ruby-gems bash"
 install="opennebula.pre-install"
@@ -57,13 +58,16 @@ package() {
 	install -m600 -o $pkgusers -g $pkggroups -D \
 		"$srcdir"/one_auth \
 		"$pkgdir"/var/lib/one/.one/one_auth || return 1
+	# set the default emulator
+	echo -e "\nEMULATOR = /usr/bin/qemu-system-x86_64" >> \
+		"$pkgdir"/etc/one/vmm_exec/vmm_exec_kvm.conf || return 1
 }
 
 node_kvm() {
-	pkgdesc="Node dependecies for OpenNebula"
+	pkgdesc="KVM node for OpenNebula"
 	arch="noarch"
 	install="opennebula-node-kvm.pre-install"
-	depends="ruby openssh qemu-x86_64 libvirt-qemu procps"
+	depends="ruby openssh qemu-x86_64 libvirt-qemu procps bash"
 	mkdir -p "$subpkgdir"
 }
 
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index cca1f1f333..5cf97eebc9 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -1,7 +1,12 @@
 #!/bin/sh
 
 addgroup -S oneadmin 2>/dev/null
+addgroup -S libvirt 2>/dev/null
 adduser -S -D -s /bin/ash \
-	-H -h /var/lib/one -G oneadmin \
+	-h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
+addgroup oneadmin libvirt 2>/dev/null
+addgroup oneadmin readproc 2>/dev/null
+addgroup oneadmin kvm 2>/dev/null
+passwd -u oneadmin &>/dev/null
 exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index cca1f1f333..e59e414429 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -4,4 +4,5 @@ addgroup -S oneadmin 2>/dev/null
 adduser -S -D -s /bin/ash \
 	-H -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
+passwd -u oneadmin &>/dev/null
 exit 0
-- 
cgit v1.2.3