Use service foo rather than calling init scripts directly

[mirror/dsa-wiki.git] / input / howto / new-machine.creole

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index e66b0f0..054ef19 100644 (file)
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -48,7 +48,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
               s/^group:\[[:space:]]\+compat$/group:          db compat/;
               s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
         /etc/nsswitch.conf
-    (cd / && env -i /etc/init.d/ssh restart)
+    (service ssh restart)
 }}}
 
 * on the host, run ud-replicate
@@ -64,7 +64,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * install debian.org which brings you shells and much other fun
 {{{
-    apt-get install debian.org debian.org-recommended
+    apt-get install -y debian.org debian.org-recommended
 }}}
 
 * On handel, make sure the certs exist for the new host
@@ -74,7 +74,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run puppet a couple times
 {{{
-    puppetd -t; puppetd -t; puppetd -t; puppetd -t
+    puppet agent -t; puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
 * try to login using your user and ssh key.  you should get a homedir.