diff options
24 files changed, 93 insertions, 92 deletions
diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/asound.state b/target/device/Atmel/atstk1002/target_skeleton/etc/asound.state index ba3131f60..55fb3f00a 100644 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/asound.state +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/asound.state @@ -7,7 +7,7 @@ state.at73c213_0 { iface MIXER name 'Master Playback Volume' value.0 21 - value.1 20 + value.1 21 } control.2 { comment.access 'read write' diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/hosts b/target/device/Atmel/atstk1002/target_skeleton/etc/hosts index 1de7bf570..ef3816702 100644 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/hosts +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/hosts @@ -1,11 +1,12 @@ -127.0.0.1 localhost.localdomain localhost -127.0.1.1 stk1000.example.net stk1000 +127.0.0.1 localhost.localdomain localhost +127.0.1.1 stk1000.example.net stk1000 # The following lines are desirable for IPv6 capable hosts -::1 ip6-localhost ip6-loopback +::1 localhost +::1 ip6-localhost ip6-loopback +::1 stk1000.example.net stk1000 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/atstk1002/target_skeleton/etc/inetd.conf b/target/device/Atmel/atstk1002/target_skeleton/etc/inetd.conf index 6d7f6533a..23eba7988 100644 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/inetd.conf +++ b/target/device/Atmel/atstk1002/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 +#swat stream tcp nowait.400 root.root /usr/sbin/swat swat diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K20alsa-utils b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K20alsa-utils index 604ca5b4c..68f746234 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K20alsa-utils +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K20alsa-utils @@ -5,10 +5,10 @@ PROGRAM=/usr/sbin/alsactl # Exit silently if alsa-utils isn't installed [ -x ${PROGRAM} ] || exit 0 -echo -n "Saving mixer state:" -if ${PROGRAM} store > /dev/null 2> /dev/null; then - echo " done" +echo -n "Saving mixer state: " +if ${PROGRAM} store; then + echo "done" else - echo " failed" + echo "failed" exit 1 fi diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K70sendsig b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K70sendsig index e69de29bb..1a2485251 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K70sendsig +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K70sendsig @@ -0,0 +1 @@ +#!/bin/sh diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K80netfs b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K80netfs index e69de29bb..1a2485251 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K80netfs +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K80netfs @@ -0,0 +1 @@ +#!/bin/sh diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K85network b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K85network index 5b6d3cdc7..d4e8e6139 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K85network +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/K90localfs b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K90localfs index e69de29bb..1a2485251 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K90localfs +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/K90localfs @@ -0,0 +1 @@ +#!/bin/sh diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S01hotplug b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S01hotplug index 89c49e117..15e075b88 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S01hotplug +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S01hotplug @@ -1,8 +1,8 @@ -#! /bin/sh +#!/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/atstk1002/target_skeleton/etc/init.d/S02hostname b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S02hostname index fcad428af..cf858ed62 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S02hostname +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S02hostname @@ -2,7 +2,7 @@ PROGRAM=/bin/hostname -echo -n "Setting hostname:" +echo -n "Setting hostname: " [ -x ${PROGRAM} ] || (echo " missing"; exit 0) if [ -f /etc/hostname ]; then @@ -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/atstk1002/target_skeleton/etc/init.d/S03bootsplash b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S03bootsplash index 260a5913b..21a3a5758 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S03bootsplash +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S03bootsplash @@ -5,22 +5,21 @@ FBSET=/usr/sbin/fbset FBMODEFILE="/etc/fb.modes" SPLASHFILE="/etc/stk1000bootsplash.jpg" -echo -n "Bootsplash image:" +echo -n "Bootsplash image: " if [ ! -x "${FBV}" -o ! -x "${FBSET}" -o \ ! -f "${SPLASHFILE}" -o ! -f "${FBMODEFILE}" ]; then - echo " missing" + echo "missing" exit 1 fi -if ! ${FBSET} 320x240-68 > /dev/null 2> /dev/null; then - echo " failed" +if ! ${FBSET} 320x240-68; then + echo "failed" exit 1 fi -${FBV} ${SPLASHFILE} < /dev/null > /dev/null 2> /dev/null & +${FBV} ${SPLASHFILE} > /dev/null & if [ $? -eq 0 ]; then - echo " loaded" - kill `pidof ${FBV}` > /dev/null 2> /dev/null + echo "loaded" else - echo " failed" + echo "failed" fi diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S08syslog b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S08syslog index 63951e023..58b05925d 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S08syslog +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S09klog b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S09klog index 4c6763bbd..1b0028a08 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S09klog +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S10modules-init b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S10modules-init index d1fcc26e3..e2cf4e303 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S10modules-init +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S15localfs b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S15localfs index 9672752a0..a0b5a8982 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S15localfs +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S20network b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S20network index a9787cdfd..06cf8cb00 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S20network +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S40telnetd b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd index c44bbb5ae..b253c1036 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S40telnetd +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S41inetd b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S41inetd index cf85c13f1..2d24974a5 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S41inetd +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S42httpd b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S42httpd index 202e9d2eb..f8e7813e6 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S42httpd +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S43ntp b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S43ntp index f996ab09f..69fa4c894 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S43ntp +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S49netfs b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S49netfs index 99782b481..e1e0fbf4f 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S49netfs +++ b/target/device/Atmel/atstk1002/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/atstk1002/target_skeleton/etc/init.d/S50alsa-utils b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S50alsa-utils index 0b01f1a6d..e92e5d8ae 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S50alsa-utils +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S50alsa-utils @@ -5,15 +5,15 @@ PROGRAM=/usr/sbin/alsactl # Exit silently if alsa-utils isn't installed [ -x ${PROGRAM} ] || exit 0 -echo -n "Restoring mixer state:" +echo -n "Restoring mixer state: " if [ ! -f /etc/asound.state ]; then - echo " missing" + echo "missing" exit 1 fi -if ${PROGRAM} restore > /dev/null 2> /dev/null; then - echo " done" +if ${PROGRAM} restore; then + echo "done" else - echo " failed" + echo "failed" exit 1 fi diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S99splash b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S99splash index c40790e39..47001adb2 100755 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S99splash +++ b/target/device/Atmel/atstk1002/target_skeleton/etc/init.d/S99splash @@ -3,16 +3,15 @@ PROGRAM=/usr/bin/fbv SPLASHFILE="/etc/stk1000splash.jpg" -echo -n "Splash image:" +echo -n "Splash image: " if [ ! -x "${PROGRAM}" -o ! -f "${SPLASHFILE}" ]; then - echo " missing" + echo "missing" exit 1 fi -${PROGRAM} ${SPLASHFILE} < /dev/null > /dev/null 2>/dev/null & +${PROGRAM} ${SPLASHFILE} > /dev/null & if [ $? -eq 0 ]; then - echo " loaded" - kill `pidof ${PROGRAM}` > /dev/null 2> /dev/null + echo "loaded" else - echo " failed" + echo "failed" fi diff --git a/target/device/Atmel/atstk1002/target_skeleton/etc/passwd b/target/device/Atmel/atstk1002/target_skeleton/etc/passwd index 831c3043b..705c89eec 100644 --- a/target/device/Atmel/atstk1002/target_skeleton/etc/passwd +++ b/target/device/Atmel/atstk1002/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 |