From 2dfaecd33c44a355290696c1baf1cc7af05b50dc Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@canonical.com>
Date: Wed, 26 Aug 2009 01:19:41 +0200
Subject: Use /var/run/ec2 for mounting EBS volumes.

---
 ec2-init                               | 4 ++--
 ec2-init-appliance-ebs-volume-mount.sh | 2 +-
 tests.py                               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ec2-init b/ec2-init
index 47cf85cf..abe2cc26 100755
--- a/ec2-init
+++ b/ec2-init
@@ -16,8 +16,8 @@ NAME=ec2-init
 
 . /lib/lsb/init-functions
 
-if [ ! -d /var/ec2 ]; then
-    mkdir /var/ec2
+if [ ! -d /var/run/ec2 ]; then
+    mkdir /var/run/ec2
 fi
 
 run_once() {
diff --git a/ec2-init-appliance-ebs-volume-mount.sh b/ec2-init-appliance-ebs-volume-mount.sh
index 7106b353..de3c63ca 100755
--- a/ec2-init-appliance-ebs-volume-mount.sh
+++ b/ec2-init-appliance-ebs-volume-mount.sh
@@ -29,7 +29,7 @@ then
     $do mkfs.ext3 "${ebs_volume_device}"
 fi
 
-tmpdir="$(mktemp -d $mktemp_args --tmpdir=/var/run/ec2-init)"
+tmpdir="$(mktemp -d $mktemp_args --tmpdir=/var/run/ec2)"
 $do mount ${ebs_volume_device} ${tmpdir}
 
 for dir in "$@"
diff --git a/tests.py b/tests.py
index 84103745..eb7401f3 100644
--- a/tests.py
+++ b/tests.py
@@ -47,7 +47,7 @@ class RunUserDataApplianceConfigEBS(RunUserDataApplianceTestCase):
         output = self.real_mount_ebs_volume('/dev/sdh', ['/foo', '/bar'])
         lines = output.strip().split('\n')
         self.assertEqual(len(lines), 11)
-        match = re.match('mount /dev/sdh (/var/run/ec2-init/tmp.[a-zA-Z0-9]+)', lines[0])
+        match = re.match('mount /dev/sdh (/var/run/ec2/tmp.[a-zA-Z0-9]+)', lines[0])
         self.assertNotEqual(match, None)
         tmpdir = match.group(1)
         for (i, s) in zip(range(10), ['mkdir %s/_foo', 'cp -a /foo %s/_foo', 'chown --reference /foo %s/_foo', 'chmod --reference /foo %s/_foo', 'mount --bind %s/_foo /foo', 'mkdir %s/_bar', 'cp -a /bar %s/_bar', 'chown --reference /bar %s/_bar', 'chmod --reference /bar %s/_bar', 'mount --bind %s/_bar /bar']):
-- 
cgit v1.2.3