From 4560c210de7352f480b37ab77d1467de229b75b3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 30 Nov 2013 23:50:45 +0100
Subject: [PATCH] Merge a few steps

---
 input/howto/new-machine.creole | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index bb05c5b..cd5bbe8 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -3,25 +3,12 @@
 Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup]].  If stuff breaks fix it.
 
 
-* install ssh if it isn't there already
+* some initial stuff:
 {{{
-    apt-get install --no-install-recommends ssh
-}}}
-
-* sane editor
-{{{
-    apt-get install --no-install-recommends vim
-}}}
-
-* sane locales: (make sure there is _no_ locale defined in /etc/environment and /etc/default/locale)
-{{{
-   echo -n > /etc/environment
-   echo -n > /etc/default/locale
-}}}
-
-* make debconf the same on every host: - dialog, - high
-{{{
-    apt-get install --no-install-recommends dialog &&
+    apt-get install --no-install-recommends ssh vim &&
+    echo -n > /etc/environment &&
+    echo -n > /etc/default/locale &&
+    apt-get install --no-install-recommends dialog && &&
     echo "debconf debconf/priority        select high" | debconf-set-selections &&
     echo "debconf debconf/frontend        select Dialog" | debconf-set-selections
 }}}
-- 
2.20.1