summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorRémy Oudompheng <remy@archlinux.org>2011-08-09 00:27:53 +0200
committerRémy Oudompheng <remy@archlinux.org>2011-08-09 00:27:53 +0200
commit8dec3ca378062e538dd97eba1712338bbebc8f33 (patch)
tree3791de47b4d5411b6989b71894b3221222a24f11 /src/network
parent82561d179d239bd7c3305e81fa62f01928fb390e (diff)
parent0b6ac7bf41ef2f1cf548eda8a4054c21a4bd9434 (diff)
downloadnetctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.gz
netctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.xz
Merge branch '2.6.x'
Conflicts: README
Diffstat (limited to 'src/network')
-rw-r--r--src/network3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network b/src/network
index 195c480..e1a57a2 100644
--- a/src/network
+++ b/src/network
@@ -6,6 +6,7 @@
# $1: profile name
load_profile()
{
+ unset ROUTES
[[ -z "$1" ]] && return 1
if [[ ! -f "$PROFILE_DIR/$1" ]]; then
report_err "Profile \"$1\" does not exist"
@@ -333,7 +334,7 @@ set_iface() {
local PROFILE="$3"
[[ -z "$PROFILE" ]] && PROFILE=external
if [[ "$1" == "up" ]]; then
- echo "PROFILE=$PROFILE" > "$STATE_DIR/interfaces/$2"
+ echo "PROFILE='$PROFILE'" > "$STATE_DIR/interfaces/$2"
elif [[ "$1" == "down" ]]; then
rm -f "$STATE_DIR/interfaces/$2" # JP: add -f so we don't complain if the interface isn't up
fi