small fixes

11 files changed, 38 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b9345a00763..1e3a107b93f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opennebula
 	pkgdesc = Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)
 	pkgver = 5.6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://docs.opennebula.org/stable
 	install = opennebula.install
 	changelog = ChangeLog
@@ -99,19 +99,19 @@ pkgbase = opennebula
 	source = fix_kvm_emulator.patch
 	source = opennebula.install
 	md5sums = 3ef5bcdefad9f37ae444e8f5b86ddd06
-	md5sums = 6d4b3b7c89371c2bd086525a6b5a0027
-	md5sums = b576f9dd30d62dc4b3090878561ed3e6
-	md5sums = c56b5f98dc9df8677761de70e0e6a1be
-	md5sums = e0d276ff2a885679ac6a227e2e592509
-	md5sums = bdccd7529afc2d87bcc3361c72259db2
-	md5sums = cb945dde4dbabde055d63bb59bff4cd4
+	md5sums = 69c4374554ae689c44b0ef8c0a31b911
+	md5sums = 74bc0a908441063a44cb134449564db1
+	md5sums = f207636bd04a621f20b14a37c6ad49b7
+	md5sums = 91d608d9576dc800a12597135ad0203d
+	md5sums = 773c9f257b8a367ad4b4ca7694294460
+	md5sums = 63b217d32a279adbb50b68106cc83578
 	md5sums = 3c38e24ef93de0982737f3dabbb9d251
-	md5sums = 8cbcd7b189f191554e5722a087a4fa22
+	md5sums = 05f58094a1d132f2164599e068158cd7
 	md5sums = 2f1c73538c52324c224684072ea7877b
 	md5sums = cd272404aba91a27cf89ce22364e51b4
 	md5sums = bab6415dd2437c6dfdadad90efedeff3
 	md5sums = 680931b4555ea25a17ea8c20b382d175
-	md5sums = ef157cdab2befdd7a38985297d2c5a23
+	md5sums = 073b8bce1b12201658b9745ba7ad2e66
 
 pkgname = opennebula
 
diff --git a/ChangeLog b/ChangeLog
index f2a72d2a4736..a57aaf7e296f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-10 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
+
+  * 5.6.2-2:
+  fix for sunstone not being able to read main.js
+  change pid file location from legacy /var/run/one to /run/one
+
 2018-10-21 Sledge Sulaweyo <sledge.sulaweyo#gmail.com>
 
   * 5.6.2-1:
diff --git a/PKGBUILD b/PKGBUILD
index dbf73a88410b..1d297dc33318 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=opennebula
 _unstable_pkg=opennebula-unstable
 pkgver=5.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual management infrastructure as a service (IaaS) toolkit for cloud computing (NOTE: Read the PKGBUILD!)"
 arch=('i686' 'x86_64')
 url='http://docs.opennebula.org/stable'
@@ -105,21 +105,20 @@ source=("https://github.com/OpenNebula/one/archive/release-${pkgver}.tar.gz"
         'set_locations.patch'
         'fix_kvm_emulator.patch'
         'opennebula.install')
-md5sums=('3ef5bcdefad9f37ae444e8f5b86ddd06' #package
-            '6d4b3b7c89371c2bd086525a6b5a0027' #opennebula.service
-            'b576f9dd30d62dc4b3090878561ed3e6' #opennebula-scheduler.service
-            'c56b5f98dc9df8677761de70e0e6a1be' #opennebula-sunstone.service
-            'e0d276ff2a885679ac6a227e2e592509' #opennebula-econe.service
-            'bdccd7529afc2d87bcc3361c72259db2' #opennebula-oneflow.service
-            'cb945dde4dbabde055d63bb59bff4cd4' #opennebula-onegate.service
-            '3c38e24ef93de0982737f3dabbb9d251' #opennebula-novnc.service
-            '8cbcd7b189f191554e5722a087a4fa22' #opennebula.conf
-            '2f1c73538c52324c224684072ea7877b' #opennebula.logrotate
-            'cd272404aba91a27cf89ce22364e51b4' #chown_fix.patch
-            'bab6415dd2437c6dfdadad90efedeff3' #set_locations.patch
-            '680931b4555ea25a17ea8c20b382d175' #fix_kvm_emulator.patch
-            'ef157cdab2befdd7a38985297d2c5a23' #opennebula.install
-            )
+md5sums=('3ef5bcdefad9f37ae444e8f5b86ddd06'
+         '69c4374554ae689c44b0ef8c0a31b911'
+         '74bc0a908441063a44cb134449564db1'
+         'f207636bd04a621f20b14a37c6ad49b7'
+         '91d608d9576dc800a12597135ad0203d'
+         '773c9f257b8a367ad4b4ca7694294460'
+         '63b217d32a279adbb50b68106cc83578'
+         '3c38e24ef93de0982737f3dabbb9d251'
+         '05f58094a1d132f2164599e068158cd7'
+         '2f1c73538c52324c224684072ea7877b'
+         'cd272404aba91a27cf89ce22364e51b4'
+         'bab6415dd2437c6dfdadad90efedeff3'
+         '680931b4555ea25a17ea8c20b382d175'
+         '073b8bce1b12201658b9745ba7ad2e66')
 
 prepare() {
   cd "one-release-${pkgver}"
diff --git a/opennebula-econe.service b/opennebula-econe.service
index 2c588fbda07c..33cf3236e773 100644
--- a/opennebula-econe.service
+++ b/opennebula-econe.service
@@ -9,7 +9,7 @@ Group=cloud
 Type=simple
 
 ExecStart=/usr/bin/ruby /usr/lib/one/ruby/cloud/econe/econe-server.rb
-PIDFile=/var/run/one/econe-server.pid
+PIDFile=/run/one/econe-server.pid
 Restart=always
 
 [Install]
diff --git a/opennebula-oneflow.service b/opennebula-oneflow.service
index fec0fd92ee53..652df0ba7951 100644
--- a/opennebula-oneflow.service
+++ b/opennebula-oneflow.service
@@ -11,7 +11,7 @@ Type=simple
 ExecStartPre=-/usr/bin/bash -c 'for i in {1..20}; do test -f /var/lib/one/.one/oneflow_auth && break; sleep 1; done'
 ExecStart=/usr/bin/oneflow-server start
 ExecStop=/usr/bin/oneflow-server stop
-PIDFile=/var/run/one/oneflow.pid
+PIDFile=/run/one/oneflow.pid
 Restart=always
 
 [Install]
diff --git a/opennebula-onegate.service b/opennebula-onegate.service
index 0fa0a421ae96..d61c5d22da0f 100644
--- a/opennebula-onegate.service
+++ b/opennebula-onegate.service
@@ -9,7 +9,7 @@ Group=cloud
 Type=simple
 
 ExecStart=/usr/bin/ruby /usr/lib/one/onegate/onegate-server.rb
-PIDFile=/var/run/one/onegate.pid
+PIDFile=/run/one/onegate.pid
 Restart=always
 
 [Install]
diff --git a/opennebula-scheduler.service b/opennebula-scheduler.service
index 8d3bb2150fa3..f82fa99d1db8 100644
--- a/opennebula-scheduler.service
+++ b/opennebula-scheduler.service
@@ -10,7 +10,7 @@ Type=simple
 
 ExecStart=/usr/bin/mm_sched
 ExecStop=/bin/kill -TERM $MAINPID
-PIDFile=/var/run/one/sched.pid
+PIDFile=/run/one/sched.pid
 Restart=always
 
 [Install]
diff --git a/opennebula-sunstone.service b/opennebula-sunstone.service
index 36b57321fc56..2866174c52db 100644
--- a/opennebula-sunstone.service
+++ b/opennebula-sunstone.service
@@ -12,7 +12,7 @@ Type=simple
 PermissionsStartOnly=true
 
 ExecStart=/usr/bin/ruby /usr/lib/one/sunstone/sunstone-server.rb
-PIDFile=/var/run/one/sunstone.pid
+PIDFile=/run/one/sunstone.pid
 Restart=always
 
 [Install]
diff --git a/opennebula.conf b/opennebula.conf
index 7d1e64c7e476..0b853baba5f6 100644
--- a/opennebula.conf
+++ b/opennebula.conf
@@ -1,2 +1,2 @@
 d /var/lock/one 0755 oneadmin cloud -
-d /var/run/one 0755 oneadmin cloud -
+d /run/one 0755 oneadmin cloud -
diff --git a/opennebula.install b/opennebula.install
index 8ec80bd34905..a50c79e2d806 100644
--- a/opennebula.install
+++ b/opennebula.install
@@ -18,6 +18,7 @@ post_install() {
 }
 
 post_upgrade(){
+  chown oneadmin:cloud -R /var/lib/one/sunstone
 	printf "NOTE: This is may be an major upgrade! If you are not installing from scratch, check the compatibility guide at:\n\n\thttp://docs.opennebula.org/5.6/intro_release_notes/release_notes/compatibility.html\n\thttp://docs.opennebula.org/5.6/intro_release_notes/upgrades/index.html\n"
 }
 
diff --git a/opennebula.service b/opennebula.service
index 8587d3f66120..f0dc9f0bad3b 100644
--- a/opennebula.service
+++ b/opennebula.service
@@ -22,7 +22,7 @@ ExecStartPre=-/usr/bin/logrotate -s /tmp/logrotate.state -f /etc/logrotate.d/ope
 ExecStop=/bin/kill -TERM $MAINPID
 ExecStopPost=/usr/bin/rm -f /var/lock/one/one
 ExecStopPost=/usr/share/one/follower_cleanup
-PIDFile=/var/run/one/oned.pid
+PIDFile=/run/one/oned.pid
 Restart=always
 
 [Install]