From: Iustin Pop <iustin@google.com>
Date: Sat, 21 Apr 2012 09:57:04 +0000 (+0200)
Subject: Whitespace/style cleanups
X-Git-Tag: v0.10~2
X-Git-Url: http://git.equinoxoli.org/?p=ext%2Finstance-debootstrap.git;a=commitdiff_plain;h=764c9af51dc87cd9a2bb89c698684ad7cd7357c1

Whitespace/style cleanups

The recent hooks additions are not style compliant (gasp!). Fix this.

We might also want to fix missing copyright headers, but not sure
about that.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---

diff --git a/examples/hooks/defaultpasswords b/examples/hooks/defaultpasswords
index c4313cc..71f94fe 100755
--- a/examples/hooks/defaultpasswords
+++ b/examples/hooks/defaultpasswords
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# This is an example script that sets the root pasword to a given default
+# This is an example script that sets the root pasword to a given
+# default.
 
-# depending on your version of passwd, chpasswd can use the -e flag to handle en encrypted password. you probably want to use that.
+# Note: depending on your version of passwd, chpasswd can use the -e
+# flag to handle en encrypted password. you probably want to use that.
 
 cat $(dirname $0)/confdata/defaultpasswords | chroot $TARGET chpasswd
-
-
diff --git a/examples/hooks/hosts b/examples/hooks/hosts
index 4daf620..9306c30 100755
--- a/examples/hooks/hosts
+++ b/examples/hooks/hosts
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This is an example script that sets the hostname and hosts file
+# This is an example script that sets the hostname and hosts file.
 
 VMFQDN=$INSTANCE_NAME
 VMHOSTNAME=${VMFQDN%%.*}
@@ -8,4 +8,3 @@ VMHOSTNAME=${VMFQDN%%.*}
 [ x$VMFQDN -eq x$VMHOSTNAME ] && VMFQDN=""
 
 echo "127.0.1.1		$VMFQDN $VMHOSTNAME" >> $TARGET/etc/host
-
diff --git a/examples/hooks/timezone b/examples/hooks/timezone
index 2214c7c..23f38c4 100755
--- a/examples/hooks/timezone
+++ b/examples/hooks/timezone
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# This is an example script that sets the timezone to a given default, or to the one of the host is none is configured
+# This is an example script that sets the timezone to a given default,
+# or to the one of the host is none is configured.
 
-if [ -r confdata/timezone ]
-then	cp confdata/timezone $TARGET/etc/
-else	cp /etc/timezone $TARGET/etc/
+if [ -r confdata/timezone ]; then
+  cp confdata/timezone $TARGET/etc/
+else
+  cp /etc/timezone $TARGET/etc/
 fi
 
 chroot $TARGET dpkg-reconfigure --frontend noninteractive tzdata
-