# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1400444647 0
# Node ID 0d8a1a3edc7202e79b432ba049c6d61e2cd90cc8
# Parent  9e29d794421488db7ecae466b5b6b76f606fcdeb
Create some /var/run/<dir> in /etc/init.d/<daemon> scritps

diff -r 9e29d7944214 -r 0d8a1a3edc72 c_icap/receipt
--- a/c_icap/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/c_icap/receipt	Sun May 18 20:24:07 2014 +0000
@@ -26,8 +26,7 @@
 {
 	mkdir -p $fs/usr/lib/$PACKAGE \
 		$fs/etc/init.d \
-		$fs/var/log/c-icap \
-		$fs/var/run/c-icap
+		$fs/var/log/c-icap
 						
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
diff -r 9e29d7944214 -r 0d8a1a3edc72 c_icap/stuff/c-icapd
--- a/c_icap/stuff/c-icapd	Sun May 18 19:16:29 2014 +0000
+++ b/c_icap/stuff/c-icapd	Sun May 18 20:24:07 2014 +0000
@@ -14,6 +14,7 @@
 OPTIONS=""
 PIDFILE=/var/run/c-icap/c-icap.pid
 
+[ -d /var/run/c-icap ] || mkdir -p /var/run/c-icap
 case "$1" in
   start)
     if active_pidfile $PIDFILE $NAME ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 distcc/receipt
--- a/distcc/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/distcc/receipt	Sun May 18 20:24:07 2014 +0000
@@ -34,7 +34,6 @@
 {
 	mkdir -p $fs/usr \
 		$fs/var/log/distccd \
-		$fs/var/run/distccd \
 		$fs/etc/init.d
 		
 	cp -a $install/usr/bin $fs/usr
@@ -55,8 +54,7 @@
 	fi
 	
 	# Fix perms for files and directories
-	chroot $1/ chown -R distcc.distcc /var/log/distccd \
-	  /var/run/distccd 
+	chroot $1/ chown -R distcc.distcc /var/log/distccd
 	  
 	cat <<EOF
 ----
diff -r 9e29d7944214 -r 0d8a1a3edc72 distcc/stuff/distccd
--- a/distcc/stuff/distccd	Sun May 18 19:16:29 2014 +0000
+++ b/distcc/stuff/distccd	Sun May 18 20:24:07 2014 +0000
@@ -28,6 +28,10 @@
 JOB=4
 OPTIONS="--daemon --verbose -j $JOB $ALLOW --pid-file $PIDFILE --log-file $LOGFILE"
 
+if [ ! -d /var/run/distccd ]; then
+	mkdir -p /var/run/distccd
+	chown distccd.distccd /var/run/distccd
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE distccd ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 dovecot/receipt
--- a/dovecot/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/dovecot/receipt	Sun May 18 20:24:07 2014 +0000
@@ -39,7 +39,6 @@
 {
 	mkdir -p $fs/usr/lib \
 		$fs/var/log/dovecot \
-		$fs/var/run/dovecot \
 		$fs/etc/ssl/misc
 		
 	
@@ -94,7 +93,6 @@
 
 	# Set perms for files and directories
 	chroot $1/ chown -R ${user}.${group} /var/log/${user} \
-		/var/run/${user} 
 
 	cat <<EOF
 ----
diff -r 9e29d7944214 -r 0d8a1a3edc72 dovecot/stuff/init.d/dovecot
--- a/dovecot/stuff/init.d/dovecot	Sun May 18 19:16:29 2014 +0000
+++ b/dovecot/stuff/init.d/dovecot	Sun May 18 20:24:07 2014 +0000
@@ -14,6 +14,10 @@
 OPTIONS=$dovecot_OPTIONS
 PIDFILE=/var/run/dovecot/master.pid
 
+if [ ! -d /var/run/dovecot ]; then
+	mkdir -p /var/run/dovecot
+	chown dovecot.dovecot /var/run/dovecot
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE dovecot ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 mariadb/receipt
--- a/mariadb/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/mariadb/receipt	Sun May 18 20:24:07 2014 +0000
@@ -90,9 +90,6 @@
 		status
 	fi
 
-	mkdir -p $1/var/run/mysqld
-	chroot $1/ chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld
-	
 	cat <<EOF
 ----
 To start $PACKAGE server you can run :
diff -r 9e29d7944214 -r 0d8a1a3edc72 mariadb/stuff/etc/init.d/mysql
--- a/mariadb/stuff/etc/init.d/mysql	Sun May 18 19:16:29 2014 +0000
+++ b/mariadb/stuff/etc/init.d/mysql	Sun May 18 20:24:07 2014 +0000
@@ -15,6 +15,10 @@
 PIDFILE=/var/run/mysqld/mysql.pid
 [ -n "$OPTIONS" ] || OPTIONS="--pid-file=$PIDFILE --datadir=/var/lib/mysql --user=mysql --socket=/var/run/mysqld/mysqld.sock"
 
+if [ ! -d /var/lib/mysql ]; then
+	mkdir -p /var/lib/mysql
+	chown mysql.mysql /var/lib/mysql
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE mysqld ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 mysql/receipt
--- a/mysql/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/mysql/receipt	Sun May 18 20:24:07 2014 +0000
@@ -115,8 +115,7 @@
 		status
 	fi
 	#chroot $1/ /bin/chown ${user}.${group} $(cat $1/$INSTALLED/$PACKAGE/files.list)
-	mkdir -p $1/var/run/mysqld 2> /dev/null
-	chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql /var/run/mysqld
+	chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql
 	chroot "$1/" mysql_install_db --user=${user} --basedir=/usr
 	cat <<EOF
 ----
diff -r 9e29d7944214 -r 0d8a1a3edc72 mysql/stuff/etc/init.d/mysql
--- a/mysql/stuff/etc/init.d/mysql	Sun May 18 19:16:29 2014 +0000
+++ b/mysql/stuff/etc/init.d/mysql	Sun May 18 20:24:07 2014 +0000
@@ -15,6 +15,10 @@
 PIDFILE=/var/run/mysqld/mysql.pid
 [ -n "$OPTIONS" ] || OPTIONS="--pid-file=$PIDFILE --datadir=/var/lib/mysql --user=mysql --socket=/var/run/mysqld/mysqld.sock"
 
+if [ ! -d /var/lib/mysql ]; then
+	mkdir -p /var/lib/mysql
+	chown mysql.mysql /var/lib/mysql
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE mysqld ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 nagios-nrpe/receipt
--- a/nagios-nrpe/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/nagios-nrpe/receipt	Sun May 18 20:24:07 2014 +0000
@@ -46,8 +46,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/etc/nagios/objects \
-		$fs/etc/init.d \
-	 	$fs/var/run/nagios
+		$fs/etc/init.d
 	
 	cp -a $install/usr $fs
 	install -m 0644 $src/sample-config/nrpe.cfg $fs/etc/nagios
@@ -67,7 +66,7 @@
 	fi
 	
 	# Set perms for files and directories
-	chroot $1/ chown -R nagios.nagios /usr/lib/nagios/plugins  /var/run/nagios
+	chroot $1/ chown -R nagios.nagios /usr/lib/nagios/plugins
 	chroot $1/ chown  nagios.nagios /etc/nagios/* 
 	
 	# Add check_nrpe in nagios config file
diff -r 9e29d7944214 -r 0d8a1a3edc72 nagios-nrpe/stuff/nrpe
--- a/nagios-nrpe/stuff/nrpe	Sun May 18 19:16:29 2014 +0000
+++ b/nagios-nrpe/stuff/nrpe	Sun May 18 20:24:07 2014 +0000
@@ -15,6 +15,10 @@
 OPTIONS="-n -c $CONFIG_FILE -d"
 PIDFILE=/var/run/nagios/nrpe.pid
 
+if [ ! -d /var/run/nagios ]; then
+	mkdir -p /var/run/nagios
+	chown nagios.nagios /var/run/nagios
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE nrpe ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 nagios/receipt
--- a/nagios/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/nagios/receipt	Sun May 18 20:24:07 2014 +0000
@@ -59,7 +59,6 @@
 {
 	mkdir -p $fs/usr $fs/etc/init.d \
 	  $fs/var/lib/nagios/rw \
-	  $fs/var/run/nagios \
 	  $fs/var/log/nagios \
 	  $fs/var/spool/nagios/checkresults \
 	  $fs/etc/apache
@@ -94,7 +93,6 @@
 	
 	# Fix perms for files and directories
 	chroot $1/ chown -R nagios.nagios /var/log/nagios \
-	  /var/run/nagios \
 	  /var/spool/nagios \
 	  /var/lib/nagios \
 	  /usr/share/nagios \
diff -r 9e29d7944214 -r 0d8a1a3edc72 nagios/stuff/nagios
--- a/nagios/stuff/nagios	Sun May 18 19:16:29 2014 +0000
+++ b/nagios/stuff/nagios	Sun May 18 20:24:07 2014 +0000
@@ -20,6 +20,10 @@
 		$DAEMON -v $CONFIG_FILE
 }
 
+if [ ! -d /var/run/nagios ]; then
+	mkdir -p /var/run/nagios
+	chown nagios.nagios /var/run/nagios
+fi
 case "$1" in
   start)
     if active_pidfile $PIDFILE nagios ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 ndoutils/receipt
--- a/ndoutils/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/ndoutils/receipt	Sun May 18 20:24:07 2014 +0000
@@ -45,7 +45,6 @@
 {
 	mkdir -p $fs/usr/share/nagios/ndoutils \
 		$fs/etc/nagios \
-		$fs/var/run/nagios \
 		$fs/etc/mysql.d
 	
 	cp -a $install/usr/bin $fs/usr
@@ -86,7 +85,7 @@
 	
 	chroot $1/ chown nagios.nagios $fs/usr/lib/ndoutils/ndomod.o \
 	 $fs/etc/nagios/ndo2db.cfg $fs/etc/nagios/ndomod.cfg \
-	 $fs/var/run/nagios $fs/etc/nagios
+	 $fs/etc/nagios
 
 	sed -i "s/nagios/ndo2db nagios/" $1/etc/rcS.conf 
 	
diff -r 9e29d7944214 -r 0d8a1a3edc72 ndoutils/stuff/etc/init.d/ndo2db
--- a/ndoutils/stuff/etc/init.d/ndo2db	Sun May 18 19:16:29 2014 +0000
+++ b/ndoutils/stuff/etc/init.d/ndo2db	Sun May 18 20:24:07 2014 +0000
@@ -90,6 +90,10 @@
    exit 1
 fi
           
+if [ ! -d /var/run/nagios ]; then
+	mkdir -p /var/run/nagios
+	chown nagios.nagios /var/run/nagios
+fi
 # See how we were called.
 case "$1" in
 
diff -r 9e29d7944214 -r 0d8a1a3edc72 openerp-server/receipt
--- a/openerp-server/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/openerp-server/receipt	Sun May 18 20:24:07 2014 +0000
@@ -26,8 +26,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/var/run/openerp $fs/var/log/openerp
-	chmod 777 $fs/var/run/openerp $fs/var/log/openerp
+	mkdir -p $fs/usr $fs/var/log/openerp
+	chmod 777 $fs/var/log/openerp
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $stuff/* $fs
diff -r 9e29d7944214 -r 0d8a1a3edc72 openerp-server/stuff/etc/init.d/openerp-server
--- a/openerp-server/stuff/etc/init.d/openerp-server	Sun May 18 19:16:29 2014 +0000
+++ b/openerp-server/stuff/etc/init.d/openerp-server	Sun May 18 20:24:07 2014 +0000
@@ -23,6 +23,10 @@
 		OPTIONS="$OPTIONS -l $LANG"
 fi
 
+if [ ! -d /var/run/openerp ]; then
+	mkdir -p /var/run/openerp
+	chmod 777 /var/run/openerp
+fi
 case "$1" in
 	start)
 		if active_pidfile $PIDFILE python ; then
diff -r 9e29d7944214 -r 0d8a1a3edc72 openssh-pam/receipt
--- a/openssh-pam/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/openssh-pam/receipt	Sun May 18 20:24:07 2014 +0000
@@ -39,12 +39,6 @@
 	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
 }
 
-# Pre and post install commands for Tazpkg.
-pre_install()
-{
-       mkdir -p $1/var/run/sshd
-}        
-
 post_install()
 {
        [ "$1" ] || while read dropbear openssh ; do
@@ -57,9 +51,3 @@
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 EOT
 }
-
-# Pre and post remove commands for Tazpkg.
-post_remove()
-{
-       rm -fr $1/var/run/sshd
-}
diff -r 9e29d7944214 -r 0d8a1a3edc72 openssh/receipt
--- a/openssh/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/openssh/receipt	Sun May 18 20:24:07 2014 +0000
@@ -46,12 +46,6 @@
 		$fs/etc/ssh/sshd_config
 }
 
-# Pre and post install commands for Tazpkg.
-pre_install()
-{
-       mkdir -p $1/var/run/sshd
-}
-
 post_install()
 {
        [ "$1" ] || while read dropbear openssh ; do
@@ -64,10 +58,3 @@
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 EOT
 }
-
-# Pre and post remove commands for Tazpkg.
-post_remove()
-{
-       rm -fr $1/var/run/sshd
-}       
-
diff -r 9e29d7944214 -r 0d8a1a3edc72 openssh/stuff/openssh
--- a/openssh/stuff/openssh	Sun May 18 19:16:29 2014 +0000
+++ b/openssh/stuff/openssh	Sun May 18 20:24:07 2014 +0000
@@ -14,6 +14,7 @@
 OPTIONS=$OPENSSH_OPTIONS
 PIDFILE=/var/run/sshd.pid
 
+[ -d /var/run/sshd ] || mkdir -p /var/run/sshd
 case "$1" in
   start)
     # We need rsa and dsa host key file to start dropbear.
diff -r 9e29d7944214 -r 0d8a1a3edc72 openvpn/receipt
--- a/openvpn/receipt	Sun May 18 19:16:29 2014 +0000
+++ b/openvpn/receipt	Sun May 18 20:24:07 2014 +0000
@@ -39,15 +39,9 @@
 	chmod 0644 $fs/etc/openvpn/openvpn.conf
 }
 
-# Post install/remove commands for Tazpkg.
-post_install()
+post_remove()
 {
-	mkdir -p ${root}/var/run/openvpn
+	# remove config
+	rm -rf ${root}/etc/openvpn
 }
 
-post_remove()
-{
-	# remove config and pids
-	rm -rf ${root}/etc/openvpn ${root}/var/run/openvpn
-}
-
diff -r 9e29d7944214 -r 0d8a1a3edc72 openvpn/stuff/etc/init.d/openvpn-client
--- a/openvpn/stuff/etc/init.d/openvpn-client	Sun May 18 19:16:29 2014 +0000
+++ b/openvpn/stuff/etc/init.d/openvpn-client	Sun May 18 20:24:07 2014 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# /etc/init.d/rsyncd: Start, stop and restart Rsync deamon on SliTaz, at boot
+# /etc/init.d/openvpn-client: Start, stop and restart openvpn deamon on SliTaz, at boot
 # time or with the command line.
 #
 # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
@@ -12,7 +12,7 @@
 DESC="VPN daemon"
 DAEMON=/usr/sbin/openvpn
 OPTIONS=$OPENVPN_OPTIONS
-PIDFILE=/var/run/rsyncd.pid
+PIDFILE=/var/run/openvpni-client.pid
 
 checktundevice() {
 	if [ ! -e /dev/net/tun ]; then
@@ -28,6 +28,7 @@
 	fi
 }
 
+[ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn
 case "$1" in
   start)
     checktundevice
diff -r 9e29d7944214 -r 0d8a1a3edc72 openvpn/stuff/etc/init.d/openvpn-server
--- a/openvpn/stuff/etc/init.d/openvpn-server	Sun May 18 19:16:29 2014 +0000
+++ b/openvpn/stuff/etc/init.d/openvpn-server	Sun May 18 20:24:07 2014 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# /etc/init.d/rsyncd: Start, stop and restart Rsync deamon on SliTaz, at boot
+# /etc/init.d/openvpn-server: Start, stop and restart openvpn deamon on SliTaz, at boot
 # time or with the command line.
 #
 # To start daemon at boot time, just put the right name in the $RUN_DAEMONS
@@ -12,7 +12,7 @@
 DESC="VPN daemon"
 DAEMON=/usr/sbin/openvpn
 OPTIONS=$OPENVPN_OPTIONS
-PIDFILE=/var/run/rsyncd.pid
+PIDFILE=/var/run/openvpn-server.pid
 
 checktundevice() {
 	if [ ! -e /dev/net/tun ]; then
@@ -28,6 +28,7 @@
 	fi
 }
 
+[ -d /var/run/openvpn ] || mkdir -p /var/run/openvpn
 case "$1" in
   start)
     checktundevice
diff -r 9e29d7944214 -r 0d8a1a3edc72 samba/stuff/etc/init.d/samba
--- a/samba/stuff/etc/init.d/samba	Sun May 18 19:16:29 2014 +0000
+++ b/samba/stuff/etc/init.d/samba	Sun May 18 20:24:07 2014 +0000
@@ -15,6 +15,7 @@
 NMBPIDFILE=/var/run/samba/nmbd.pid
 SMBPIDFILE=/var/run/samba/smbd.pid
 
+[ -d /var/run/samba ] || mkdir -p /var/run/samba
 case "$1" in
   start)
     if active_pidfile $SMBPIDFILE smbd ; then