From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 27 Jun 2009 17:36:32 +0000 (+0200)
Subject: compress a bit
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=09502aa5625634c0efc71767b320d369e1ad90f8;p=mirror%2Fdsa-wiki.git

compress a bit
---

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index 33d36e8..499b168 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -13,10 +13,7 @@ Note: this is partially obsolete now that we have [[puppet|howto/puppet-setup]].
     echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/local-recommends
 }}}
 
-* sane locales:
-
- make sure there is _no_ locale defined in /etc/environment and /etc/default/locale
-
+* 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
@@ -97,19 +94,14 @@ EOF
     : :: draghi :: && sudo -u sshdist ud-generate
 }}}
 
-* fix nsswitch for ud fu.
+* fix nsswitch for ud fu.  (you might have to restart sshd here)
 {{{
     sed -i -e 's/^passwd:\[[:space:]]\+compat$/passwd:         compat db/;
               s/^group:\[[:space:]]\+compat$/group:          db compat/;
               s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
         /etc/nsswitch.conf
-}}}
-
-(you might have to restart sshd here:
-{{{
     (cd / && env -i /etc/init.d/ssh restart)
 }}}
-)
 
 * on the host, run ud-replicate
 {{{