Merge branch 'jcd/use-jon918-sudoers'

chef · Nov 25, 2013 · 5a310b8 · 5a310b8
2 parents 1a6503f + 9ce23fb
commit 5a310b8
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/packer/ubuntu-12.04-amd64.json b/packer/ubuntu-12.04-amd64.json
@@ -108,7 +108,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-12.04-i386.json b/packer/ubuntu-12.04-i386.json
@@ -108,7 +108,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-12.10-amd64.json b/packer/ubuntu-12.10-amd64.json
@@ -108,7 +108,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-12.10-i386.json b/packer/ubuntu-12.10-i386.json
@@ -108,7 +108,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-13.04-amd64.json b/packer/ubuntu-13.04-amd64.json
@@ -109,7 +109,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-13.04-i386.json b/packer/ubuntu-13.04-i386.json
@@ -113,7 +113,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/common/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-13.10-amd64.json b/packer/ubuntu-13.10-amd64.json
@@ -109,7 +109,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/debian/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",

diff --git a/packer/ubuntu-13.10-i386.json b/packer/ubuntu-13.10-i386.json
@@ -113,7 +113,7 @@
         "scripts/ubuntu/update.sh",
         "scripts/common/sshd.sh",
         "scripts/ubuntu/networking.sh",
-        "scripts/debian/sudoers.sh",
+        "scripts/ubuntu/sudoers.sh",
         "scripts/common/vagrant.sh",
         "scripts/common/vmtools.sh",
         "scripts/common/chef.sh",