Przeglądaj źródła

pkg: rpm, alpine - switch from deprecated /var/run to /run

  The FHS 3.0 [F] has deprecated /var/run in favor of /run. Current
  distributions have done so for a long time (for example in Debian
  since 6.0 “squeeze”), even though they provide a compatibility
  symlink from /var/run to /run. But software like systemd have
  started emitting warnings when using /var/run, for example for
  its PIDFile directive, which pollutes the logs.
Guillem Jover 5 lat temu
rodzic
commit
475a54cb04

+ 2 - 2
pkg/kamailio/alpine/APKBUILD

@@ -290,7 +290,7 @@ prepare() {
 	cd "$builddir"
 
 	cd utils/kamctl/
-	sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \
+	sed -i -e 's:/run/kamailio.pid:/run/kamailio/kamailio.pid:g' \
 		kamctl.base kamctlrc || return 1
 	# we actually dont need bash
 	sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl \
@@ -318,7 +318,7 @@ package() {
 	make  FREERADIUS=1 -j1 install || return 1
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -d -o kamailio "$pkgdir"/var/run/kamailio
+	install -d -o kamailio "$pkgdir"/run/kamailio
 }
 
 _mv_mod() {

+ 2 - 2
pkg/kamailio/alpine/kamailio.initd

@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 daemon=/usr/sbin/kamailio
-pidfile=/var/run/kamailio/kamailio.pid
+pidfile=/run/kamailio/kamailio.pid
 
 extra_started_commands="reload"
 
@@ -12,7 +12,7 @@ depend() {
 
 start() {
 	ebegin "Starting Kamailio"
-	checkpath -d -o kamailio:kamailio /var/run/kamailio
+	checkpath -d -o kamailio:kamailio /run/kamailio
 	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
 		-- \
 		-u ${KAMAILIO_USER:-kamailio} \

+ 4 - 4
pkg/kamailio/obs/kamailio.init

@@ -6,7 +6,7 @@
 # description: Kamailio (OpenSER) - the Open Source SIP Server
 #
 # processname: kamailio
-# pidfile: /var/run/kamailio.pid
+# pidfile: /run/kamailio.pid
 # config: /etc/kamailio/kamailio.cfg
 #
 ### BEGIN INIT INFO
@@ -23,8 +23,8 @@
 KAM=/usr/sbin/kamailio
 KAMCFG=/etc/kamailio/kamailio.cfg
 PROG=kamailio
-HOMEDIR=/var/run/$PROG
-PID_FILE=/var/run/$PROG/kamailio.pid
+HOMEDIR=/run/$PROG
+PID_FILE=/run/$PROG/kamailio.pid
 LOCK_FILE=/var/lock/subsys/kamailio
 RETVAL=0
 DEFAULTS=/etc/sysconfig/kamailio
@@ -102,7 +102,7 @@ if test "$DUMP_CORE" = "yes" ; then
     echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern
 fi
 
-# /var/run can be a tmpfs
+# /run can be a tmpfs
 if [ ! -d $HOMEDIR ]; then
     mkdir -p $HOMEDIR
 	chown ${USER}:${GROUP} $HOMEDIR

+ 1 - 1
pkg/kamailio/obs/kamailio.service

@@ -11,7 +11,7 @@ Environment='CFGFILE=/etc/kamailio/kamailio.cfg'
 Environment='SHM_MEMORY=64'
 Environment='PKG_MEMORY=4'
 EnvironmentFile=-/etc/sysconfig/kamailio
-ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY
+ExecStart=/usr/sbin/kamailio -DD -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY
 Restart=on-failure
 
 [Install]

+ 2 - 2
pkg/kamailio/openbsd/patches/patch-scripts_kamctlrc

@@ -4,8 +4,8 @@ $OpenBSD$
 @@ -135,7 +135,7 @@
  
  ## OPENSER START Options
- ## PID file path - default is: /var/run/kamailio.pid
--# PID_FILE=/var/run/kamailio.pid
+ ## PID file path - default is: /run/kamailio.pid
+-# PID_FILE=/run/kamailio.pid
 +PID_FILE=/var/kamailio/kamailio.pid
  
  ## Extra start options - default is: not set

+ 2 - 2
pkg/kamailio/oracle/el6/kamailio.init

@@ -6,7 +6,7 @@
 # description: Kamailio is a fast SIP Server.
 #
 # processname: kamailio
-# pidfile: /var/run/kamailio.pid
+# pidfile: /run/kamailio.pid
 # config: /etc/kamailio/kamailio.cfg
 
 # Source function library.
@@ -15,7 +15,7 @@
 KAM=/usr/sbin/kamailio
 KAMCFG=/etc/kamailio/kamailio.cfg
 PROG=kamailio
-PID_FILE=/var/run/kamailio.pid
+PID_FILE=/run/kamailio.pid
 LOCK_FILE=/var/lock/subsys/kamailio
 RETVAL=0
 DEFAULTS=/etc/default/kamailio

+ 2 - 2
pkg/kamailio/oracle/el7/kamailio.service

@@ -5,8 +5,8 @@ After=syslog.target network-online.target auditd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/kamailio
-ExecStartPre=/usr/bin/mkdir -m=2770 -p /var/run/kamailio
-ExecStartPre=/usr/bin/chown kamailio:kamailio /var/run/kamailio
+ExecStartPre=/usr/bin/mkdir -m=2770 -p /run/kamailio
+ExecStartPre=/usr/bin/chown kamailio:kamailio /run/kamailio
 ExecStart=/usr/sbin/kamailio -f $CFG_FILE -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=control-group

+ 1 - 1
pkg/kamailio/oracle/el7/kamailio.sysconfig

@@ -31,6 +31,6 @@ DUMP_CORE=no
 
 CFG_FILE=/etc/kamailio/kamailio.cfg
 
-PID_FILE=/var/run/kamailio/kamailio.pid
+PID_FILE=/run/kamailio/kamailio.pid
 
 LOCK_FILE=/var/lock/subsys/kamailio

+ 1 - 1
pkg/kamailio/oracle/kamailio.logrotate

@@ -2,6 +2,6 @@
 {
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+	/bin/kill -HUP `cat /run/syslogd.pid 2> /dev/null` 2> /dev/null || true
     endscript
 }