[pkg-wpa-devel] r1862 - in /wpa/trunk/debian: changelog examples/wpa-roam.conf hostapd.init ifupdown/action_wpa.sh ifupdown/functions.sh ifupdown/hostapd.sh ifupdown/wpa_action.8 patches/07_dbus_service_syslog.patch wpasupplicant.README.Debian
slh-guest at users.alioth.debian.org
slh-guest at users.alioth.debian.org
Sat Feb 22 21:31:13 UTC 2014
Author: slh-guest
Date: Sat Feb 22 21:31:13 2014
New Revision: 1862
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1862
Log:
migrate from /var/run/ to /run/.
Modified:
wpa/trunk/debian/changelog
wpa/trunk/debian/examples/wpa-roam.conf
wpa/trunk/debian/hostapd.init
wpa/trunk/debian/ifupdown/action_wpa.sh
wpa/trunk/debian/ifupdown/functions.sh
wpa/trunk/debian/ifupdown/hostapd.sh
wpa/trunk/debian/ifupdown/wpa_action.8
wpa/trunk/debian/patches/07_dbus_service_syslog.patch
wpa/trunk/debian/wpasupplicant.README.Debian
Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Sat Feb 22 21:31:13 2014
@@ -3,6 +3,7 @@
* NOT RELEASED YET
* drop pre-wheezy /lib/init/rw/sendsigs.omit.d/ migration support, invert the
according versioned initscripts dependency to a versioned breaks relation.
+ * migrate from /var/run/ to /run/.
-- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 21 Feb 2014 02:30:25 +0100
Modified: wpa/trunk/debian/examples/wpa-roam.conf
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/examples/wpa-roam.conf?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/examples/wpa-roam.conf (original)
+++ wpa/trunk/debian/examples/wpa-roam.conf Sat Feb 22 21:31:13 2014
@@ -35,7 +35,7 @@
# DIR= Path to UNIX socket control interface, mandatory for wpa-roam mode
# GROUP= Users in this group to control wpa_supplicant via wpa_cli/wpa_gui
#
-ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
#
######################## Network Block Configurations #########################
#
Modified: wpa/trunk/debian/hostapd.init
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/hostapd.init?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/hostapd.init (original)
+++ wpa/trunk/debian/hostapd.init Sat Feb 22 21:31:13 2014
@@ -19,7 +19,7 @@
DAEMON_CONF=
NAME=hostapd
DESC="advanced IEEE 802.11 management"
-PIDFILE=/var/run/hostapd.pid
+PIDFILE=/run/hostapd.pid
[ -x "$DAEMON_SBIN" ] || exit 0
[ -s "$DAEMON_DEFS" ] && . /etc/default/hostapd
Modified: wpa/trunk/debian/ifupdown/action_wpa.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/ifupdown/action_wpa.sh?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/ifupdown/action_wpa.sh (original)
+++ wpa/trunk/debian/ifupdown/action_wpa.sh Sat Feb 22 21:31:13 2014
@@ -34,10 +34,10 @@
;;
esac
-for CTRL in /var/run/wpa_supplicant/*; do
+for CTRL in /run/wpa_supplicant/*; do
[ -S "${CTRL}" ] || continue
- IFACE="${CTRL#/var/run/wpa_supplicant/}"
+ IFACE="${CTRL#/run/wpa_supplicant/}"
# skip if ifplugd is managing this interface
if [ "${IFPLUGD_IFACE}" = "${IFACE}" ]; then
Modified: wpa/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/ifupdown/functions.sh?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/ifupdown/functions.sh (original)
+++ wpa/trunk/debian/ifupdown/functions.sh Sat Feb 22 21:31:13 2014
@@ -31,20 +31,20 @@
# wpa_supplicant variables
WPA_SUP_BIN="/sbin/wpa_supplicant"
WPA_SUP_PNAME="wpa_supplicant"
-WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${WPA_IFACE}.pid"
+WPA_SUP_PIDFILE="/run/wpa_supplicant.${WPA_IFACE}.pid"
WPA_SUP_OMIT_DIR="/run/sendsigs.omit.d"
WPA_SUP_OMIT_PIDFILE="${WPA_SUP_OMIT_DIR}/wpasupplicant.wpa_supplicant.${WPA_IFACE}.pid"
# wpa_cli variables
WPA_CLI_BIN="/sbin/wpa_cli"
WPA_CLI_PNAME="wpa_cli"
-WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
-WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
-WPA_CLI_IFUPDOWN="/var/run/wpa_action.${WPA_IFACE}.ifupdown"
+WPA_CLI_PIDFILE="/run/wpa_action.${WPA_IFACE}.pid"
+WPA_CLI_TIMESTAMP="/run/wpa_action.${WPA_IFACE}.timestamp"
+WPA_CLI_IFUPDOWN="/run/wpa_action.${WPA_IFACE}.ifupdown"
# default ctrl_interface socket directory
if [ -z "$WPA_CTRL_DIR" ]; then
- WPA_CTRL_DIR="/var/run/wpa_supplicant"
+ WPA_CTRL_DIR="/run/wpa_supplicant"
fi
# verbosity variables
@@ -904,9 +904,9 @@
if [ -e /etc/network/run/ifstate ]; then
# debian's ifupdown
IFSTATE_FILE="/etc/network/run/ifstate"
- elif [ -e /var/run/network/ifstate ]; then
+ elif [ -e /run/network/ifstate ]; then
# ubuntu's
- IFSTATE_FILE="/var/run/network/ifstate"
+ IFSTATE_FILE="/run/network/ifstate"
else
unset IFSTATE_FILE
fi
Modified: wpa/trunk/debian/ifupdown/hostapd.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/ifupdown/hostapd.sh?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/ifupdown/hostapd.sh (original)
+++ wpa/trunk/debian/ifupdown/hostapd.sh Sat Feb 22 21:31:13 2014
@@ -30,7 +30,7 @@
HOSTAPD_BIN="/usr/sbin/hostapd"
HOSTAPD_PNAME="hostapd"
-HOSTAPD_PIDFILE="/var/run/hostapd.$IFACE.pid"
+HOSTAPD_PIDFILE="/run/hostapd.$IFACE.pid"
HOSTAPD_OMIT_PIDFILE="/run/sendsigs.omit.d/hostapd.$IFACE.pid"
if [ ! -x "$HOSTAPD_BIN" ]; then
Modified: wpa/trunk/debian/ifupdown/wpa_action.8
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/ifupdown/wpa_action.8?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/ifupdown/wpa_action.8 (original)
+++ wpa/trunk/debian/ifupdown/wpa_action.8 Sat Feb 22 21:31:13 2014
@@ -23,7 +23,7 @@
the following locations for their existance:
.nf
/etc/network/run/ifstate
- /var/run/network/ifstate
+ /run/network/ifstate
/etc/network/interfaces
.fi
.PP
Modified: wpa/trunk/debian/patches/07_dbus_service_syslog.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/patches/07_dbus_service_syslog.patch?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/patches/07_dbus_service_syslog.patch (original)
+++ wpa/trunk/debian/patches/07_dbus_service_syslog.patch Sat Feb 22 21:31:13 2014
@@ -10,7 +10,7 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=@BINDIR@/wpa_supplicant -u
-+Exec=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
++Exec=@BINDIR@/wpa_supplicant -u -s -O /run/wpa_supplicant
User=root
SystemdService=wpa_supplicant.service
--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
@@ -19,7 +19,7 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=@BINDIR@/wpa_supplicant -u
-+Exec=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
++Exec=@BINDIR@/wpa_supplicant -u -s -O /run/wpa_supplicant
User=root
SystemdService=wpa_supplicant.service
--- a/wpa_supplicant/systemd/wpa_supplicant.service.in
@@ -29,7 +29,7 @@
Type=dbus
BusName=fi.epitest.hostap.WPASupplicant
-ExecStart=@BINDIR@/wpa_supplicant -u
-+ExecStart=@BINDIR@/wpa_supplicant -u -s -O /var/run/wpa_supplicant
++ExecStart=@BINDIR@/wpa_supplicant -u -s -O /run/wpa_supplicant
[Install]
WantedBy=multi-user.target
Modified: wpa/trunk/debian/wpasupplicant.README.Debian
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/wpasupplicant.README.Debian?rev=1862&op=diff
==============================================================================
--- wpa/trunk/debian/wpasupplicant.README.Debian (original)
+++ wpa/trunk/debian/wpasupplicant.README.Debian Sat Feb 22 21:31:13 2014
@@ -345,7 +345,7 @@
# the default ctrl_interface option used in the example file
# /usr/share/doc/wpasupplicant/examples/wpa-roam.conf
- ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+ ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
To interact with the supplicant, the wpa_cli (command line) and wpa_gui (QT)
have been provided. With these you may connect, disconnect, add/delete new
More information about the Pkg-wpa-devel
mailing list