[pkg-wpa-devel] r1617 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Mon Sep 26 21:37:59 2011
New Revision: 1617

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1617
Log:
don't use /run/sendsigs.omit.d/ if it hasn't already been created by
mountkernfs.sh (e.g. when using systemd), thanks to Michael Biebl.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/functions.sh

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1617&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Sep 26 21:37:59 2011
@@ -32,10 +32,10 @@
   * add a dependency on ${misc:Depends} for the udeb package as well.
   * adapt debian/copyright to recent changes (r174) in DEP-5 and use the new
     anonscm URL.
-  * create /run/sendsigs.omit.d/, if it doesn't exist (systemd), thanks to
-    Michael Biebl.
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Fri, 16 Sep 2011 04:15:28 +0200
+  * don't use /run/sendsigs.omit.d/ if it hasn't already been created by
+    mountkernfs.sh (e.g. when using systemd), thanks to Michael Biebl.
+
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Mon, 26 Sep 2011 23:30:00 +0200
 
 wpasupplicant (0.7.3-3.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=1617&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Mon Sep 26 21:37:59 2011
@@ -286,9 +286,10 @@
 		WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
 		sleep 1
 	done
-	wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
-	[ -d "${WPA_SUP_OMIT_DIR}" ] || mkdir -p --mode=755 "${WPA_SUP_OMIT_DIR}"
-	cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	if [ -d "${WPA_SUP_OMIT_DIR}" ]; then
+		wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	fi
 
 	local WPA_SOCKET_WAIT
 	local MAX_WPA_SOCKET_WAIT
@@ -963,9 +964,10 @@
 		ifupdown_unlock
 	fi
 
-	wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
-	[ -d "${WPA_SUP_OMIT_DIR}" ] || mkdir -p --mode=755 "${WPA_SUP_OMIT_DIR}"
-	cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	if [ -d "${WPA_SUP_OMIT_DIR}" ]; then
+		wpa_msg log "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
+		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
+	fi
 
 	return "$IFUP_RETVAL"
 }