diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-06-19 16:42:31 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-06-19 18:49:26 +0200 |
| commit | 877ef579f1f87bbd0b37bf768cf635fe4ed407f5 (patch) | |
| tree | bf27854f585ba05fb0a609453d45c4d23921dfb9 /src | |
| parent | f96b655276f572641cb58188b1a7a28df8b73e6c (diff) | |
| download | netctl-877ef579f1f87bbd0b37bf768cf635fe4ed407f5.tar.gz netctl-877ef579f1f87bbd0b37bf768cf635fe4ed407f5.tar.xz | |
Store wpa_supplicant configuration in /run/network instead of /tmp
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/8021x | 4 | ||||
| -rw-r--r-- | src/connections/wireless | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -97,11 +97,11 @@ wpa_supplicant_scan_info() { # Requires already loaded profile make_wpa_config_file() { local interface=$1 - local WPA_CONF="${TMPDIR:-/tmp}/wpa.${interface}" # substitute spaces out + local WPA_CONF="$STATE_DIR/wpa.${interface}" # substitute spaces out # make empty tmp dir with correct permissions, rename it rm -rf "$WPA_CONF" - mv -f "$(mktemp -d)" "$WPA_CONF" || return 1 + mv -f "$(mktemp -d --tmpdir=$STATE_DIR)" "$WPA_CONF" || return 1 echo "ctrl_interface=/run/wpa_supplicant" >> "$WPA_CONF/wpa.conf" # we know $WPA_CONF now has no spaces, but it may have other nasty chars, so still needs to be quoted echo "ctrl_interface_group=${WPA_GROUP:-wheel}" >> "$WPA_CONF/wpa.conf" [[ $WPA_COUNTRY ]] && echo "country=$WPA_COUNTRY" >> "$WPA_CONF/wpa.conf" diff --git a/src/connections/wireless b/src/connections/wireless index 82b9913..ff93cf3 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -99,7 +99,7 @@ wireless_down() { report_debug wireless_down stop_wpa "$INTERFACE" stop_wpa "$INTERFACE" - rm -rf "${TMPDIR:-/tmp}/wpa.$INTERFACE" + rm -rf "$STATE_DIR/wpa.$INTERFACE" bring_interface down "$INTERFACE" |