From 24c980292843b7b9aebc9f1831c6c1e8ba49c148 Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Fri, 17 Aug 2007 13:01:49 +0000
Subject: [PATCH] Update atngw100 target skeleton

---
 .../Atmel/atngw100/target_skeleton/etc/hosts   |  9 +++++----
 .../atngw100/target_skeleton/etc/inetd.conf    |  1 -
 .../target_skeleton/etc/init.d/K70sendsig      |  1 +
 .../target_skeleton/etc/init.d/K80netfs        |  1 +
 .../target_skeleton/etc/init.d/K85network      |  6 +++---
 .../target_skeleton/etc/init.d/K90localfs      |  1 +
 .../target_skeleton/etc/init.d/S01hotplug      |  6 +++---
 .../target_skeleton/etc/init.d/S02hostname     | 10 +++++-----
 .../target_skeleton/etc/init.d/S08syslog       | 18 +++++++++---------
 .../target_skeleton/etc/init.d/S09klog         | 10 +++++-----
 .../target_skeleton/etc/init.d/S10modules-init |  6 +++---
 .../target_skeleton/etc/init.d/S15localfs      |  8 ++++----
 .../target_skeleton/etc/init.d/S20network      |  8 ++++----
 .../target_skeleton/etc/init.d/S22iptables     |  8 ++++----
 .../target_skeleton/etc/init.d/S40telnetd      | 10 +++++-----
 .../target_skeleton/etc/init.d/S41inetd        | 10 +++++-----
 .../target_skeleton/etc/init.d/S42httpd        | 10 +++++-----
 .../atngw100/target_skeleton/etc/init.d/S43ntp | 12 ++++++------
 .../target_skeleton/etc/init.d/S49netfs        |  8 ++++----
 .../Atmel/atngw100/target_skeleton/etc/passwd  |  2 +-
 20 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/hosts b/target/device/Atmel/atngw100/target_skeleton/etc/hosts
index 05d2eb73ac..b24a953a30 100644
--- a/target/device/Atmel/atngw100/target_skeleton/etc/hosts
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/hosts
@@ -1,11 +1,12 @@
-127.0.0.1	localhost.localdomain localhost
-127.0.1.1	ngw.example.net ngw
+127.0.0.1   localhost.localdomain localhost
+127.0.1.1   ngw.example.net ngw
 
 # The following lines are desirable for IPv6 capable hosts
-::1 ip6-localhost ip6-loopback
+::1     localhost
+::1     ip6-localhost ip6-loopback
+::1     ngw.example.net ngw
 fe00::0 ip6-localnet
 ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
-
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/inetd.conf b/target/device/Atmel/atngw100/target_skeleton/etc/inetd.conf
index 6d7f6533a2..02e1b82154 100644
--- a/target/device/Atmel/atngw100/target_skeleton/etc/inetd.conf
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/inetd.conf
@@ -1,4 +1,3 @@
-ftp		stream	tcp nowait	root.root /usr/sbin/ftpd ftpd -a
 #netbios-ssn	stream	tcp nowait	root.root /usr/sbin/smbd smbd
 #netbios-ns	dgram	udp wait	root.root /usr/sbin/nmbd nmbd
 swat		stream	tcp nowait.400	root.root /usr/sbin/swat swat
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K70sendsig b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K70sendsig
index e69de29bb2..1a2485251c 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K70sendsig
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K70sendsig
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K80netfs b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K80netfs
index e69de29bb2..1a2485251c 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K80netfs
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K80netfs
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K85network b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K85network
index 5b6d3cdc7f..d4e8e6139a 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K85network
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K85network
@@ -2,10 +2,10 @@
 
 IFDOWN=/sbin/ifdown
 
-echo -n "Stopping networking:"
+echo -n "Stopping networking: "
 if ${IFDOWN} -a; then
-	echo " done"
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K90localfs b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K90localfs
index e69de29bb2..1a2485251c 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K90localfs
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/K90localfs
@@ -0,0 +1 @@
+#!/bin/sh
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S01hotplug b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S01hotplug
index 89c49e1177..a30f06a09b 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S01hotplug
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S01hotplug
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-echo -n "Setting up mdev:"
+echo -n "Setting up mdev: "
 set -e
-trap 'echo " failed"' EXIT
+trap 'echo "failed"' EXIT
 /bin/ln -s /proc/self/fd /dev/fd
 /bin/ln -s /proc/self/fd/0 /dev/stdin
 /bin/ln -s /proc/self/fd/1 /dev/stdout
@@ -11,4 +11,4 @@ trap 'echo " failed"' EXIT
 /bin/echo /sbin/mdev > /proc/sys/kernel/hotplug
 /sbin/mdev -s
 trap - EXIT
-echo " done"
+echo "done"
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S02hostname b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S02hostname
index fcad428afa..083d41dc40 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S02hostname
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S02hostname
@@ -2,8 +2,8 @@
 
 PROGRAM=/bin/hostname
 
-echo -n "Setting hostname:"
-[ -x ${PROGRAM} ] || (echo " missing"; exit 0)
+echo -n "Setting hostname: "
+[ -x ${PROGRAM} ] || (echo "missing"; exit 0)
 
 if [ -f /etc/hostname ]; then
 	HOST="$(cat /etc/hostname)"
@@ -12,10 +12,10 @@ else
 fi
 
 start() {
-	if ${PROGRAM} "${HOST}" > /dev/null 2> /dev/null; then
-		echo " '${HOST}'"
+	if ${PROGRAM} "${HOST}"; then
+		echo "'${HOST}'"
 	else
-		echo " failed"
+		echo "failed"
 		exit 1
 	fi
 }
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S08syslog b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S08syslog
index 63951e0234..58b05925db 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S08syslog
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S08syslog
@@ -2,23 +2,23 @@
 
 SYSLOGD=/sbin/syslogd
 
-echo -n "Starting syslogd:"
+echo -n "Starting syslogd: "
 if [ ! -x "${SYSLOGD}" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 fi
 
-if ${SYSLOGD} > /dev/null 2> /dev/null; then
-	echo " done"
+if ${SYSLOGD}; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
 
-echo -n "Log messages to syslog:"
-if echo 4 4 1 7 > /proc/sys/kernel/printk 2> /dev/null; then
-	echo " done"
+echo -n "Log messages to syslog: "
+if echo 4 4 1 7 > /proc/sys/kernel/printk; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S09klog b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S09klog
index 4c6763bbd0..1b0028a084 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S09klog
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S09klog
@@ -2,15 +2,15 @@
 
 KLOGD=/sbin/klogd
 
-echo -n "Starting klogd:"
+echo -n "Starting klogd: "
 if [ ! -x "${KLOGD}" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 fi
 
-if ${KLOGD} > /dev/null 2> /dev/null; then
-	echo " done"
+if ${KLOGD}; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S10modules-init b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S10modules-init
index d1fcc26e39..e2cf4e3036 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S10modules-init
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S10modules-init
@@ -2,9 +2,9 @@
 
 MODPROBE=/sbin/modprobe
 
-echo -n "Probing modules:"
+echo -n "Probing modules: "
 if [ ! -x "${MODPROBE}" -o ! -f "/etc/modules" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 else
 	echo
@@ -13,7 +13,7 @@ fi
 grep '^[^#]' "/etc/modules" | \
 while read module args; do
 	[ "$module" ] || continue
-	if ${MODPROBE} $module $args > /dev/null 2> /dev/null; then
+	if ${MODPROBE} $module $args; then
 		echo "  $module loaded"
 	else
 		echo "  $module failed"
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S15localfs b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S15localfs
index 9672752a00..a0b5a89824 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S15localfs
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S15localfs
@@ -2,10 +2,10 @@
 
 MOUNT=/bin/mount
 
-echo -n "Mounting local filesystems:"
-if ${MOUNT} -a > /dev/null 2> /dev/null; then
-	echo " done"
+echo -n "Mounting local filesystems: "
+if ${MOUNT} -a; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S20network b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S20network
index a9787cdfde..06cf8cb000 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S20network
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S20network
@@ -2,10 +2,10 @@
 
 IFUP=/sbin/ifup
 
-echo -n "Network interfaces:"
-if ${IFUP} -a > /dev/null 2> /dev/null; then
-	echo " done"
+echo -n "Network interfaces: "
+if ${IFUP} -a; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S22iptables b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S22iptables
index dff63c2004..2ccadde6cd 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S22iptables
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S22iptables
@@ -2,7 +2,7 @@
 
 IPTABLES=`which iptables`
 
-echo "Enable NAT: "
+echo "Enable NAT:"
 echo -n "  IPv4 forwarding: "
 if echo 1 > /proc/sys/net/ipv4/ip_forward; then
 	echo "done"
@@ -17,7 +17,7 @@ if [ ! -x "${IPTABLES}" ]; then
 	exit 1
 fi
 
-if ${IPTABLES} -t nat -A POSTROUTING -o eth0 -j MASQUERADE > /dev/null 2> /dev/null; then
+if ${IPTABLES} -t nat -A POSTROUTING -o eth0 -j MASQUERADE; then
 	echo "done"
 else
 	echo "failed"
@@ -25,7 +25,7 @@ else
 fi
 
 echo -n "  iptables incoming trafic: "
-if ${IPTABLES} -A FORWARD -i eth0 -o eth1 -m state --state RELATED,ESTABLISHED -j ACCEPT > /dev/null 2> /dev/null; then
+if ${IPTABLES} -A FORWARD -i eth0 -o eth1 -m state --state RELATED,ESTABLISHED -j ACCEPT; then
 	echo "done"
 else
 	echo "failed"
@@ -33,7 +33,7 @@ else
 fi
 
 echo -n "  iptables outgoung trafic: "
-if ${IPTABLES} -A FORWARD -i eth1 -o eth0 -j ACCEPT > /dev/null 2> /dev/null; then
+if ${IPTABLES} -A FORWARD -i eth1 -o eth0 -j ACCEPT; then
 	echo "done"
 else
 	echo "failed"
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S40telnetd b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S40telnetd
index c44bbb5ae0..b253c10364 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S40telnetd
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S40telnetd
@@ -2,15 +2,15 @@
 
 TELNETD=/usr/sbin/telnetd
 
-echo -n "Starting telnetd:"
+echo -n "Starting telnetd: "
 if [ ! -x "${TELNETD}" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 fi
 
-if ${TELNETD} -l /bin/ash > /dev/null 2> /dev/null; then
-	echo " done"
+if ${TELNETD} -l /bin/ash; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S41inetd b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S41inetd
index cf85c13f11..2d24974a5c 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S41inetd
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S41inetd
@@ -2,15 +2,15 @@
 
 INETD=/usr/sbin/inetd
 
-echo -n "Starting inted:"
+echo -n "Starting inted: "
 if [ ! -x "${INETD}" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 fi
 
-if ${INETD} > /dev/null 2> /dev/null; then
-	echo " done"
+if ${INETD}; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S42httpd b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S42httpd
index 202e9d2eb3..f8e7813e65 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S42httpd
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S42httpd
@@ -2,15 +2,15 @@
 
 HTTPD=/usr/sbin/httpd
 
-echo -n "Starting httpd:"
+echo -n "Starting httpd: "
 if [ ! -x "${HTTPD}" ]; then
-	echo " missing"
+	echo "missing"
 	exit 1
 fi
 
-if ${HTTPD} -h /www > /dev/null 2> /dev/null; then
-	echo " done"
+if ${HTTPD} -h /www; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S43ntp b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S43ntp
index f996ab09ff..69fa4c8940 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S43ntp
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S43ntp
@@ -5,22 +5,22 @@ NTPDATE=/usr/bin/ntpdate
 if [ -f /etc/default/ntpdate ]; then
     . /etc/default/ntpdate
 else
-	echo " missing /etc/default/ntpdate"
+	echo "WARNING: missing /etc/default/ntpdate"
 	exit 1
 fi
 
-echo -n "Starting ntpdate:"
+echo -n "Starting ntpdate: "
 if [ ! -x ${NTPDATE} ]; then
-	echo " missing"
+	echo "missing"
 	echo -n "  WARNING: could not syncronize clock, "
 	echo "edit NTPSERVERS in /etc/default/ntpdate."
 	exit 1
 fi
 
-if ${NTPDATE} $NTPOPTIONS $NTPSERVERS > /dev/null 2> /dev/null; then
-	echo " done"
+if ${NTPDATE} $NTPOPTIONS $NTPSERVERS; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	echo -n "  WARNING: could not syncronize clock, "
 	echo "edit NTPSERVERS in /etc/default/ntpdate."
 	exit 1
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S49netfs b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S49netfs
index 99782b481c..e1e0fbf4f1 100755
--- a/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S49netfs
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/init.d/S49netfs
@@ -2,10 +2,10 @@
 
 MOUNT=/bin/mount
 
-echo -n "Mounting remote filesystems:"
-if ${MOUNT} -t nfs -a > /dev/null 2> /dev/null; then
-	echo " done"
+echo -n "Mounting remote filesystems: "
+if ${MOUNT} -t nfs -a; then
+	echo "done"
 else
-	echo " failed"
+	echo "failed"
 	exit 1
 fi
diff --git a/target/device/Atmel/atngw100/target_skeleton/etc/passwd b/target/device/Atmel/atngw100/target_skeleton/etc/passwd
index 831c3043b7..705c89eece 100644
--- a/target/device/Atmel/atngw100/target_skeleton/etc/passwd
+++ b/target/device/Atmel/atngw100/target_skeleton/etc/passwd
@@ -1,4 +1,4 @@
-root:$1$rsjkLsTU$zdulfnYQgyKmN3e0Fiw7C1:0:0:root:/:/bin/ash
+root:$1$rsjkLsTU$zdulfnYQgyKmN3e0Fiw7C1:0:0:root:/:/bin/sh
 daemon:x:1:1:daemon:/usr/sbin:/bin/sh
 bin:x:2:2:bin:/bin:/bin/sh
 sys:x:3:3:sys:/dev:/bin/sh
-- 
2.30.2