Commit bf0a3da1 authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Fix cleanup of DNS configuration for PPP connections

On termination, pppd runs a script to restore resolve.conf to the state it was
in before pppd started. When we do not wait for the termination of pppd to
complete, systemd kills this script and resolve.conf is not restored.

Reported by KF <kecef@aol.com> in FS#53572
parent ba3fce82
......@@ -92,6 +92,8 @@ mobile_ppp_down() {
read pid < "$pidfile"
(( pid )) && kill "$pid"
fi
# Allow pppd up to one second to clean up
timeout_wait 1 '[[ ! -f $pidfile ]]'
rm -r "$options_dir"
}
......
......@@ -68,6 +68,8 @@ pppoe_down() {
read pid < "$pidfile"
(( pid )) && kill "$pid"
fi
# Allow pppd up to one second to clean up
timeout_wait 1 '[[ ! -f $pidfile ]]'
rm "$options"
rmdir "$(dirname "$options")"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment