Merge ~paelzer/ubuntu/+source/ipvsadm:bug-1830033-fix-service-start-bionic into ubuntu/+source/ipvsadm:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1830033-ipvsadm-start

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Tagged and uploaded for SRU review

diff --git a/debian/changelog b/debian/changelog
index 7955a29..e75934f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ipvsadm (1:1.28-3ubuntu0.18.04.1) bionic; urgency=medium
+
+  * d/ipvsadm.init: remove duplicate syncid on daemon invocation (LP: #1830033)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 24 May 2019 09:51:59 +0200
+
 ipvsadm (1:1.28-3build1) artful; urgency=medium
 
   * No-change rebuild to pick up -fPIE compiler default in static
diff --git a/debian/control b/debian/control
index 19bf94f..960c429 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ipvsadm
 Section: net
 Priority: extra
-Maintainer: Alexander Wirt <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alexander Wirt <[e-mail]>
 Standards-Version: 3.9.6
 Vcs-Browser: https://github.com/formorer/pkg-ipvsadm
 Vcs-Git: https://github.com/formorer/pkg-ipvsadm.git
diff --git a/debian/ipvsadm.init b/debian/ipvsadm.init
index 8e3b508..5a05544 100644
--- a/debian/ipvsadm.init
+++ b/debian/ipvsadm.init
@@ -29,16 +29,16 @@ start () {
     case $DAEMON in
 	master|backup)
 	    log_daemon_msg "Starting IPVS Connection Synchronization Daemon" "$DAEMON"
-	    $IPVSADM --syncid $SYNCID --start-daemon $DAEMON --mcast-interface \
+	    $IPVSADM --start-daemon $DAEMON --mcast-interface \
         $IFACE --syncid $SYNCID || log_end_msg 1
 	    log_end_msg 0
 	    ;;
 	both)
 	    log_daemon_msg "Starting IPVS Connection Synchronization Daemon" "master"
-	    $IPVSADM --syncid $SYNCID --start-daemon master --mcast-interface \
+	    $IPVSADM --start-daemon master --mcast-interface \
         $IFACE --syncid $SYNCID  || FAILURE=1
 	    log_progress_msg "backup"
-	    $IPVSADM --syncid $SYNCID --start-daemon backup --mcast-interface \
+	    $IPVSADM --start-daemon backup --mcast-interface \
         $IFACE --syncid $SYNCID || FAILURE=1
 	    if [ "$FAILURE" -eq 1 ]
 	    then