Changeset 38122


Ignore:
Timestamp:
2013-09-22T19:41:58+02:00 (4 years ago)
Author:
tripolar
Message:

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

Signed-off-by: Peter Wagner <tripolar@…>

Location:
packages
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/openssh/Makefile

    r36747 r38122  
    1010PKG_NAME:=openssh 
    1111PKG_VERSION:=6.2p2 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • packages/net/openssh/files/sshd.init

    r32896 r38122  
    55STOP=50 
    66 
    7 SERVICE_USE_PID=1 
     7USE_PROCD=1 
     8PROG=/usr/sbin/sshd 
    89 
    9 start() { 
     10start_service() { 
    1011        for type in rsa dsa; do { 
    1112                # check for keys 
     
    2122        group_exists sshd 22 || group_add sshd 22  
    2223        mkdir -m 0700 -p /var/empty 
    23         service_start /usr/sbin/sshd 
    24 } 
    2524 
    26 stop() { 
    27         service_stop /usr/sbin/sshd 
     25        procd_open_instance 
     26        procd_set_param command $PROG -D 
     27        procd_close_instance 
    2828} 
    2929 
  • packages/sound/pulseaudio/Makefile

    r38045 r38122  
    1010PKG_NAME:=pulseaudio 
    1111PKG_VERSION:=4.0 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=4 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
  • packages/sound/pulseaudio/files/pulseaudio.init

    r38045 r38122  
    22# Copyright (C) 2011 OpenWrt.org 
    33 
    4 START=65 
    5 STOP=65 
     4START=99 
     5STOP=60 
    66 
    7 SERVICE_USE_PID=1 
    8 SERVICE_PID_FILE=/var/run/pulse/pid 
     7USE_PROCD=1 
     8PROG=/usr/bin/pulseaudio 
    99 
    10 start() { 
     10start_service() { 
    1111        user_exists pulse 51 || user_add pulse 51 
    1212        group_exists pulse 51 || group_add pulse 51 
     
    2121                chown pulse:pulse /var/lib/pulse 
    2222        } 
     23 
    2324        chown root:pulse /dev/snd/* /dev/mixer /dev/dsp 
    2425        chmod 664 /dev/snd/* /dev/mixer /dev/dsp 
    2526 
    26         service_start /usr/bin/pulseaudio --daemonize --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 
     27        procd_open_instance 
     28        procd_set_param command $PROG --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false 
     29        procd_close_instance 
    2730} 
    2831 
    29 stop() { 
    30         service_stop /usr/bin/pulseaudio 
    31 } 
Note: See TracChangeset for help on using the changeset viewer.