Merge lp:~vorlon/eucalyptus/ubuntu.tweak into lp:~ubuntu-core-dev/eucalyptus/ubuntu

[Steve Langasek]

[Dustin Kirkland  (kirkland)]

I have merged this into lp:~ubuntu-core-dev/eucalyptus/ubuntu

--
:-Dustin

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-26 02:28:26 +0000
+++ debian/changelog	2009-09-26 03:30:26 +0000
@@ -1,8 +1,17 @@
 eucalyptus (1.6~bzr854-0ubuntu7) UNRELEASED; urgency=low
 
+  [ Dustin Kirkland ]
   * tools/eucalyptus-nc.in: exit 0, rather than 1, in the -nc
     init script when unconfigured, related to bug LP: #430075
 
+  [ Steve Langasek ]
+  * Move eucalyptus-nc "no VT" handling for bug #426830 to a debconf script
+    instead, so that users are a bit more likely to see this.
+  * Drop the dpkg-statoverride check on /var/lib/eucalyptus/keys in the
+    eucalyptus-common postinst; this was ineffective anyway because we'd done
+    a chown -R immediately before that, so the only part that was respecting
+    statoverride were the directory perms.
+
  -- Dustin Kirkland <[e-mail]>  Fri, 25 Sep 2009 19:26:02 -0700
 
 eucalyptus (1.6~bzr854-0ubuntu6) karmic; urgency=low

=== modified file 'debian/eucalyptus-common.postinst'
--- debian/eucalyptus-common.postinst	2009-09-25 21:12:38 +0000
+++ debian/eucalyptus-common.postinst	2009-09-26 03:30:26 +0000
@@ -44,10 +44,7 @@
 	fi
 
 	chown -R eucalyptus:eucalyptus /var/lib/eucalyptus/ /var/log/eucalyptus
-	if ! dpkg-statoverride --list /var/lib/eucalyptus/keys >/dev/null 2>&1; then
-		chown eucalyptus:eucalyptus /var/lib/eucalyptus/keys
-		chmod 700 /var/lib/eucalyptus/keys
-	fi
+	chmod 700 /var/lib/eucalyptus/keys
 fi
 
 #DEBHELPER#

=== renamed file 'debian/eucalyptus-nc.preinst' => 'debian/eucalyptus-nc.config'
--- debian/eucalyptus-nc.preinst	2009-09-25 18:46:51 +0000
+++ debian/eucalyptus-nc.config	2009-09-26 03:30:26 +0000
@@ -5,6 +5,8 @@
 # Warn users that installing eucalyptus-nc on a system without VT
 # may be undesirable.
 
-egrep "flags.*:.*(svm|vmx)" /proc/cpuinfo >/dev/null 2>&1 || echo "WARNING: This system's CPU does not seem to support virtualization acceleration, which is strongly recommended for Eucalyptus Nodes."
-
-#DEBHELPER#
+if ! egrep -q "flags.*:.*(svm|vmx)" /proc/cpuinfo 2>&1
+then
+	db_input high eucalyptus-nc/no_vmx || true
+	db_go
+fi

=== added file 'debian/eucalyptus-nc.templates'
--- debian/eucalyptus-nc.templates	1970-01-01 00:00:00 +0000
+++ debian/eucalyptus-nc.templates	2009-09-26 03:30:26 +0000
@@ -0,0 +1,6 @@
+Template: eucalyptus-nc/no_vmx
+Type: error
+_Description: This hardware does not support virtualization acceleration
+ This system's CPU does not have support for virtualization acceleration,
+ which is strongly recommended for Eucalyptus Nodes.  Eucalyptus running on
+ this hardware will be unaccelerated.