bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] openssh,pulseaudio: switch to new procd init script style

Browse Source 
Signed-off-by: Peter Wagner <tripolar@gmx.at>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@38122 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
tripolar
2013-09-22 17:41:58 +00:00
parent f72f50bac5
commit 27e9a415b1
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/openssh/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh PKG_NAME:=openssh
PKG_VERSION:=6.2p2 PKG_VERSION:=6.2p2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \

12
net/openssh/files/sshd.init
View File

@ -4,9 +4,10 @@
START=50 START=50
STOP=50 STOP=50
SERVICE_USE_PID=1 USE_PROCD=1
PROG=/usr/sbin/sshd
start() { start_service() {
for type in rsa dsa; do { for type in rsa dsa; do {
# check for keys # check for keys
key=/etc/ssh/ssh_host_${type}_key key=/etc/ssh/ssh_host_${type}_key
@ -20,11 +21,10 @@ start() {
user_exists sshd 22 || user_add sshd 22 22 sshd /var/empty user_exists sshd 22 || user_add sshd 22 22 sshd /var/empty
group_exists sshd 22 || group_add sshd 22 group_exists sshd 22 || group_add sshd 22
mkdir -m 0700 -p /var/empty mkdir -m 0700 -p /var/empty
service_start /usr/sbin/sshd
}
stop() { procd_open_instance
service_stop /usr/sbin/sshd procd_set_param command $PROG -D
procd_close_instance
} }
shutdown() { shutdown() {

2
sound/pulseaudio/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pulseaudio PKG_NAME:=pulseaudio
PKG_VERSION:=4.0 PKG_VERSION:=4.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/ PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/

18
sound/pulseaudio/files/pulseaudio.init
View File

@ -1,13 +1,13 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2011 OpenWrt.org # Copyright (C) 2011 OpenWrt.org
START=65 START=99
STOP=65 STOP=60
SERVICE_USE_PID=1 USE_PROCD=1
SERVICE_PID_FILE=/var/run/pulse/pid PROG=/usr/bin/pulseaudio
start() { start_service() {
user_exists pulse 51 || user_add pulse 51 user_exists pulse 51 || user_add pulse 51
group_exists pulse 51 || group_add pulse 51 group_exists pulse 51 || group_add pulse 51
[ -d /var/run/pulse ] || { [ -d /var/run/pulse ] || {
@ -20,12 +20,12 @@ start() {
chmod 0750 /var/lib/pulse chmod 0750 /var/lib/pulse
chown pulse:pulse /var/lib/pulse chown pulse:pulse /var/lib/pulse
} }
chown root:pulse /dev/snd/* /dev/mixer /dev/dsp chown root:pulse /dev/snd/* /dev/mixer /dev/dsp
chmod 664 /dev/snd/* /dev/mixer /dev/dsp chmod 664 /dev/snd/* /dev/mixer /dev/dsp
service_start /usr/bin/pulseaudio --daemonize --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 procd_open_instance
procd_set_param command $PROG --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false
procd_close_instance
} }
stop() {
service_stop /usr/bin/pulseaudio
}