Merge lp:~mathiaz/eucalyptus/k-keep-network-state-on-restart into lp:~ubuntu-core-dev/eucalyptus/ubuntu-karmic

[Mathias Gug]

[Dustin Kirkland  (kirkland)]

Hmm, I think this would be a little better:

+ [ "$CLEAN" = "1" ] && rm -f /var/lib/eucalyptus/CC/*

As someone might conceivably use CLEAN=0.

I don't feel too strongly. This is more of a suggestion. Feel free to ignore.

review: Needs Fixing

[lp:~mathiaz/eucalyptus/k-keep-network-state-on-restart]

719. By Mathias Gug on 2009-11-03

Merge karmic branch.

720. By Mathias Gug on 2009-11-03

Test whether CLEAN is actually set to 1.

721. By Mathias Gug on 2009-11-03

Merge karmic branch.

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-03 16:05:34 +0000
+++ debian/changelog	2009-11-03 17:55:21 +0000
@@ -19,6 +19,8 @@
     instead of publishing the CC IP address via the service name (LP: #458904).
   * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file
     that doesn't publish IP addresses by default. (LP: #458904).
+  * debian/eucalyptus-cc.upstart: Don't clean the CC network state when the CC is
+    stopped by default (LP: #460089).
 
  -- Thierry Carrez <[e-mail]>  Tue, 20 Oct 2009 12:26:19 +0200
 
 
=== modified file 'debian/eucalyptus-cc.upstart'
--- debian/eucalyptus-cc.upstart	2009-10-14 00:43:55 +0000
+++ debian/eucalyptus-cc.upstart	2009-11-03 17:55:21 +0000
@@ -86,6 +86,5 @@
 			done
 		fi
 	done
-
-	rm -f /var/lib/eucalyptus/CC/*
+	[ "${CLEAN}" = 1 ] && rm -f /var/lib/eucalyptus/CC/*
 end script