X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=blobdiff_plain;f=input%2Fhowto%2Fnew-machine.creole;h=36edc83031a2e869694226effe6e9c11a4bc0808;hp=675c708f9d46aa363e80ca8bd98e340cd37074b4;hb=e7870f7172b032decf2c007ef571b5f321f221d9;hpb=17282aa05cfcba40f25c8de5e565a28dacf10a5f

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 675c708..36edc83 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -22,7 +22,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run generate, or wait until cron runs it for you.  Update DNS.
 {{{
-    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent --no-daemonize --onetime
+    : :: draghi :: && sudo -u sshdist ud-generate && sudo -H ud-replicate && sudo -H puppet agent -t
     : :: denis :: && sudo -H ud-replicate
 }}}
 
@@ -43,7 +43,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * run puppet a couple times
 {{{
-    puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime; puppet agent --no-daemonize --onetime
+    puppet agent -t; puppet agent -t; puppet agent -t
 }}}
 
 * install security updates etc.
@@ -68,7 +68,7 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 * install samhain and get puppet to configure it
 {{{
   apt-get install -y samhain &&
-  ( puppet agent --no-daemonize --onetime || true ) &&
+  ( puppet agent -t || true ) &&
   service samhain stop &&
   rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
   samhain --foreground -t init -p none -s none -l none -m none &&