From 23bff84c2a9707593593fd8f451c5fc04edf7ac3 Mon Sep 17 00:00:00 2001 From: Greg Frost <gregfrost1@bigpond.com> Date: Thu, 20 Aug 2009 19:48:55 +0930 Subject: lirc: fix syntax error in lirc.fdi --- abs/core-testing/lirc/PKGBUILD | 4 ++-- abs/core-testing/lirc/lirc.fdi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD index 5406783..d15cf1d 100644 --- a/abs/core-testing/lirc/PKGBUILD +++ b/abs/core-testing/lirc/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.5CVS -pkgrel=14 +pkgrel=15 _kernver=2.6.28-LinHES pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" arch=(i686 x86_64) @@ -83,4 +83,4 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a' 'f059f4030afc682c9539a03bf837c1cf' '4e698654cc44fc6c4163814acda5a7ee' '9a3a6dc03647ee6674a166dfb884ddd6' - '664fb04b51396628300daf8befd0db77') + '203d9cd014c4276be4c84cecd103919d') diff --git a/abs/core-testing/lirc/lirc.fdi b/abs/core-testing/lirc/lirc.fdi index 7a8c8ad..6f2443a 100644 --- a/abs/core-testing/lirc/lirc.fdi +++ b/abs/core-testing/lirc/lirc.fdi @@ -3,7 +3,7 @@ <deviceinfo version="0.2"> <device> <!-- This rule prevents the Dvico dual digital4 rev 2 - remote input device from making your keyboard act wierd> + remote input device from making your keyboard act wierd. --> <match key="info.product" contains_ncase="IR-receiver inside an USB DVB receiver"> <merge key="info.ignore" type="bool">true</merge> </match> -- cgit v0.12 From 5d725acb4d3ab25d0d59374c5c93e560c0ab488e Mon Sep 17 00:00:00 2001 From: Greg Frost <gregfrost1@bigpond.com> Date: Thu, 20 Aug 2009 19:29:58 +0900 Subject: dvb-fimware: bump so that I can build an ISO --- abs/core-testing/dvb-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/dvb-firmware/PKGBUILD b/abs/core-testing/dvb-firmware/PKGBUILD index 24224e7..5531f86 100644 --- a/abs/core-testing/dvb-firmware/PKGBUILD +++ b/abs/core-testing/dvb-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dvb-firmware pkgver=1 -pkgrel=7 +pkgrel=8 pkgdesc="Firmware for DVB cards" arch=('i586' 'i686' 'x86_64') url="http://linuxtv.org/" -- cgit v0.12 From c85219e56fd07b11192ce28d605ee1cb24047914 Mon Sep 17 00:00:00 2001 From: Nathan Harris <nharris@eoimaging.com> Date: Thu, 20 Aug 2009 09:46:45 -0400 Subject: mythtv-svn: fix pretty script --- abs/core-testing/mythtv/trunk/mythtv/PKGBUILD | 3 +-- abs/core-testing/mythtv/trunk/mythtv/pretty | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 abs/core-testing/mythtv/trunk/mythtv/pretty diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD index df4afb8..422ec64 100755 --- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD @@ -86,7 +86,6 @@ build() { mkdir -p $startdir/pkg/etc/logrotate.d cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d mkdir -p $startdir/pkg/etc/cron.hourly/ - cp $startdir/src/pretty $startdir/pkg/etc/cron.hourly/ - + install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/ } diff --git a/abs/core-testing/mythtv/trunk/mythtv/pretty b/abs/core-testing/mythtv/trunk/mythtv/pretty old mode 100644 new mode 100755 index e47aaec..24b7658 --- a/abs/core-testing/mythtv/trunk/mythtv/pretty +++ b/abs/core-testing/mythtv/trunk/mythtv/pretty @@ -1,2 +1,2 @@ #!/bin/bash -su mythtv -c "perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty" +su mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty" -- cgit v0.12 From 348ed005f1ba2e77ded656fe2209a58197571b2d Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Thu, 20 Aug 2009 19:51:35 -0500 Subject: mv-core: bring more stuff up to date --- abs/mv-core/MythVantage-config/PKGBUILD | 2 +- .../MythVantage-config/install_functions.sh | 2 +- abs/mv-core/mythvantage-live/PKGBUILD | 2 +- abs/mv-core/mythvantage-live/etc/live-shutdown | 66 ++++++-- abs/mv-core/mythvantage-live/etc/live-sysinit | 21 ++- abs/mv-core/mythvantage-live/etc/rc.shutdown-live | 1 + abs/mv-core/mythvantage-live/etc/rc.sysinit-live | 7 +- .../mythvantage-live/lib/initcpio/hooks/larch3 | 4 + abs/mv-core/runit-scripts-mv/PKGBUILD | 2 +- abs/mv-core/runit-scripts-mv/runitscripts/1 | 16 +- abs/mv-core/runit-scripts-mv/runitscripts/1.local | 3 + .../runitscripts/services/Xvfb/run | 6 + .../runitscripts/services/Xvfb/supervise/lock | 0 .../runitscripts/services/Xvfb/supervise/pid | 0 .../runitscripts/services/Xvfb/supervise/stat | 1 - .../runitscripts/services/Xvfb/supervise/status | Bin 20 -> 0 bytes .../runitscripts/services/acpid/log/run | 8 + .../runitscripts/services/acpid/run | 6 +- .../runitscripts/services/alsa-utils/run | 2 +- .../runitscripts/services/apache/run | 6 + .../runitscripts/services/avahi/run | 6 + .../runitscripts/services/cron/run | 6 + .../runitscripts/services/dbus/run | 6 + .../runitscripts/services/dhcpd/run | 8 + .../runitscripts/services/dnsmasq/run | 6 + .../runitscripts/services/evrouter/run | 7 + .../runitscripts/services/frontend/finish | 13 +- .../runitscripts/services/frontend/run | 16 +- .../runitscripts/services/funcd/run | 4 + .../runitscripts/services/ghosd/run | 4 + .../runit-scripts-mv/runitscripts/services/gpm/run | 6 + .../runit-scripts-mv/runitscripts/services/hal/run | 6 +- .../runitscripts/services/hobbit-client/run | 5 +- .../runitscripts/services/hobbit/run | 4 + .../runitscripts/services/igdaemon/run | 9 ++ .../runitscripts/services/lcdd/run | 6 + .../runitscripts/services/lighttpd/run | 6 + .../runitscripts/services/lircd/finish | 6 +- .../runitscripts/services/lircd/run | 169 ++++++++++++++++----- .../runitscripts/services/mdadm/finish | 17 +++ .../runitscripts/services/mdadm/run | 19 +++ .../runitscripts/services/mysql/run | 19 ++- .../runitscripts/services/mythbackend/run | 4 + .../runitscripts/services/ncid/run | 9 ++ .../runitscripts/services/ncidd/run | 6 + .../runitscripts/services/netfs/run | 1 + .../runitscripts/services/nfsd/run | 7 + .../runitscripts/services/nfslock/run | 6 +- .../runitscripts/services/nmbd/run | 6 + .../runitscripts/services/ntpd/run | 11 +- .../runit-scripts-mv/runitscripts/services/oss/run | 3 + .../runitscripts/services/portmap/run | 4 + .../runitscripts/services/smartd/finish | 9 ++ .../runitscripts/services/smartd/run | 13 ++ .../runitscripts/services/smbd/run | 6 + .../runitscripts/services/sshd/run | 17 +-- .../runitscripts/services/syslog-ng/run | 7 + .../runitscripts/services/tatir/run | 9 ++ .../runitscripts/services/tftpd/run | 8 + .../runitscripts/services/tty2/run | 5 + .../runitscripts/services/tty3/run | 4 + 61 files changed, 534 insertions(+), 104 deletions(-) create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/1.local delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat delete mode 100644 abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run create mode 100755 abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD index 8d6766e..ce01f18 100755 --- a/abs/mv-core/MythVantage-config/PKGBUILD +++ b/abs/mv-core/MythVantage-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=MythVantage-config pkgver=3.2 -pkgrel=163 +pkgrel=165 pkgdesc="The Gui-installer" depends=(bc libstatgrab mysql-python expect curl dnsutils parted diff --git a/abs/mv-core/MythVantage-config/install_functions.sh b/abs/mv-core/MythVantage-config/install_functions.sh index 0bc0591..72023bd 100755 --- a/abs/mv-core/MythVantage-config/install_functions.sh +++ b/abs/mv-core/MythVantage-config/install_functions.sh @@ -283,7 +283,7 @@ function request_dhcp(){ if [ $status -eq 1 ] then #interface is down, lets see if dhcp responds - dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev + dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null #check for hostname here TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2` diff --git a/abs/mv-core/mythvantage-live/PKGBUILD b/abs/mv-core/mythvantage-live/PKGBUILD index d23d8e7..1039b71 100644 --- a/abs/mv-core/mythvantage-live/PKGBUILD +++ b/abs/mv-core/mythvantage-live/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythvantage-live pkgver=5.3.3 -pkgrel=8 +pkgrel=10 provides="linhes-live" pkgdesc="components for the Live System." diff --git a/abs/mv-core/mythvantage-live/etc/live-shutdown b/abs/mv-core/mythvantage-live/etc/live-shutdown index 99c4c10..75c540d 100644 --- a/abs/mv-core/mythvantage-live/etc/live-shutdown +++ b/abs/mv-core/mythvantage-live/etc/live-shutdown @@ -9,12 +9,12 @@ f_saveclock () f_swapoff () { ############################# Include session saving functions - . /opt/mythvantage-live/session-save/shutdown2 - if [ -f /tmp/checkse ]; then - . /tmp/checkse - else - checkse - fi +# . /opt/mythvantage-live/session-save/shutdown2 +# if [ -f /tmp/checkse ]; then +# . /tmp/checkse +# else +# checkse +# fi if [ -n "${saving}" ] && ! session_save; then echo @@ -37,14 +37,54 @@ f_swapoff () f_remountro () { - if [ -n "${ejectdev}" ]; then - echo "Ejecting live CD" - eject ${ejectdev} - echo "========================================" - echo "It's safe to switch the computer off now" - echo -ne "Press Enter to continue" - read junk + bootdev=`cat /.livesys/bootdevice` + echo "Boot device was $bootdev" + #bootdev=`basename $bootdev` + for i in `ls /dev/cd/*` + do + cdrom=`readlink -f $i` + if [ x$cdrom = x$bootdev ] + then + ejectdev=$cdrom + break + fi + + done + lspci |grep -q VMware + if [ ! $? = 0 ] + then + if [ -n "${ejectdev}" ] + then + echo "Ejecting CD $ejectdev" + eject ${ejectdev} + echo "========================================" + echo "Tray will retract after 10 seconds" + for timer in `seq -w 10 -1 0` + do + #echo -n $timer '\x08' + echo -ne "\t"$timer '\010\010\010\010' + sleep 1 + done + echo + echo "========================================" + eject -t ${ejectdev} + echo + echo "It's safe to switch the computer off now" + #echo -ne "Press Enter to continue" + #read junk + else + echo "Boot device is not a cdrom, no need to eject" + fi + else + echo "VMWARE detected, not ejecting the CD" fi } +#Preloads these commands so we can eject the CD. +# +seq --help >/dev/null 2>&1 +eject --help >/dev/null 2>&1 +halt --help >/dev/null 2>&1 +poweroff --help >/dev/null 2>&1 +reboot --help >/dev/null 2>&1 # End diff --git a/abs/mv-core/mythvantage-live/etc/live-sysinit b/abs/mv-core/mythvantage-live/etc/live-sysinit index 8e2813b..4cf36f2 100644 --- a/abs/mv-core/mythvantage-live/etc/live-sysinit +++ b/abs/mv-core/mythvantage-live/etc/live-sysinit @@ -6,7 +6,7 @@ f_header () cR='\e[31m' cY='\e[1;33m' cN='\e[0m' cW='\e[1;37m' echo " " printsep - printf " ${cR}MythVantage ${cY}Installation${cN}/${cY}Live${cW}. " + printf " ${cR}MythVantage ${cY}Installation${cN}/${cY}Live${cW} CDROM${cN}. " printsep echo " " } @@ -52,3 +52,22 @@ f_swapon () status "Activating Swap" /sbin/swapon -a fi } +f_loadmodules() +{ + CMDLINE=$(cat /proc/cmdline) + echo $CMDLINE | grep -q modules + if [ $? -eq 0 ] + then + TEMPVAR=${CMDLINE#* modules=} + CMDMODULES=${TEMPVAR%% *} + mymod=`echo $CMDMODULES|/bin/sed 's|-|_|g' |/bin/sed 's|,| |g'` + stat_busy "Loading CMD module" + for mod in $mymod + do + /sbin/modprobe $mod + done + stat_done + fi + + +} diff --git a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live b/abs/mv-core/mythvantage-live/etc/rc.shutdown-live index bba263c..58988f3 100755 --- a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live +++ b/abs/mv-core/mythvantage-live/etc/rc.shutdown-live @@ -149,6 +149,7 @@ fi #F Remount / ro f_remountro +#Eject the CD # Power off or reboot if [ "$RUNLEVEL" = "0" ]; then diff --git a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live b/abs/mv-core/mythvantage-live/etc/rc.sysinit-live index 3f72a50..b3b91de 100755 --- a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live +++ b/abs/mv-core/mythvantage-live/etc/rc.sysinit-live @@ -12,7 +12,7 @@ ############################################################### ### These functions have been separated out, so that they can be -### replaced in linhes live systems. +### replaced in mythvantage live systems. f_header () { @@ -98,7 +98,7 @@ f_swapon () ############################################################### -### Override above functions if running linhes live system +### Override above functions if running mythvantage live system [ -f /etc/live-sysinit ] && . /etc/live-sysinit #F Print header @@ -176,6 +176,9 @@ fi # Load modules from the MODULES array defined in rc.conf if ! [ "$load_modules" = "off" ]; then if [ -f /proc/modules ]; then +############Added by jm to load modules from /proc/cmdline + f_loadmodules +############## stat_busy "Loading Modules" for mod in "${MODULES[@]}"; do if [ "$mod" = "${mod#!}" ]; then diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 index 47be81a..b301aa9 100644 --- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 +++ b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 @@ -96,6 +96,8 @@ run_hook () msg_ ":: Mounting squashed images" /bin/mkdir /tfs/system + #added sleep for 3 seconds, because well i don't know but it seems to fix things + sleep 3 # The klibc mount command doesn't support '-o loop' /bin/losetup /dev/loop0 ${sysSqf} /bin/mount -r -t squashfs /dev/loop0 /tfs/system @@ -107,11 +109,13 @@ run_hook () export LD_LIBRARY_PATH=/tfs/system/lib:/tfs/system/usr/lib /bin/mkdir /tfs/mods + # The klibc mount command doesn't support '-o loop' /bin/losetup /dev/loop1 ${modsSqf} /bin/mount -r -t squashfs /dev/loop1 /tfs/mods # Unpack the overlay + msg_ ":: Initializing writable layer for union (overlay)" /tfs/system/usr/bin/lzop -d < ${overlay} | \ /tfs/system/bin/tar -C /tfs -xf - diff --git a/abs/mv-core/runit-scripts-mv/PKGBUILD b/abs/mv-core/runit-scripts-mv/PKGBUILD index ae85623..04b2c92 100755 --- a/abs/mv-core/runit-scripts-mv/PKGBUILD +++ b/abs/mv-core/runit-scripts-mv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts-mv pkgver=1.8.0 -pkgrel=4 +pkgrel=7 pkgdesc="collection of startup scripts for runit MythVantage styel" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1 b/abs/mv-core/runit-scripts-mv/runitscripts/1 index 748930f..6e4425d 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/1 +++ b/abs/mv-core/runit-scripts-mv/runitscripts/1 @@ -1,14 +1,26 @@ #!/bin/bash /etc/rc.sysinit +. /etc/rc.conf +. /etc/rc.d/functions hostname `cat /etc/hostname` /sbin/sysctl -p 2>/dev/null >/dev/null -#/usr/bin/load-modules-mythvantage.sh +#yes it's needed the 2nd time +/usr/LH/bin/load-modules-mythvantage.sh >/dev/null rm /etc/dhcpc/dhcpcd*.pid 2>/dev/null rm -f /etc/sv/frontend/.runtime/* 2>/dev/null rm -f /etc/runit/reboot 2>/dev/null +stat_busy "Starting network" /etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init +stat_done /usr/sbin/ethtool -s eth0 wol g 2>/dev/null /usr/sbin/ethtool -s eth1 wol g 2>/dev/null /usr/sbin/ethtool -s eth2 wol g 2>/dev/null +#user added stuff for level 1 of runit +if [ -e /etc/runit/1.local ] +then + #exec the file + stat_busy /etc/runit/1.local + /etc/runit/1.local + stat_done +fi -#/bin/su mythtv -c /usr/bin/grabkey.py 2>/dev/null 1>/devn/null & diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1.local b/abs/mv-core/runit-scripts-mv/runitscripts/1.local new file mode 100755 index 0000000..f79a0c6 --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/1.local @@ -0,0 +1,3 @@ +#!/bin/bash +#local user startup script, run at the end of runit 1 + diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run index 823916d..71ffedd 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run @@ -1,5 +1,11 @@ #!/bin/bash . /etc/profile +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting XVFB" + + VIRTUAL_DISPLAY=":50" Xvfb_parm="$VIRTUAL_DISPLAY -screen 0 800x600x16" Xvfb $Xvfb_parm diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/lock deleted file mode 100644 index e69de29..0000000 diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/pid deleted file mode 100644 index e69de29..0000000 diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat deleted file mode 100644 index eb0e904..0000000 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/stat +++ /dev/null @@ -1 +0,0 @@ -down diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status deleted file mode 100644 index 2254c38..0000000 Binary files a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/supervise/status and /dev/null differ diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run new file mode 100755 index 0000000..20c892e --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run @@ -0,0 +1,8 @@ +#!/bin/sh +exec 2>&1 +#export TERM=linux +#. /etc/rc.conf +#. /etc/rc.d/functions +#stat_runit "Starting MythBackend logger" +/usr/bin/logger -p info -t acpid + diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run index daf9859..80cc65a 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run @@ -1,3 +1,7 @@ #!/bin/sh exec 2>&1 -exec /usr/sbin/acpid -f -c /etc/acpi/events 2>/dev/null >/dev/null +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting acpid" +exec /usr/sbin/acpid -f -c /etc/acpi/events >2 /dev/null 1>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run index 0a97cfa..17f5f99 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run @@ -1,3 +1,3 @@ #!/bin/sh exec 2>&1 -exec /etc/rc.d/alsa-utils start all +exec /etc/rc.d/alsa start diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run index 130d870..95d5cc4 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run @@ -1,2 +1,8 @@ #!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Apache" + + exec /usr/local/apache/bin/httpd -DNO_DETACH diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run index 323d242..b9b4905 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run @@ -1,4 +1,10 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Avahi" + + exec /usr/sbin/avahi-daemon >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run index 99dc014..0894236 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run @@ -1,3 +1,9 @@ #!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Cron" + + exec 2>&1 exec /usr/sbin/crond -f >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run index 872ca77..a9af150 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run @@ -1,3 +1,9 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting dbus" + + exec /usr/bin/dbus-daemon --system --nofork 2>/dev/null >/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run new file mode 100755 index 0000000..38ae40a --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run @@ -0,0 +1,8 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting dhcpd" + + +exec /usr/sbin/dhcpd -f &> /var/log/dhcpd.log diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run index 451dda4..f14c51a 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run @@ -1,4 +1,10 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting dns services" + + exec /usr/sbin/dnsmasq -k >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run index 5697f6f..56f7ae6 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run @@ -1,13 +1,20 @@ #!/bin/bash . /etc/profile +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + which evrouter >/dev/null 2>/dev/null if [ $? = 0 ] then + + stat_runit "Starting evrouter" ps -ef |grep -v grep|grep -q "Xvfb :50" if [ ! $? = 0 ] then sv start Xvfb fi + su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*" fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish index 3bbd374..4836b44 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish @@ -1,12 +1,15 @@ #!/bin/bash exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + grep -q noautologin /proc/cmdline STATUS=$? - if [ $STATUS = 0 ] - then - chvt 2 +if [ $STATUS = 0 ] +then + chvt 2 else - chvt 1 touch /etc/sv/frontend/.runtime/`date +%s` sleep 0.5 @@ -19,6 +22,6 @@ if [ $numfiles -gt 2 ] then sv stop frontend rm -f /etc/sv/frontend/.runtime/* - echo "Frontend is not able to start, disabling it" + printhl " Frontend is not able to start, disabling it." fi fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run index 35d97d0..0c75b96 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run @@ -1,15 +1,17 @@ #!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions exec 2>&1 sv start dbus sv start hal - grep -q noautologin /proc/cmdline - STATUS=$? - if [ $STATUS = 0 ] - then +grep -q noautologin /proc/cmdline +STATUS=$? +if [ $STATUS = 0 ] +then sv down frontend exit 0 - fi - -#exec /usr/bin/openvt -fec 7 -- /bin/su - mythtv -l -c STB-start +fi +stat_runit "Starting MythVantage frontend" exec /bin/su - mythtv -l -c STB-start diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run index f807822..8d364db 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run @@ -1,2 +1,6 @@ #!/bin/bash +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting func" exec /usr/bin/funcd diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run index fbe8ba0..faf4d59 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run @@ -1,3 +1,7 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting ghosd" DISPLAY=localhost:0.0 exec /usr/bin/osdServer.pl 5000 diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run index 361fc43..c347c77 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run @@ -1,4 +1,10 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting GPM" + + . /etc/sysconfig/mouse exec gpm -D -m $MDEVICE -t $PROTOCOL diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run index f1362b2..a6d5c0e 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run @@ -1,4 +1,8 @@ #!/bin/sh exec 2>&1 -sv waitup dbus 2>/dev/null 1>/dev/null +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +svwaitup dbus 2>/dev/null 1>/dev/null +stat_runit "Starting Hal" exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run index e45173d..520f720 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run @@ -14,7 +14,10 @@ #----------------------------------------------------------------------------# # # $Id: runclient.sh,v 1.13 2006/07/14 21:25:19 henrik Rel $ - +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting hobbit client" # Default settings for this client MACHINEDOTS="`uname -n`" # This systems hostname BBOSTYPE="`uname -s | tr '[A-Z]' '[a-z]'`" # This systems operating system in lowercase diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run index 24ad9fe..19b8194 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run @@ -1,3 +1,7 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting hobbit server" exec su nobody -c "/data/srv/hobbit/server/bin/hobbitlaunch --config=/data/srv/hobbit/server/etc/hobbitlaunch.cfg --env=/data/srv/hobbit/server/etc/hobbitserver.cfg --log=/var/log/hobbit/hobbitlaunch.log --pidfile=/var/log/hobbit/hobbitlaunch.pid --no-daemon" diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run new file mode 100755 index 0000000..ea4f33b --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run @@ -0,0 +1,9 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting IguanaWorks IR daemon" + + +exec /usr/bin/igdaemon --no-ids -n -l /var/log/igdaemon.log diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run index df71bf8..da2258b 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run @@ -1,5 +1,11 @@ #!/bin/sh . /etc/systemconfig +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting lcdproc" + + exec 2>&1 if [ x$LCDtype = xxosd ] then diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run index 70cb0a5..798690c 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run @@ -1,2 +1,8 @@ #!/bin/bash +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting lighttpd" + + exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish index 754bca1..1afc41c 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish @@ -1,4 +1,8 @@ #!/bin/bash +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + killall -9 lircd 2>/dev/null rm -f /var/run/lirc*.pid [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime @@ -8,5 +12,5 @@ if [ $numfiles -gt 3 ] then rm -f /etc/sv/lircd/.runtime/* 2>/dev/null sv stop lircd - echo "lircd is not able to start, disabling it" + printhl " lircd is not able to start, disabling it" fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run index ceda8db..0a398ac 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run @@ -1,53 +1,138 @@ #!/bin/bash + exec 2>&1 -run_lircd2=false -. /etc/systemconfig -[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime +export TERM=linux -function dvico_detect { +. /etc/rc.conf +. /etc/rc.d/functions +#since what we do may not be enough +#if your one of those people, this is where you place your stuff - if [ x$Remotetype = "xdvico" ] - then - DEVICE="/dev/usb/hiddev0" - fi -} +LOG=/tmp/lirc.log -function imon_detect { -if [ -e /dev/lirc_imon ] +if [ -f $LOG ] then -lircd2_cmd="/usr/sbin/lircd -d /dev/lirc_imon --output=/dev/lircd --pidfile=/var/run/lircd2.pid --connect=localhost:8765" -run_lircd2=true + rm -f $LOG fi -} - - - -case $ReceiverType in - Serial) - /usr/bin/setserial /dev/$ReceiverSerialport uart none - /sbin/modprobe lirc_serial - DEVICE=`ls /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 ` - imon_detect - ;; - Usb-imon) - DEVICE=/dev/lirc_imon - ;; - Hauppauge) - DEVICE=/dev/lirc3 - ;; - *) - - DEVICE=`ls /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 ` - imon_detect - dvico_detect - ;; -esac - -if [ "$run_lircd2" = "true" ] + +if [ -f /etc/runit/lirc.sh ] then - $lircd2_cmd 2>/dev/null 1>/dev/null - exec /usr/sbin/lircd -n -d $DEVICE --output /dev/lircd1 --listen 2>/dev/null 1>/dev/null + #program must not terminate. + + stat_runit "Starting lirc" + + /etc/runit/lirc.sh else - exec /usr/sbin/lircd -n -d $DEVICE 2>/dev/null 1>/dev/null + . /etc/systemconfig + stat_runit "Starting lirc" + + [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime + + function dvico_detect { + if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ] + then + RunDvico=true + else + RunDvico=false + fi + } + + num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` + num_lirc=$((num_lirc-1)) + + serial_port="" + + if [ x$ReceiverType = xSerial ] + then + serial_port=$ReceiverSerialport + elif [ x$HostBlasterType = xSerial ] + then + serial_port=$HostSerialPort_blasterlirc + fi + + if [ -n "$serial_port" ] + then + #/dev/ttyS0 (COM1), port 0x3f8, irq 4 + #/dev/ttyS1 (COM2), port 0x2f8, irq 3 + #/dev/ttyS2 (COM3), port 0x3e8, irq 4 + #/dev/ttyS3 (COM4), port 0x2e8, irq 3 + + case $serial_port in + ttyS0) + FLAGS="io=0x3f8 irq=4" + ;; + ttyS1) + FLAGS="io=0x2f8 irq=3" + ;; + ttyS2) + FLAGS="io=0x3e8 irq=4" + ;; + ttyS3) + FLAGS="io=0x2e8 irq=3" + ;; + esac + /usr/bin/setserial /dev/serial_port uart none + sleep 0.5 + /sbin/modprobe lirc_serial $FLAGS + sleep 0.5 + fi + + dvico_detect + + if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] + then + CMD="/usr/sbin/lircd -n --driver=commandir" + printhl " Using commandir" + $CMD >>$LOG 2>>$LOG +#echo $CMD + elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] + then + sv start igdaemon + CMD="/usr/sbin/lircd -n --driver=iguanaIR" + printhl " Using iguanaIR usb" +#echo $CMD + $CMD >>$LOG 2>>$LOG + else + LASTCMD="" + + for i in `seq 1 $num_lirc` + do + CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + printhl " Device $i" +#echo $CMD + $CMD >>$LOG 2>>$LOG + LASTCMD="--connect=localhost:876$i $LASTCMD " + done + + if [ $RunDvico = "true" ] + then + if [ x$Remotetype = "xdvico" ] + then + LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" + else + LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" + fi + + if [ $num_lirc -lt 0 ] + then + # Only run Dvico + printhl " Device $Remotetype" +#echo $LCMD + exec $LCMD >>$LOG 2>>$LOG + elif [ $num_lirc -gt -1 ] + then + i=$((i+1)) + CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + $CMD >> $LOG + LASTCMD="--connect=localhost:876$i $LASTCMD " + printhl " Device Dvico" + /usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG + fi + else + LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" +#echo $LCMD + exec $LCMD >>$LOG 2>>$LOG + fi + fi fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish new file mode 100755 index 0000000..92782ba --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish @@ -0,0 +1,17 @@ +#!/bin/bash +# +# Stop Monitoring software raid arrays +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /sbin/mdadm` + stat_runit "Stopping mdadm RAID Monitor" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mdadm + stat_done + fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run new file mode 100755 index 0000000..0ab432e --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Start Monitoring software raid arrays +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /sbin/mdadm` + stat_runit "Starting mdadm RAID Monitor" + if [ -z "$PID" ]; then + /sbin/mdadm -F -s + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon mdadm + stat_done + fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run index 569230e..6b2f95a 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run @@ -1,24 +1,28 @@ #!/bin/bash exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Mysql" MYSQLD_ROOT="/data/srv/mysql" # source application-specific settings [ -f /etc/conf.d/mysqld ] && . /etc/conf.d/mysqld if [ ! `egrep '^mysql:' /etc/group` ]; then - stat_busy "Adding mysql group" + stat_runit "Adding mysql group" groupadd -g 89 mysql - stat_done + fi if [ ! `egrep '^mysql:' /etc/passwd` ]; then - stat_busy "Adding mysql user" + stat_runit "Adding mysql user" useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql [ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT - stat_done + fi if [ ! -d $MYSQLD_ROOT ]; then - mkdir $MYSQLD_ROOT - /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql + mkdir -p $MYSQLD_ROOT + /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql 2>/dev/null 1>/dev/null chown -R mysql.mysql $MYSQLD_ROOT fi @@ -26,4 +30,5 @@ if [ ! -e /var/log/mysqld.log ]; then touch /var/log/mysqld.log chown mysql /var/log/mysqld.log fi -exec /usr/sbin/mysqld -u mysql 2>/dev/null >/dev/null + +exec /usr/sbin/mysqld --skip-name-resolve -u mysql 2>/dev/null >/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run index 0868a01..692e7db 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run @@ -2,6 +2,10 @@ exec 2>&1 . /etc/profile . /etc/systemconfig +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + export HOME=/root if [ ! x$SystemType = xSlave_backend ] then diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run index 7dbc8ba..44154c7 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run @@ -1,12 +1,21 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + + which ncid 2>/dev/null >/dev/null + if [ $? = 0 ] then if [ -f /var/service/ncidd/run ] then sv start ncidd fi + + stat_runit "Starting callerid client" + exec /usr/bin/ncid --no-gui --all --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333 fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run index f1c710a..6fff089 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run @@ -1,7 +1,13 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + which ncidd > /dev/null 2>/dev/null if [ $? = 0 ] then + stat_runit "Starting CallerID" + exec /usr/sbin/ncidd -D 2>&1 fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run index f2c0813..28388b9 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run @@ -1,5 +1,6 @@ #!/bin/sh exec 2>&1 sv start portmap +sv start nfslock /etc/rc.d/netfs start diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run index d8435a6..3b63077 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run @@ -1,5 +1,9 @@ #!/bin/bash exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting NFSD" # Make sure the statd daemon is up # (the statd service must ensure portmap is running first) @@ -11,12 +15,15 @@ source /etc/conf.d/nfs /usr/sbin/exportfs -ra > /dev/null 2>/dev/null # start some nfsd threads +printhl " Using ${NFSD_OPTS} " /usr/sbin/rpc.nfsd -p ${NFSD_OPTS} >/dev/null 2>/dev/null # since we are running kernel 2.6 we should also # mount the nfsd virtual filesystem +printhl " mount nfsd" /bin/mount -t nfsd none /proc/fs/nfsd >/dev/null 2>/dev/null # Start the rpc.mountd daemon + exec /usr/sbin/rpc.mountd --foreground >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run index 0ec6f75..8d627ad 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run @@ -1,4 +1,8 @@ #!/bin/bash exec 2>&1 -sv start portmap >/dev/null 2>/dev/null +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting NFSlock" +svwaitup portmap >/dev/null 2>/dev/null /usr/sbin/rpc.statd -F >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run index 9aa27ec..9ed032b 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run @@ -1,3 +1,9 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting NMBD" + + exec nmbd -F -S -d1 2>/dev/null >/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run index 65e551c..146c4e0 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run @@ -1,3 +1,10 @@ #!/bin/sh -/usr/bin/ntpdate pool.ntp.org -exec /usr/bin/ntpd -n -p /var/run/ntpd.pid +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting NTPD" +printhl " Fetching time" +msg=`/usr/bin/ntpdate pool.ntp.org ` +printhl " $msg" + +exec /usr/bin/ntpd -n -p /var/run/ntpd.pid 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run index 687de8f..fe26e3f 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run @@ -1,5 +1,8 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions rm -f /usr/lib/oss/starting #exec /etc/rc.d/alsa-utils start all exec /usr/sbin/soundon diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run index 561d65b..9e708e6 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run @@ -1,3 +1,7 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting portmap" exec /sbin/portmap -d >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish new file mode 100755 index 0000000..7b77994 --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish @@ -0,0 +1,9 @@ +#!/bin/bash + + . /etc/rc.conf + . /etc/rc.d/functions + + stat_runit "Stopping smartd" + kill -9 `pidof /usr/sbin/smartd` &>/dev/null + rm_daemon smartd + stat_done diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run new file mode 100755 index 0000000..15ed769 --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run @@ -0,0 +1,13 @@ +#!/bin/bash + + . /etc/rc.conf + . /etc/rc.d/functions + + stat_runit "Starting smartd" + /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null + if [ $? -ne 0 ]; then + stat_fail + else + add_daemon smartd + stat_done + fi diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run index af77dcb..b4a545b 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run @@ -1,3 +1,9 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Samba" + + exec smbd -F -S -d3 2>/dev/null >/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run index a019e5d..fc22e3b 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run @@ -1,20 +1,13 @@ #!/bin/bash exec 2>&1 -nobodydir=/data/srv/.nobody_ssh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting SSH" [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } -if [ ! -f $nobodydir/id_dsa.pub ] -then - mkdir -p $nobodydir - ssh-keygen -t dsa -N '' -f $nobodydir/id_dsa - mkdir -p /data/home/mythtv/.ssh - cp $nobodydir/id_dsa.pub /data/home/mythtv/.ssh/authorized_keys - chmod 700 /data/home/mythtv/.ssh/ - chown -R mythtv:mythtv /data/home/mythtv/.ssh/ -fi -chown -R nobody:nobody $nobodydir -chmod 700 $nobodydir + exec /usr/sbin/sshd -D >/dev/null 2>/dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run index eb56ace..8633a77 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run @@ -1,3 +1,10 @@ #!/bin/sh exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting syslog" + + exec /usr/sbin/syslog-ng -F + diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run new file mode 100755 index 0000000..d6fc863 --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run @@ -0,0 +1,9 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting tatir" + + +exec /usr/bin/PyroUsb.py > /dev/null diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run new file mode 100755 index 0000000..8f742ca --- /dev/null +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run @@ -0,0 +1,8 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting tftpd" + + +exec /usr/sbin/in.tftpd --foreground -s /tftpboot diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run index 3782aed..8db2924 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run @@ -1,2 +1,7 @@ #!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Agetty 2" + exec /sbin/agetty 38400 vc/2 linux diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run index ce66b0d..bdbec66 100755 --- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run +++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run @@ -1,2 +1,6 @@ #!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting Agetty 3" exec /sbin/agetty 38400 vc/3 linux -- cgit v0.12 From 906cac4cb510655f9bde8d02dc40a684e448c705 Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Thu, 20 Aug 2009 19:51:56 -0500 Subject: fftw2/gtk/glib: remove info dir --- abs/core-testing/fftw2/PKGBUILD | 4 ++-- abs/core-testing/glib/PKGBUILD | 4 ++-- abs/core-testing/glib/__changelog | 2 +- abs/core-testing/gtk/PKGBUILD | 2 +- abs/core-testing/gtk/__changelog | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/abs/core-testing/fftw2/PKGBUILD b/abs/core-testing/fftw2/PKGBUILD index 4b95f97..18aa473 100644 --- a/abs/core-testing/fftw2/PKGBUILD +++ b/abs/core-testing/fftw2/PKGBUILD @@ -3,13 +3,13 @@ pkgname=fftw2 pkgver=2.1.5 -pkgrel=8 +pkgrel=9 pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw." arch=(i686 x86_64) url="http://www.fftw.org/" license=('GPL2') depends=('glibc') -options=(!libtool !emptydirs) +options=(!libtool !emptydirs !docs) source=(http://www.fftw.org/fftw-${pkgver}.tar.gz) md5sums=('8d16a84f3ca02a785ef9eb36249ba433') diff --git a/abs/core-testing/glib/PKGBUILD b/abs/core-testing/glib/PKGBUILD index cb97a5b..42f4420 100644 --- a/abs/core-testing/glib/PKGBUILD +++ b/abs/core-testing/glib/PKGBUILD @@ -4,13 +4,13 @@ pkgname=glib pkgver=1.2.10 -pkgrel=8 +pkgrel=10 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') depends=('glibc') -options=('!libtool' '!emptydirs') +options=('!libtool' '!emptydirs' '!docs' ) source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \ gcc340.patch \ aclocal-fixes.patch) diff --git a/abs/core-testing/glib/__changelog b/abs/core-testing/glib/__changelog index 93f6b06..f2439db 100644 --- a/abs/core-testing/glib/__changelog +++ b/abs/core-testing/glib/__changelog @@ -1 +1 @@ -added !emptydir to options +added !emptydir !docs to options diff --git a/abs/core-testing/gtk/PKGBUILD b/abs/core-testing/gtk/PKGBUILD index bb47b2b..48c4972 100644 --- a/abs/core-testing/gtk/PKGBUILD +++ b/abs/core-testing/gtk/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gtk pkgver=1.2.10 -pkgrel=10 +pkgrel=11 pkgdesc="The GTK+ toolkit" arch=('i686' 'x86_64') url="http://www.gtk.org/" diff --git a/abs/core-testing/gtk/__changelog b/abs/core-testing/gtk/__changelog index 014bc64..5d6d4d6 100644 --- a/abs/core-testing/gtk/__changelog +++ b/abs/core-testing/gtk/__changelog @@ -1,2 +1,3 @@ added !emptydir to options +!docs -- cgit v0.12 From 1f99f4fab216bf9e580c70dd80a591ab3b908dfb Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Thu, 20 Aug 2009 19:52:16 -0500 Subject: linhes-config: update mv_software.py for postfix --- abs/core-testing/LinHES-config/mv_software.py | 38 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/abs/core-testing/LinHES-config/mv_software.py b/abs/core-testing/LinHES-config/mv_software.py index e5b96b2..7421e08 100755 --- a/abs/core-testing/LinHES-config/mv_software.py +++ b/abs/core-testing/LinHES-config/mv_software.py @@ -4,29 +4,47 @@ import os, re def setup_software(systemconfig, data_config): logging.info("____Start of Software install____") - default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", - "mythgame", "mythflix", "mythweather", - "mythappletrailers", "mythstream", "mythvodka") + postfix='' + if data_config.SYSTEMTYPE == "MythVantage": + #look for the installed prefix + cmd="pacman -Q mythtv-release-fixes" + rc = mv_common.runcmd(cmd) + if rc == 0: + postfix = "-release-fixes" + else: + postfix = "-svn" - default_installed=("mythcontrols", "mythgallery", "mythmovies", - "mythmusic", "mythsmolt", "mythvideo") - other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes") + default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", + "mythgame", "mythflix", "mythweather" ) + + default_installed=("mythcontrols", "mythgallery", "mythmovies", + "mythmusic", "mythsmolt", "mythvideo") + other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "mythappletrailers", "mythstream", "mythvodka") + else: + default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", + "mythgame", "mythflix", "mythweather", + "mythappletrailers", "mythstream", "mythvodka") + + default_installed=("mythcontrols", "mythgallery", "mythmovies", + "mythmusic", "mythsmolt", "mythvideo") + other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes") for pkg in default_disabled: + pkgname=pkg+postfix try: if systemconfig[pkg] == "1": - mv_common.pacinstall(pkg) + mv_common.pacinstall(pkgname) else: - mv_common.pacremove(pkg) + mv_common.pacremove(pkgname) except: logging.debug(" ERROR-- %s is not defined", pkg) for pkg in default_installed: try: if systemconfig[pkg] == "0": - mv_common.pacremove(pkg) + mv_common.pacremove(pkgname) else: - mv_common.pacinstall(pkg) + mv_common.pacinstall(pkgname) except: logging.debug(" ERROR-- %s is not defined", pkg) -- cgit v0.12