Mercurial > vanilla
changeset 1026:3dfef64b81c1
vanilla: update all init scripts
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 29 Aug 2019 20:34:00 +0200 |
parents | 21a87230c8a1 |
children | 34c9fa83dc08 |
files | Templates/rc audio/mpd/mpd bluetooth/bluez/bluetooth core/busybox/busybox.crond core/busybox/busybox.klogd core/busybox/busybox.mdev core/busybox/busybox.syslogd core/dcron/dcron core/eudev/udevd core/sysklogd/sysklogd dns/avahi/avahi network/dbus/dbus network/dbus/dbus.sh network/dhcpcd/dhcpcd network/openssh/sshd print/cups/cupsd system/acpid/acpid system/acpid/acpid.sh system/smartmontools/smartd system/smartmontools/smartmontools.sh |
diffstat | 20 files changed, 138 insertions(+), 83 deletions(-) [+] |
line wrap: on
line diff
--- a/Templates/rc Thu Aug 29 20:33:00 2019 +0200 +++ b/Templates/rc Thu Aug 29 20:34:00 2019 +0200 @@ -27,8 +27,12 @@ template_start() { - echo "Starting template: $TEMPLATE_CMD $TEMPLATE_ARGS" - $TEMPLATE_CMD $TEMPLATE_ARGS -p $TEMPLATE_PID + if [ -s $TEMPLATE_PID ]; then + echo "template is already running with pid: $(cat $TEMPLATE_PID)" + else + echo "Starting template: $TEMPLATE_CMD $TEMPLATE_ARGS" + $TEMPLATE_CMD $TEMPLATE_ARGS + fi } template_status()
--- a/audio/mpd/mpd Thu Aug 29 20:33:00 2019 +0200 +++ b/audio/mpd/mpd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/mpd -- run control script for mpd #
--- a/bluetooth/bluez/bluetooth Thu Aug 29 20:33:00 2019 +0200 +++ b/bluetooth/bluez/bluetooth Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/bluetooth -- run control script for bluetooth # @@ -29,11 +29,10 @@ { if [ -s $BLUETOOTH_PID ]; then echo "bluetooth is already running with pid: $(cat $BLUETOOTH_PID)" - exit 1 + else + echo "Starting bluetooth: $BLUETOOTH_CMD $BLUETOOTH_ARGS" + start-stop-daemon -Sbvp $BLUETOOTH_PID -x $BLUETOOTH_CMD -- $BLUETOOTH_ARGS fi - - echo "Starting bluetooth: $BLUETOOTH_CMD $BLUETOOTH_ARGS" - start-stop-daemon -Sbvp $BLUETOOTH_PID -x $BLUETOOTH_CMD -- $BLUETOOTH_ARGS } bluetooth_status()
--- a/core/busybox/busybox.crond Thu Aug 29 20:33:00 2019 +0200 +++ b/core/busybox/busybox.crond Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/busybox.crond -- run control script for busybox crond # @@ -27,14 +27,18 @@ busybox_crond_start() { - echo "Starting busybox crond: $BUSYBOX_CROND_CMD crond $BUSYBOX_CROND_ARGS" - $BUSYBOX_CROND_CMD crond $BUSYBOX_CROND_ARGS + if [ -s $BUSYBOX_CROND_PID ]; then + echo "busybox crond is already running with pid: $(cat $BUSYBOX_CROND_PID)" + else + echo "Starting busybox crond: $BUSYBOX_CROND_CMD crond $BUSYBOX_CROND_ARGS" + $BUSYBOX_CROND_CMD crond $BUSYBOX_CROND_ARGS + fi } busybox_crond_status() { if [ -s $BUSYBOX_CROND_PID ]; then - echo "busybox crond is running with pid: `cat $BUSYBOX_CROND_PID`" + echo "busybox crond is running with pid: $(cat $BUSYBOX_CROND_PID)" else echo "busybox crond is not running" fi @@ -44,7 +48,7 @@ { if [ -s $BUSYBOX_CROND_PID ]; then echo "Stopping busybox crond." - kill -QUIT `cat $BUSYBOX_CROND_PID` + kill -QUIT $(cat $BUSYBOX_CROND_PID) rm -f $BUSYBOX_CROND_PID fi }
--- a/core/busybox/busybox.klogd Thu Aug 29 20:33:00 2019 +0200 +++ b/core/busybox/busybox.klogd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/busybox.klogd -- run control script for busybox klogd # @@ -27,14 +27,18 @@ busybox_klogd_start() { - echo "Starting busybox klogd: $BUSYBOX_KLOGD_CMD klogd $BUSYBOX_KLOGD_ARGS" - $BUSYBOX_KLOGD_CMD klogd $BUSYBOX_KLOGD_ARGS + if [ -s $BUSYBOX_KLOGD_PID ]; then + echo "busybox klogd is already running with pid: $(cat $BUSYBOX_KLOGD_PID)" + else + echo "Starting busybox klogd: $BUSYBOX_KLOGD_CMD klogd $BUSYBOX_KLOGD_ARGS" + $BUSYBOX_KLOGD_CMD klogd $BUSYBOX_KLOGD_ARGS + fi } busybox_klogd_status() { if [ -s $BUSYBOX_KLOGD_PID ]; then - echo "busybox klogd is running with pid: `cat $BUSYBOX_KLOGD_PID`" + echo "busybox klogd is running with pid: $(cat $BUSYBOX_KLOGD_PID)" else echo "busybox klogd is not running" fi @@ -44,7 +48,7 @@ { if [ -s $BUSYBOX_KLOGD_PID ]; then echo "Stopping busybox klogd." - kill -QUIT `cat $BUSYBOX_KLOGD_PID` + kill -QUIT $(cat $BUSYBOX_KLOGD_PID) rm -f $BUSYBOX_KLOGD_PID fi }
--- a/core/busybox/busybox.mdev Thu Aug 29 20:33:00 2019 +0200 +++ b/core/busybox/busybox.mdev Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/busybox.mdev -- run control script for busybox mdev # @@ -42,7 +42,7 @@ if grep -q mdev /proc/sys/kernel/hotplug > /dev/null 2>&1; then echo "busybox mdev is enabled" else - echo "busybox mdev is not running" + echo "busybox mdev is not enabled" fi }
--- a/core/busybox/busybox.syslogd Thu Aug 29 20:33:00 2019 +0200 +++ b/core/busybox/busybox.syslogd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/busybox.syslogd -- run control script for busybox syslogd # @@ -27,14 +27,18 @@ busybox_syslogd_start() { - echo "Starting busybox syslogd: $BUSYBOX_SYSLOGD_CMD syslogd $BUSYBOX_SYSLOGD_ARGS" - $BUSYBOX_SYSLOGD_CMD syslogd $BUSYBOX_SYSLOGD_ARGS + if [ -s $BUSYBOX_SYSLOGD_PID ]; then + echo "busybox syslogd is already running with pid: $(cat $BUSYBOX_SYSLOGD_PID)" + else + echo "Starting busybox syslogd: $BUSYBOX_SYSLOGD_CMD syslogd $BUSYBOX_SYSLOGD_ARGS" + $BUSYBOX_SYSLOGD_CMD syslogd $BUSYBOX_SYSLOGD_ARGS + fi } busybox_syslogd_status() { if [ -s $BUSYBOX_SYSLOGD_PID ]; then - echo "busybox syslogd is running with pid: `cat $BUSYBOX_SYSLOGD_PID`" + echo "busybox syslogd is running with pid: $(cat $BUSYBOX_SYSLOGD_PID)" else echo "busybox syslogd is not running" fi @@ -44,7 +48,7 @@ { if [ -s $BUSYBOX_SYSLOGD_PID ]; then echo "Stopping busybox syslogd." - kill -QUIT `cat $BUSYBOX_SYSLOGD_PID` + kill -QUIT $(cat $BUSYBOX_SYSLOGD_PID) rm -f $BUSYBOX_SYSLOGD_PID fi }
--- a/core/dcron/dcron Thu Aug 29 20:33:00 2019 +0200 +++ b/core/dcron/dcron Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/dcron -- run control script for dcron # @@ -28,8 +28,12 @@ dcron_start() { - echo "Starting dcron: $DCRON_CMD $DCRON_ARGS" - $DCRON_CMD $DCRON_ARGS + if [ -n $PID ]; then + echo "dcron is already running with pid: $PID" + else + echo "Starting dcron: $DCRON_CMD $DCRON_ARGS" + $DCRON_CMD $DCRON_ARGS + fi } dcron_status()
--- a/core/eudev/udevd Thu Aug 29 20:33:00 2019 +0200 +++ b/core/eudev/udevd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/udevd -- run control script for eudev # @@ -24,21 +24,25 @@ : ${UDEVD_CMD:=/bin/udevd} : ${UDEVD_ARGS:=--daemon} +PID=$(pidof /bin/udevd) + udevd_start() { - echo "Starting udevd: $UDEVD_CMD $UDEVD_ARGS" - $UDEVD_CMD $UDEVD_ARGS + if [ -n "$PID" ]; then + echo "udevd is already running with pid: $PID" + else + echo "Starting udevd: $UDEVD_CMD $UDEVD_ARGS" + $UDEVD_CMD $UDEVD_ARGS - /bin/udevadm trigger --type=subsystems --action=add - /bin/udevadm trigger --type=devices --action=add + /bin/udevadm trigger --type=subsystems --action=add + /bin/udevadm trigger --type=devices --action=add + fi } udevd_status() { - pid=$(/bin/pidof udevd) - - if [ -n "$pid" ]; then - echo "udevd is running with pid: $pid" + if [ -n "$PID" ]; then + echo "udevd is running with pid: $PID" else echo "udevd is not running" fi @@ -46,9 +50,7 @@ udevd_stop() { - pid=$(/bin/pidof udevd) - - if [ -n "$pid" ]; then + if [ -n "$PID" ]; then echo "Stopping udevd." /bin/udevadm control --exit fi
--- a/core/sysklogd/sysklogd Thu Aug 29 20:33:00 2019 +0200 +++ b/core/sysklogd/sysklogd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/sysklogd -- run control script for sysklogd # @@ -18,7 +18,7 @@ # if [ -f /etc/rc.conf ]; then - source /etc/rc.conf + . /etc/rc.conf fi : ${SYSKLOGD_CMD:=/bin/syslogd} @@ -27,8 +27,12 @@ sysklogd_start() { - echo "Starting sysklogd: $SYSKLOGD_CMD $SYSKLOGD_ARGS" - $SYSKLOGD_CMD $SYSKLOGD_ARGS + if [ -s $SYSKLOGD_PID ]; then + echo "sysklogd is already running with pid: $(cat $SYSKLOGD_PID)" + else + echo "Starting sysklogd: $SYSKLOGD_CMD $SYSKLOGD_ARGS" + $SYSKLOGD_CMD $SYSKLOGD_ARGS + fi } sysklogd_status()
--- a/dns/avahi/avahi Thu Aug 29 20:33:00 2019 +0200 +++ b/dns/avahi/avahi Thu Aug 29 20:34:00 2019 +0200 @@ -27,8 +27,12 @@ avahi_start() { - echo "Starting avahi: $AVAHI_CMD $AVAHI_ARGS" - $AVAHI_CMD $AVAHI_ARGS + if [ -s $AVAHI_PID ]; then + echo "avahi is already running with pid: $(cat $AVAHI_PID)" + else + echo "Starting avahi: $AVAHI_CMD $AVAHI_ARGS" + $AVAHI_CMD $AVAHI_ARGS + fi } avahi_status()
--- a/network/dbus/dbus Thu Aug 29 20:33:00 2019 +0200 +++ b/network/dbus/dbus Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/dbus -- run control script for dbus # @@ -18,7 +18,7 @@ # if [ -f /etc/rc.conf ]; then - source /etc/rc.conf + . /etc/rc.conf fi : ${DBUS_CMD:=/bin/dbus-daemon} @@ -27,14 +27,18 @@ dbus_start() { - echo "Starting dbus: $DBUS_CMD $DBUS_ARGS" - $DBUS_CMD $DBUS_ARGS + if [ -s $DBUS_PID ]; then + echo "dbus is already running with pid: $(cat $DBUS_PID)" + else + echo "Starting dbus: $DBUS_CMD $DBUS_ARGS" + $DBUS_CMD $DBUS_ARGS + fi } dbus_status() { if [ -s $DBUS_PID ]; then - echo "dbus is running with pid: `cat $DBUS_PID`" + echo "dbus is running with pid: $(cat $DBUS_PID)" else echo "dbus is not running" fi @@ -44,7 +48,7 @@ { if [ -s $DBUS_PID ]; then echo "Stopping dbus." - kill -QUIT `cat $DBUS_PID` + kill -QUIT $(cat $DBUS_PID) rm -f $DBUS_PID fi }
--- a/network/dbus/dbus.sh Thu Aug 29 20:33:00 2019 +0200 +++ b/network/dbus/dbus.sh Thu Aug 29 20:34:00 2019 +0200 @@ -24,7 +24,7 @@ PKGUIDS="messagebus:100" PKGGIDS="messagebus:100" PKGOPTIONS="SELINUX X" -PKGPROTECT="/etc/rc.d/dbus" +PKGPROTECT="etc/rc.d/dbus" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/network/dhcpcd/dhcpcd Thu Aug 29 20:33:00 2019 +0200 +++ b/network/dhcpcd/dhcpcd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/dhcpcd -- run control script for dhcpcd # @@ -27,14 +27,18 @@ dhcpcd_start() { - echo "Starting dhcpcd: $DHCPCD_CMD $DHCPCD_ARGS" - $DHCPCD_CMD $DHCPCD_ARGS + if [ -s $DHCPCD_PID ]; then + echo "dhcpcd is already running with pid: $(cat $DHCPCD_PID)" + else + echo "Starting dhcpcd: $DHCPCD_CMD $DHCPCD_ARGS" + $DHCPCD_CMD $DHCPCD_ARGS + fi } dhcpcd_status() { if [ -s $DHCPCD_PID ]; then - echo "dhcpcd is running with pid: `cat $DHCPCD_PID`" + echo "dhcpcd is running with pid: $(cat $DHCPCD_PID)" else echo "dhcpcd is not running" fi @@ -44,7 +48,7 @@ { if [ -s $DHCPCD_PID ]; then echo "Stopping dhcpcd." - $DHCPCD_CMD -x + kill -QUIT $(cat $DHCPCD_PID) fi }
--- a/network/openssh/sshd Thu Aug 29 20:33:00 2019 +0200 +++ b/network/openssh/sshd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/sshd -- run control script for sshd # @@ -40,14 +40,18 @@ /bin/ssh-keygen -q -t ed25519 -N "" -f /etc/ssh/ssh_host_ed25519_key fi - echo "Starting sshd: $SSHD_CMD $SSHD_ARGS" - $SSHD_CMD $SSHD_ARGS -p $SSHD_PID + if [ -s $SSHD_PID ]; then + echo "sshd is already running with pid: $(cat $SSHD_PID)" + else + echo "Starting sshd: $SSHD_CMD $SSHD_ARGS" + $SSHD_CMD $SSHD_ARGS -p $SSHD_PID + fi } sshd_status() { if [ -s $SSHD_PID ]; then - echo "sshd is running with pid: `cat $SSHD_PID`" + echo "sshd is running with pid: $(cat $SSHD_PID)" else echo "sshd is not running" fi @@ -57,7 +61,7 @@ { if [ -s $SSHD_PID ]; then echo "Stopping sshd." - kill -QUIT $SSHD_PID + kill -QUIT $(cat $SSHD_PID) fi }
--- a/print/cups/cupsd Thu Aug 29 20:33:00 2019 +0200 +++ b/print/cups/cupsd Thu Aug 29 20:34:00 2019 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/busybox sh # # /etc/rc.d/cupsd -- run control script for cupsd # @@ -21,20 +21,24 @@ . /etc/rc.conf fi -: ${TEMPLATE_CMD:=/bin/cupsd} -: ${TEMPLATE_ARGS:=} -: ${TEMPLATE_PID:=/var/run/cups/cupsd.pid} +: ${CUPSD_CMD:=/bin/cupsd} +: ${CUPSD_ARGS:=} +: ${CUPSD_PID:=/var/run/cups/cupsd.pid} cupsd_start() { - echo "Starting cupsd: $TEMPLATE_CMD $TEMPLATE_ARGS" - $TEMPLATE_CMD $TEMPLATE_ARGS -p $TEMPLATE_PID + if [ -s $CUPSD_PID ]; then + echo "cupsd is already running with pid: $(cat $CUPSD_PID)" + else + echo "Starting cupsd: $CUPSD_CMD $CUPSD_ARGS" + $CUPSD_CMD $CUPSD_ARGS -p $CUPSD_PID + fi } cupsd_status() { - if [ -s $TEMPLATE_PID ]; then - echo "cupsd is running with pid: $(cat $TEMPLATE_PID)" + if [ -s $CUPSD_PID ]; then + echo "cupsd is running with pid: $(cat $CUPSD_PID)" else echo "cupsd is not running" fi @@ -42,9 +46,9 @@ cupsd_stop() { - if [ -s $TEMPLATE_PID ]; then + if [ -s $CUPSD_PID ]; then echo "Stopping cupsd." - kill -QUIT $(cat $TEMPLATE_PID) + kill -QUIT $(cat $CUPSD_PID) fi }
--- a/system/acpid/acpid Thu Aug 29 20:33:00 2019 +0200 +++ b/system/acpid/acpid Thu Aug 29 20:34:00 2019 +0200 @@ -22,19 +22,23 @@ fi : ${ACPID_CMD:=/bin/acpid} -: ${ACPID_ARGS:=--netlink} +: ${ACPID_ARGS:=} : ${ACPID_PID:=/var/run/acpid.pid} acpid_start() { - echo "Starting acpid: $ACPID_CMD $ACPID_ARGS" - $ACPID_CMD $ACPID_ARGS -p $ACPID_PID + if [ -s $ACPID_PID ]; then + echo "acpid is already running with pid: $(cat $ACPID_PID)" + else + echo "Starting acpid: $ACPID_CMD $ACPID_ARGS" + $ACPID_CMD $ACPID_ARGS -p $ACPID_PID + fi } acpid_status() { if [ -s $ACPID_PID ]; then - echo "acpid is running with pid: `cat $ACPID_PID`" + echo "acpid is running with pid: $(cat $ACPID_PID)" else echo "acpid is not running" fi @@ -43,8 +47,8 @@ acpid_stop() { if [ -s $ACPID_PID ]; then - echo "Stopping acpid..." - kill -QUIT $ACPID_PID + echo "Stopping acpid." + kill -QUIT $(cat $ACPID_PID) fi }
--- a/system/acpid/acpid.sh Thu Aug 29 20:33:00 2019 +0200 +++ b/system/acpid/acpid.sh Thu Aug 29 20:34:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="daemon for ACPI and netlink events" PKGDOWNLOAD="https://downloads.sourceforge.net/sourceforge/acpid2/$PKGNAME-$PKGVERSION.tar.xz" +PKGPROTECT="etc/rc.d/acpid" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/system/smartmontools/smartd Thu Aug 29 20:33:00 2019 +0200 +++ b/system/smartmontools/smartd Thu Aug 29 20:34:00 2019 +0200 @@ -27,14 +27,18 @@ smartd_start() { - echo "Starting smartd: $SMARTD_CMD $SMARTD_ARGS" - $SMARTD_CMD $SMARTD_ARGS -p $SMARTD_PID + if [ -s $SMARTD_PID ]; then + echo "smartd is already running with pid: $(cat $SMARTD_PID)" + else + echo "Starting smartd: $SMARTD_CMD $SMARTD_ARGS" + $SMARTD_CMD $SMARTD_ARGS -p $SMARTD_PID + fi } smartd_status() { if [ -s $SMARTD_PID ]; then - echo "smartd is running with pid: `cat $SMARTD_PID`" + echo "smartd is running with pid: $(cat $SMARTD_PID)" else echo "smartd is not running" fi
--- a/system/smartmontools/smartmontools.sh Thu Aug 29 20:33:00 2019 +0200 +++ b/system/smartmontools/smartmontools.sh Thu Aug 29 20:34:00 2019 +0200 @@ -22,7 +22,8 @@ PKGSUMMARY="utilities to control and monitor SMART on hard drives" PKGDOWNLOAD="https://downloads.sourceforge.net/sourceforge/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" PKGOPTIONS="SELINUX" -PKGPROTECT="etc/smartd.conf +PKGPROTECT="etc/rc.d/smartd + etc/smartd.conf etc/smartd_warning.sh" : ${CHOST:=$(uname -m)-linux-musl}