diff -Nru resolvconf-1.79ubuntu12/bin/resolvconf resolvconf-1.79ubuntu13/bin/resolvconf
--- resolvconf-1.79ubuntu12/bin/resolvconf	2016-06-08 10:08:12.000000000 +0000
+++ resolvconf-1.79ubuntu13/bin/resolvconf	2019-04-17 14:53:53.000000000 +0000
@@ -5,6 +5,11 @@
 
 set -e
 
+{
+# Make sure that we do not end up with a broken resolv.conf if resolvconf
+# is invoked in parallel.
+flock -w 10 9 || exit 1
+
 echo_usage() { echo "Usage: resolvconf (-d IFACE|-a IFACE|-u|--enable-updates|--disable-updates|--updates-are-enabled)" ; }
 
 PATH=/sbin:/bin
@@ -170,3 +175,5 @@
 
 # Don't reach here
 exit 99
+
+} 9>/run/resolvconf/run-lock
diff -Nru resolvconf-1.79ubuntu12/debian/changelog resolvconf-1.79ubuntu13/debian/changelog
--- resolvconf-1.79ubuntu12/debian/changelog	2019-03-14 21:17:51.000000000 +0000
+++ resolvconf-1.79ubuntu13/debian/changelog	2019-04-17 14:53:53.000000000 +0000
@@ -1,3 +1,10 @@
+resolvconf (1.79ubuntu13) disco; urgency=medium
+
+  * bin/resolvconf: use flock so resolvconf can be called in parallel
+    safely (LP: #1825194).
+
+ -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com>  Wed, 17 Apr 2019 16:53:53 +0200
+
 resolvconf (1.79ubuntu12) disco; urgency=medium
 
   * d/resolvconf.resolvconf-pull-resolved.path