diff --git a/fanatic b/fanatic
index 8366881..5a83ad1 100755
--- a/fanatic
+++ b/fanatic
@@ -142,7 +142,11 @@ enable_fan()
# fi
progress "configuring fan underlay:$underlay overlay:$overlay"
twiddle_fan_config add "$device" "$overlay" "$underlay"
- fanctl up -o "$overlay" -u "$underlay" --auto || fail "unable
to bring fan up, unable to configure"
+ if ! fanctl up -o "$overlay" -u "$underlay" --auto; then
+ twiddle_fan_config remove "$device" "$overlay" \
+ "$underlay"
+ fail "unable to bring fan up, unable to configure"
+ fi
fi
}
--
You received this bug notification because you are a member of Kernel
Packages, which is subscribed to ubuntu-fan in Ubuntu.
https://bugs.launchpad.net/bugs/1728050
Title:
fanatic enable-fan does not clean up config after failed bringup
Status in ubuntu-fan package in Ubuntu:
In Progress
Bug description:
SRU Justification (for Artful/Zesty/Xenial):
Impact:
"fanatic enable-fan" calls to fanctl to actually bring up the Fan bridge.
However it is possible that this returns with an error and in that case fanatic
must undo previously done configuration changes or otherwise any following
attempt to run enable-fan will incorrectly believe the bridge is up and do
nothing.
Fix:
Adding a remove config stage if the call to fanctl returns with an error.
Testcase:
[fan is installed but not enabled]
- sudo flock -x /run/xtables.lock sleep 300
- fanatic enable-fan -u 192.168.0.0/16 -o 250.0.0.0/8; echo $?
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-fan/+bug/1728050/+subscriptions
--
Mailing list: https://launchpad.net/~kernel-packages
Post to : kernel-packages@lists.launchpad.net
Unsubscribe : https://launchpad.net/~kernel-packages
More help : https://help.launchpad.net/ListHelp
