[pkg-eucalyptus-commits] r267 - eucalyptus/trunk/debian

[Brian Thomason]

Author: iamfuzz-guest
Date: 2012-08-20 15:52:34 +0000 (Mon, 20 Aug 2012)
New Revision: 267

Modified:
   eucalyptus/trunk/debian/changelog
   eucalyptus/trunk/debian/eucalyptus-common.postinst
   eucalyptus/trunk/debian/eucalyptus-common.postrm
   eucalyptus/trunk/debian/eucalyptus-java-common.postinst
   eucalyptus/trunk/debian/eucalyptus-nc.postinst
Log:
Committing changes for -6 release


Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog	2012-08-06 21:22:57 UTC (rev 266)
+++ eucalyptus/trunk/debian/changelog	2012-08-20 15:52:34 UTC (rev 267)
@@ -1,3 +1,13 @@
+eucalyptus (3.1.0-6) unstable; urgency=low
+
+  * Removed antiquated call to add to libvirtd group
+  * Updating config file pre-build rather than improperly modifying it
+    via maintainer scripts.
+  * Cleaned out a little more old cruft (irrelevant upgrade code/file removals)
+    from maintainer scripts
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 14 Aug 2012 15:42:29 +0000
+
 eucalyptus (3.1.0-5) unstable; urgency=low
 
   * Changed python packages back to arch All

Modified: eucalyptus/trunk/debian/eucalyptus-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postinst	2012-08-06 21:22:57 UTC (rev 266)
+++ eucalyptus/trunk/debian/eucalyptus-common.postinst	2012-08-20 15:52:34 UTC (rev 267)
@@ -5,15 +5,8 @@
 	adduser --system --shell /bin/bash --home /var/lib/eucalyptus --group eucalyptus || true
 fi
 
-if [ "$1" = "configure" ]
-then
-    	if [ -z "$2" ]; then
-        # first install
-        euca_conf -d / --user eucalyptus --bridge br0 --hypervisor kvm --instances /var/lib/eucalyptus/instances --dhcpd /usr/sbin/dhcpd3 --dhcp_user dhcpd || true
-	fi
-fi
-
 chsh -s /bin/bash eucalyptus || true
+
 dpkg-statoverride --force --update --add eucalyptus eucalyptus 755 /etc/eucalyptus || true
 dpkg-statoverride --force --update --add eucalyptus eucalyptus 644 /etc/eucalyptus/eucalyptus.conf || true
 

Modified: eucalyptus/trunk/debian/eucalyptus-common.postrm
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.postrm	2012-08-06 21:22:57 UTC (rev 266)
+++ eucalyptus/trunk/debian/eucalyptus-common.postrm	2012-08-20 15:52:34 UTC (rev 267)
@@ -1,11 +1,5 @@
 #!/bin/sh -e
 
-# old packages depend on this file existance to determine upgrade
-rm -f /tmp/eucaback.dir
-
-# in case it's not removed by init scripts
-rm -f /etc/eucalyptus/.upgrade
-
 case "$1" in
 purge)
 	rm -rf /etc/eucalyptus /var/lib/eucalyptus /var/log/eucalyptus /var/run/eucalyptus

Modified: eucalyptus/trunk/debian/eucalyptus-java-common.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.postinst	2012-08-06 21:22:57 UTC (rev 266)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.postinst	2012-08-20 15:52:34 UTC (rev 267)
@@ -2,7 +2,6 @@
 
 if [ "$1" = "configure" ]; then
   update-rc.d eucalyptus-cloud start 20 2 3 4 5 . stop 20 0 1 6 . >/dev/null || true
-  sed -i 's/CLOUD_OPTS=""/CLOUD_OPTS="--java-home=\/usr\/lib\/jvm\/default-java"/g' /etc/eucalyptus/eucalyptus.conf
 
   if which invoke-rc.d >/dev/null 2>&1; then
     invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true

Modified: eucalyptus/trunk/debian/eucalyptus-nc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.postinst	2012-08-06 21:22:57 UTC (rev 266)
+++ eucalyptus/trunk/debian/eucalyptus-nc.postinst	2012-08-20 15:52:34 UTC (rev 267)
@@ -2,7 +2,6 @@
 
 if [ "$1" = "configure" ]
 then
-    adduser eucalyptus libvirtd 2>&1 > /dev/null || true
     adduser eucalyptus libvirt 2>&1 > /dev/null || true
 
     EUCA_HOME=`getent passwd eucalyptus | cut -f6 -d:`