[pkg-wpa-devel] r978 - in /wpasupplicant/trunk/debian: README.modes changelog ifupdown/functions.sh ifupdown/ifupdown.sh ifupdown/wpa_action.8 ifupdown/wpa_action.sh wpasupplicant.wpa_action.logrotate wpasupplicant.wpa_supplicant.logrotate
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jan 2 04:36:49 UTC 2008
Author: kelmo-guest
Date: Wed Jan 2 04:36:49 2008
New Revision: 978
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=978
Log:
* wpa_action now logs to an interface specific logfile, and the logrotate
rule was updated to take care of both the old and new locations.
* Update copyright headers of ifupdown scripts, also add a few more code
comments, a statement of purpose and package ownership as well as some
other trivial cleanups.
Modified:
wpasupplicant/trunk/debian/README.modes
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/ifupdown/functions.sh
wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
wpasupplicant/trunk/debian/ifupdown/wpa_action.8
wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
wpasupplicant/trunk/debian/wpasupplicant.wpa_action.logrotate
wpasupplicant/trunk/debian/wpasupplicant.wpa_supplicant.logrotate
Modified: wpasupplicant/trunk/debian/README.modes
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.modes?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/README.modes (original)
+++ wpasupplicant/trunk/debian/README.modes Wed Jan 2 04:36:49 2008
@@ -351,8 +351,8 @@
wpa_supplicant associates and de-associates with the network associated
to it by the 'id_str' option used in the wpa_supplicant.conf configuration file.
-A log of /sbin/wpa_action's actions is created at /var/log/wpa_action.log,
-please attach the log when reporting problems.
+A log of /sbin/wpa_action's actions is created at
+/var/log/wpa_action.$IFACE.log, please attach the log when reporting problems.
Interacting with wpa_supplicant with wpa_cli and wpa_gui
========================================================
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jan 2 04:36:49 2008
@@ -56,8 +56,13 @@
* Build the wpa_gui-qt4 variant now that it doesn't require qt3 support
code. It also closes all child windows on File->Exit. (Closes: #426924)
* wpasupplicant now Suggests wpagui.
-
- -- Kel Modderman <kel at otaku42.de> Wed, 02 Jan 2008 13:09:08 +1000
+ * wpa_action now logs to an interface specific logfile, and the logrotate
+ rule was updated to take care of both the old and new locations.
+ * Update copyright headers of ifupdown scripts, also add a few more code
+ comments, a statement of purpose and package ownership as well as some
+ other trivial cleanups.
+
+ -- Kel Modderman <kel at otaku42.de> Wed, 02 Jan 2008 14:34:41 +1000
wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Wed Jan 2 04:36:49 2008
@@ -1,6 +1,16 @@
#!/bin/sh
-# Copyright (C) 2006 Debian/Ubuntu wpasupplicant Maintainers
+#####################################################################
+## Purpose
+# This file contains common shell functions used by scripts of the
+# wpasupplicant package to allow ifupdown to manage wpa_supplicant.
+# It also contains some functions used by wpa_action(8) that allow
+# ifupdown to be managed by wpa_cli(8) action events.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
@@ -28,7 +38,7 @@
WPA_CLI_BIN="/sbin/wpa_cli"
WPA_CLI_PNAME="wpa_cli"
WPA_CLI_PIDFILE="/var/run/wpa_action.${WPA_IFACE}.pid"
-WPA_CLI_LOGFILE="/var/log/wpa_action.log"
+WPA_CLI_LOGFILE="/var/log/wpa_action.${WPA_IFACE}.log"
WPA_CLI_TIMESTAMP="/var/run/wpa_action.${WPA_IFACE}.timestamp"
# default ctrl_interface socket directory
@@ -48,12 +58,14 @@
#####################################################################
## wpa_cli wrapper
# Path to common ctrl_interface socket and iface supplied.
-# NB: WPA_CTRL_DIR cannot be used for interactive commands.
+# NB: WPA_CTRL_DIR cannot be used for interactive commands, it is
+# set only in the environment that wpa_cli provides when processing
+# action events.
#
wpa_cli () {
- $WPA_CLI_BIN -p $WPA_CTRL_DIR -i $WPA_IFACE "$@"
-
- return $?
+ "$WPA_CLI_BIN" -p "$WPA_CTRL_DIR" -i "$WPA_IFACE" "$@"
+
+ return "$?"
}
#####################################################################
@@ -72,7 +84,6 @@
# NB: when called by wpa_action, there is no redirection (verbose)
#
wpa_msg () {
-
if [ -n "$WPA_ACTION" ]; then
shift
echo "wpa_action: $@"
@@ -159,6 +170,7 @@
# -c configuration file
# -W wait for wpa_cli to attach to ctrl_interface socket
# -b bridge interface name
+# -f path to log file
#
init_wpa_supplicant () {
if [ -n "$WPA_SUP_CONF" ]; then
@@ -251,7 +263,6 @@
#
kill_wpa_supplicant () {
if test_wpa_supplicant; then
-
wpa_msg verbose "terminating $WPA_SUP_PNAME daemon via pidfile $WPA_SUP_PIDFILE"
start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
@@ -322,7 +333,6 @@
#
kill_wpa_cli () {
if test_wpa_cli; then
-
wpa_msg verbose "terminating $WPA_CLI_PNAME daemon via pidfile $WPA_CLI_PIDFILE"
start-stop-daemon --stop --oknodo $DAEMON_VERBOSITY \
@@ -771,7 +781,7 @@
#####################################################################
## hysteresis checking
# Networking tools such as dhcp clients used with ifupdown can
-# synthesize artificial ACTION events, particuarly just after a
+# synthesize artificial ACTION events, particuarly just after a
# DISCONNECTED/CONNECTED events are experienced in quick succession.
# This can lead to infinite event loops, and in extreme cases has the
# potential to cause system instability.
Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Wed Jan 2 04:36:49 2008
@@ -1,6 +1,18 @@
#!/bin/sh
-# Copyright (C) 2006 Debian/Ubuntu wpasupplicant Maintainers
+#####################################################################
+## Purpose
+# This file is executed by ifupdown in pre-up, post-up, pre-down and
+# post-down phases of network interface configuration. It allows
+# ifup(8), and ifdown(8) to manage wpa_supplicant(8) and wpa_cli(8)
+# processes running in daemon mode.
+#
+# /etc/wpa_supplicant/functions.sh is sourced by this file.
+#
+# This file is provided by the wpasupplicant package.
+
+#####################################################################
+# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action.8
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action.8?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action.8 (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action.8 Wed Jan 2 04:36:49 2008
@@ -35,7 +35,7 @@
\fBCONNECTED\fR
\fBwpa_supplicant\fR has completed authentication.
\fBifup\fR \fIIFACE=WPA_ID_STR\fR is invoked and the action is logged to
-\fI/var/log/wpa_action.log\fR. Network settings for the \fILOGICAL\fR
+\fI/var/log/wpa_action.IFACE.log\fR. Network settings for the \fILOGICAL\fR
interface \fIWPA_ID_STR\fR are applied.
.TP
\fBDISCONNECTED\fR
@@ -127,7 +127,7 @@
.nf
iface eth1 inet manual
wpa-driver wext
- wpa-roam /path/to/wpa_supplicant.conf
+ wpa-roam /etc/wpa_supplicant/wpa_supplicant.conf
iface default inet dhcp
Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action.sh?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action.sh Wed Jan 2 04:36:49 2008
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2006 Debian/Ubuntu wpasupplicant Maintainers
+# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
Modified: wpasupplicant/trunk/debian/wpasupplicant.wpa_action.logrotate
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.wpa_action.logrotate?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.wpa_action.logrotate (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.wpa_action.logrotate Wed Jan 2 04:36:49 2008
@@ -1,4 +1,4 @@
-/var/log/wpa_action.log {
+/var/log/wpa_action.log /var/log/wpa_action.*.log {
rotate 5
daily
compress
Modified: wpasupplicant/trunk/debian/wpasupplicant.wpa_supplicant.logrotate
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.wpa_supplicant.logrotate?rev=978&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.wpa_supplicant.logrotate (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.wpa_supplicant.logrotate Wed Jan 2 04:36:49 2008
@@ -1,4 +1,4 @@
-/var/log/wpa_supplicant.*.log {
+/var/log/wpa_supplicant.log /var/log/wpa_supplicant.*.log {
rotate 5
daily
compress
More information about the Pkg-wpa-devel
mailing list