Eucalyptus

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

  1. k-keep-network-state-on-restart
  2. Merge into ubuntu-karmic
Proposed by Mathias Gug
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~mathiaz/eucalyptus/k-keep-network-state-on-restart
Merge into: lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic
Diff against target: 24 lines
2 files modified
debian/changelog (+2/-0)
debian/eucalyptus-cc.upstart (+1/-2)
To merge this branch: bzr merge lp://qastaging/~mathiaz/eucalyptus/k-keep-network-state-on-restart
Reviewer Review Type Date Requested Status
Dustin Kirkland  Needs Fixing
Review via email: mp+14331@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

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://qastaging/~mathiaz/eucalyptus/k-keep-network-state-on-restart updated
719. By Mathias Gug

Merge karmic branch.

720. By Mathias Gug

Test whether CLEAN is actually set to 1.

721. By Mathias Gug

Merge karmic branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-03 16:05:34 +0000
3+++ debian/changelog 2009-11-03 17:55:21 +0000
4@@ -19,6 +19,8 @@
5 instead of publishing the CC IP address via the service name (LP: #458904).
6 * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file
7 that doesn't publish IP addresses by default. (LP: #458904).
8+ * debian/eucalyptus-cc.upstart: Don't clean the CC network state when the CC is
9+ stopped by default (LP: #460089).
10
11 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
12
13
14=== modified file 'debian/eucalyptus-cc.upstart'
15--- debian/eucalyptus-cc.upstart 2009-10-14 00:43:55 +0000
16+++ debian/eucalyptus-cc.upstart 2009-11-03 17:55:21 +0000
17@@ -86,6 +86,5 @@
18 done
19 fi
20 done
21-
22- rm -f /var/lib/eucalyptus/CC/*
23+ [ "${CLEAN}" = 1 ] && rm -f /var/lib/eucalyptus/CC/*
24 end script

Subscribers

People subscribed via source and target branches

to all changes: