[Astlinux-commits] SF.net SVN: astlinux:[5294] branches/1.0/project/astlinux/target_skeleton

[<abe...@us...>]

Revision: 5294
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5294&view=rev
Author:   abelbeck
Date:     2011-12-07 17:18:32 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
add support for rc.conf variable ALERT_SOUNDS, startup and/or shutdown, rename errorled to alert

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Added Paths:
-----------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00alert
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99alert

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/errorled
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K99errorled
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99errorled

Copied: branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert (from rev 5293, branches/1.0/project/astlinux/target_skeleton/etc/init.d/errorled)
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/alert	2011-12-07 17:18:32 UTC (rev 5294)
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+is_alert_sound_type()
+{
+  local sound_type="$1" sound IFS
+
+  unset IFS
+  for sound in $ALERT_SOUNDS; do
+    if [ "$sound" = "$sound_type" ]; then
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+start () {
+
+  # Turn OFF the errorled (after finshed booting) 
+  if grep -q "astlinux=net4801" /proc/cmdline; then
+
+    echo 0 > /sys/class/leds/net48xx::error/brightness
+  fi
+
+  if grep -q "astlinux=wrap" /proc/cmdline; then
+
+    echo 0 > /sys/class/leds/wrap::error/brightness
+  fi
+
+  if grep -q "astlinux=net5501" /proc/cmdline; then
+
+    /usr/sbin/functions errorled_net5501 off
+  fi
+
+  if grep -q "astlinux=alix" /proc/cmdline; then
+
+    echo 0 > /sys/class/leds/alix:2/brightness
+  fi
+
+  # LED control for Alix and WRAP boards (after finished booting)
+  # "/mnt/kd/rc.ledcontrol" can override these settings
+  if [ -x /mnt/kd/rc.ledcontrol ]; then
+    /mnt/kd/rc.ledcontrol
+  else
+    if grep -q "astlinux=wrap" /proc/cmdline; then
+    
+      echo heartbeat > /sys/class/leds/wrap::power/trigger
+      echo ide-disk > /sys/class/leds/wrap::error/trigger
+      if [ -n "$EXTIF" ]; then
+        echo netdev > /sys/class/leds/wrap::extra/trigger
+        echo "$EXTIF" > /sys/class/leds/wrap::extra/device_name 
+        echo "enabled" > /sys/class/leds/wrap::extra/link
+        echo "enabled" > /sys/class/leds/wrap::extra/transmit
+        echo "enabled" > /sys/class/leds/wrap::extra/receive 
+      fi   
+    fi
+    
+    if grep -q "astlinux=alix" /proc/cmdline; then
+    
+      echo heartbeat > /sys/class/leds/alix:1/trigger
+      echo ide-disk > /sys/class/leds/alix:2/trigger
+      if [ -n "$EXTIF" ]; then
+        echo netdev > /sys/class/leds/alix:3/trigger
+        echo "$EXTIF" > /sys/class/leds/alix:3/device_name 
+        echo "enabled" > /sys/class/leds/alix:3/link
+        echo "enabled" > /sys/class/leds/alix:3/transmit
+        echo "enabled" > /sys/class/leds/alix:3/receive
+   
+      fi  
+    fi
+  fi
+
+  # Generate Alert Sounds (after finished booting)
+  if grep -q "astlinux=geni586" /proc/cmdline; then
+
+    if is_alert_sound_type startup; then
+      beep -f 330 -l 100 -d1 -n -f 277 -l 100 -d1 -n -f 330 -l 100 -d 1 -n -f 440 -l 330
+    fi
+  fi
+}
+
+stop () {
+
+  # Turn on the errorled (on reboot/shutdown)
+  if grep -q "astlinux=net4801" /proc/cmdline; then
+
+    echo 1 > /sys/class/leds/net48xx::error/brightness
+  fi
+
+  if grep -q "astlinux=wrap" /proc/cmdline; then
+
+    echo none > /sys/class/leds/wrap::power/trigger
+    echo 1 > /sys/class/leds/wrap::power/brightness    
+    echo none > /sys/class/leds/wrap::error/trigger
+    echo 1 > /sys/class/leds/wrap::error/brightness
+    echo none > /sys/class/leds/wrap::extra/trigger
+    echo 0 > /sys/class/leds/wrap::extra/brightness
+  fi
+
+  if grep -q "astlinux=net5501" /proc/cmdline; then
+    
+    /usr/sbin/functions errorled_net5501 on
+  fi
+
+  if grep -q "astlinux=alix" /proc/cmdline; then
+
+    echo none > /sys/class/leds/alix:1/trigger
+    echo 1 > /sys/class/leds/alix:1/brightness
+    echo none > /sys/class/leds/alix:2/trigger
+    echo 1 > /sys/class/leds/alix:2/brightness
+    echo none > /sys/class/leds/alix:3/trigger
+    echo 0 > /sys/class/leds/alix:3/brightness
+  fi
+
+  # Generate Alert Sounds (on reboot/shutdown)
+  if grep -q "astlinux=geni586" /proc/cmdline; then
+
+    if is_alert_sound_type shutdown; then
+      beep -f 988 -l 180 -d 33 -n -f 831 -l 110
+    fi
+  fi
+}
+
+case $1 in
+
+  start)
+    start
+    ;;
+
+  stop)
+    stop
+    ;;
+
+  init)
+    start
+    ;;
+
+  restart)
+    stop
+    sleep 2
+    start
+    ;;
+
+  *)
+    echo "Usage: start|stop|restart"
+    ;;
+
+esac

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/init.d/errorled
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/errorled	2011-12-07 00:55:44 UTC (rev 5293)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/errorled	2011-12-07 17:18:32 UTC (rev 5294)
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-start () {
-
-  # Turn OFF the errorled (after finshed booting) 
-  if grep -q "astlinux=net4801" /proc/cmdline; then
-
-    echo 0 > /sys/class/leds/net48xx::error/brightness
-  fi
-
-  if grep -q "astlinux=wrap" /proc/cmdline; then
-
-    echo 0 > /sys/class/leds/wrap::error/brightness
-  fi
-
-  if grep -q "astlinux=net5501" /proc/cmdline; then
-
-    /usr/sbin/functions errorled_net5501 off
-  fi
-
-  if grep -q "astlinux=alix" /proc/cmdline; then
-
-    echo 0 > /sys/class/leds/alix:2/brightness
-  fi
-
-  # LED control for Alix and WRAP boards (after finished booting)
-  # "/mnt/kd/rc.ledcontrol" can override these settings
-  if [ -x /mnt/kd/rc.ledcontrol ]; then
-    /mnt/kd/rc.ledcontrol
-  else
-    if grep -q "astlinux=wrap" /proc/cmdline; then
-    
-      echo heartbeat > /sys/class/leds/wrap::power/trigger
-      echo ide-disk > /sys/class/leds/wrap::error/trigger
-      if [ -n "$EXTIF" ]; then
-        echo netdev > /sys/class/leds/wrap::extra/trigger
-        echo "$EXTIF" > /sys/class/leds/wrap::extra/device_name 
-        echo "enabled" > /sys/class/leds/wrap::extra/link
-        echo "enabled" > /sys/class/leds/wrap::extra/transmit
-        echo "enabled" > /sys/class/leds/wrap::extra/receive 
-      fi   
-    fi
-    
-    if grep -q "astlinux=alix" /proc/cmdline; then
-    
-      echo heartbeat > /sys/class/leds/alix:1/trigger
-      echo ide-disk > /sys/class/leds/alix:2/trigger
-      if [ -n "$EXTIF" ]; then
-        echo netdev > /sys/class/leds/alix:3/trigger
-        echo "$EXTIF" > /sys/class/leds/alix:3/device_name 
-        echo "enabled" > /sys/class/leds/alix:3/link
-        echo "enabled" > /sys/class/leds/alix:3/transmit
-        echo "enabled" > /sys/class/leds/alix:3/receive
-   
-      fi  
-    fi
-  fi
-
-}
-
-stop () {
-
-  # Turn on the errorled (on reboot/shutdown)
-  if grep -q "astlinux=net4801" /proc/cmdline; then
-
-    echo 1 > /sys/class/leds/net48xx::error/brightness
-  fi
-
-  if grep -q "astlinux=wrap" /proc/cmdline; then
-
-    echo none > /sys/class/leds/wrap::power/trigger
-    echo 1 > /sys/class/leds/wrap::power/brightness    
-    echo none > /sys/class/leds/wrap::error/trigger
-    echo 1 > /sys/class/leds/wrap::error/brightness
-    echo none > /sys/class/leds/wrap::extra/trigger
-    echo 0 > /sys/class/leds/wrap::extra/brightness
-  fi
-
-  if grep -q "astlinux=net5501" /proc/cmdline; then
-    
-    /usr/sbin/functions errorled_net5501 on
-  fi
-
-  if grep -q "astlinux=alix" /proc/cmdline; then
-
-    echo none > /sys/class/leds/alix:1/trigger
-    echo 1 > /sys/class/leds/alix:1/brightness
-    echo none > /sys/class/leds/alix:2/trigger
-    echo 1 > /sys/class/leds/alix:2/brightness
-    echo none > /sys/class/leds/alix:3/trigger
-    echo 0 > /sys/class/leds/alix:3/brightness
-  fi
-
-}
-
-case $1 in
-
-  start|off)
-    start
-    ;;
-
-  stop|on)
-    stop
-    ;;
-
-  init)
-    start
-    ;;
-
-  restart)
-    stop
-    sleep 2
-    start
-    ;;
-
-  *)
-    echo "Usage: start|stop|restart"
-    ;;
-
-esac

Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00alert
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00alert	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00alert	2011-12-07 17:18:32 UTC (rev 5294)
@@ -0,0 +1 @@
+link ../../init.d/alert
\ No newline at end of file


Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00alert
___________________________________________________________________
Added: svn:special
   + *

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K99errorled
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K99errorled	2011-12-07 00:55:44 UTC (rev 5293)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K99errorled	2011-12-07 17:18:32 UTC (rev 5294)
@@ -1 +0,0 @@
-link ../../init.d/errorled
\ No newline at end of file

Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99alert
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99alert	                        (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99alert	2011-12-07 17:18:32 UTC (rev 5294)
@@ -0,0 +1 @@
+link ../../init.d/alert
\ No newline at end of file


Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99alert
___________________________________________________________________
Added: svn:special
   + *

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99errorled
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99errorled	2011-12-07 00:55:44 UTC (rev 5293)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S99errorled	2011-12-07 17:18:32 UTC (rev 5294)
@@ -1 +0,0 @@
-link ../../init.d/errorled
\ No newline at end of file

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2011-12-07 00:55:44 UTC (rev 5293)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2011-12-07 17:18:32 UTC (rev 5294)
@@ -673,6 +673,11 @@
 ## Watchdog update period (less than 60 seconds)
 #WDTIME=30
 
+## Alert Sounds
+## For geni586 and geni586-serial board types, sounds can be generated at startup and shutdown.
+## Define which sounds should be generated, space separated, disabled by default.
+#ALERT_SOUNDS="startup shutdown"
+
 ## ISDN Configuration
 ## If this variable exists I will try to load the proper modules, but you
 ## need to tell me how you want to setup your card.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.