From 8f24ad3078fe0011099436d420d9819f1735bfc7 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 24 Jul 2014 19:46:11 -0500 Subject: [PATCH] finish: update these old scripts Signed-off-by: Robert Nelson --- lib/debian-finish.sh | 68 +++++++++++++++++++++----------------------- lib/ubuntu-finish.sh | 26 ++++++++--------- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index e600c42..56dc4b8 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -104,45 +104,41 @@ cat > /etc/e2fsck.conf <<-__EOF__ broken_system_clock = true __EOF__ -cat > /etc/init.d/board_tweaks.sh <<-__EOF__ - #!/bin/sh -e - ### BEGIN INIT INFO - # Provides: board_tweaks.sh - # Required-Start: \$local_fs - # Required-Stop: \$local_fs - # Default-Start: 2 3 4 5 - # Default-Stop: 0 1 6 - # Short-Description: Start daemon at boot time - # Description: Enable service provided by daemon. - ### END INIT INFO - - case "\$1" in - start|reload|force-reload|restart) - if [ -f /boot/uboot/SOC.sh ] && [ -f /boot/uboot/run_boot-scripts ] ; then - if [ -f "/opt/boot-scripts/set_date.sh" ] ; then - /bin/sh /opt/boot-scripts/set_date.sh >/dev/null 2>&1 & - fi - board=\$(cat /boot/uboot/SOC.sh | grep "board" | awk -F"=" '{print \$2}') - if [ -f "/opt/boot-scripts/\${board}.sh" ] ; then - /bin/sh /opt/boot-scripts/\${board}.sh >/dev/null 2>&1 & - fi - fi - ;; - stop) - exit 0 - ;; - *) - echo "Usage: /etc/init.d/board_tweaks.sh {start|stop|reload|restart|force-reload}" - exit 1 - ;; - esac - - exit 0 +cat > /etc/init.d/generic-boot-script.sh <<-__EOF__ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: generic-boot-script.sh +# Required-Start: \$local_fs +# Required-Stop: \$local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start daemon at boot time +# Description: Enable service provided by daemon. +### END INIT INFO + +case "\$1" in +start|reload|force-reload|restart) +if [ -f /boot/SOC.sh ] ; then + board=\$(grep board /boot/SOC.sh | awk -F"=" '{print \$2}') + if [ -f "/opt/scripts/boot/\${board}.sh" ] ; then + /bin/sh /opt/scripts/boot/\${board}.sh >/dev/null 2>&1 & + fi + ;; +stop) + exit 0 + ;; +*) + echo "Usage: /etc/init.d/generic-boot-script.sh {start|stop|reload|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 __EOF__ -chmod u+x /etc/init.d/board_tweaks.sh -insserv board_tweaks.sh || true +chmod u+x /etc/init.d/generic-boot-script.sh +insserv generic-boot-script.sh || true if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then if [ -f /boot/vmlinuz-`uname -r` ] ; then diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh index 77f26e1..2dde00d 100644 --- a/lib/ubuntu-finish.sh +++ b/lib/ubuntu-finish.sh @@ -160,20 +160,18 @@ if [ "x${usbnet_mem}" != "x" ] ; then echo "vm.min_free_kbytes = ${usbnet_mem}" >> /etc/sysctl.conf fi -cat > /etc/init/board_tweaks.conf <<-__EOF__ - start on runlevel 2 - - script - if [ -f /boot/uboot/SOC.sh ] && [ -f /boot/uboot/run_boot-scripts ] ; then - if [ -f "/opt/boot-scripts/set_date.sh" ] ; then - /bin/sh /opt/boot-scripts/set_date.sh >/dev/null 2>&1 & - fi - board=\$(cat /boot/uboot/SOC.sh | grep "board" | awk -F"=" '{print \$2}') - if [ -f "/opt/boot-scripts/\${board}.sh" ] ; then - /bin/sh /opt/boot-scripts/\${board}.sh >/dev/null 2>&1 & - fi - fi - end script +cat > /etc/init/generic-boot-script.conf <<-__EOF__ +start on runlevel 2 + +script + +if [ -f /boot/SOC.sh ] ; then + board=\$(grep board /boot/SOC.sh | awk -F"=" '{print \$2}') + if [ -f "/opt/scripts/boot/\${board}.sh" ] ; then + /bin/sh /opt/scripts/boot/\${board}.sh >/dev/null 2>&1 & + fi +fi +end script __EOF__