Merge pull request #453 from ergonlogic/debian7

Move sudoers entry to sudoers.d.
jedi4ever · Dec 19, 2012 · 664d170 · 664d170
2 parents 977f494 + 1d7364c
commit 664d170
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/templates/Debian-7.0-b4-amd64-netboot/base.sh b/templates/Debian-7.0-b4-amd64-netboot/base.sh
@@ -6,8 +6,7 @@ apt-get -y install curl unzip
 apt-get clean
 
 # Set up sudo
-cp /etc/sudoers /etc/sudoers.orig
+echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
-sed -i -e 's/%sudo[ \t]*ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
 
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config

diff --git a/templates/Debian-7.0-b4-i386-netboot/base.sh b/templates/Debian-7.0-b4-i386-netboot/base.sh
@@ -6,8 +6,7 @@ apt-get -y install curl unzip
 apt-get clean
 
 # Set up sudo
-cp /etc/sudoers /etc/sudoers.orig
+echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
-sed -i -e 's/%sudo\s+ALL=(ALL:ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
 
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config