Ubuntu
ipvsadm package

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

  1. Git
  2. lp:~paelzer/ubuntu/+source/ipvsadm
  3. bug-1830033-fix-service-start-bionic
  4. Merge into ubuntu/bionic-devel
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 5a863b7248593c62bbe84867c9c72d0617502587
Merged at revision: 5a863b7248593c62bbe84867c9c72d0617502587
Proposed branch: ~paelzer/ubuntu/+source/ipvsadm:bug-1830033-fix-service-start-bionic
Merge into: ubuntu/+source/ipvsadm:ubuntu/bionic-devel
Diff against target: 52 lines (+11/-4)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/ipvsadm.init (+3/-3)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+367890@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Tagged and uploaded for SRU review

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 7955a29..e75934f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+ipvsadm (1:1.28-3ubuntu0.18.04.1) bionic; urgency=medium
7+
8+ * d/ipvsadm.init: remove duplicate syncid on daemon invocation (LP: #1830033)
9+
10+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 24 May 2019 09:51:59 +0200
11+
12 ipvsadm (1:1.28-3build1) artful; urgency=medium
13
14 * No-change rebuild to pick up -fPIE compiler default in static
15diff --git a/debian/control b/debian/control
16index 19bf94f..960c429 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -1,7 +1,8 @@
20 Source: ipvsadm
21 Section: net
22 Priority: extra
23-Maintainer: Alexander Wirt <formorer@debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Alexander Wirt <formorer@debian.org>
26 Standards-Version: 3.9.6
27 Vcs-Browser: https://github.com/formorer/pkg-ipvsadm
28 Vcs-Git: https://github.com/formorer/pkg-ipvsadm.git
29diff --git a/debian/ipvsadm.init b/debian/ipvsadm.init
30index 8e3b508..5a05544 100644
31--- a/debian/ipvsadm.init
32+++ b/debian/ipvsadm.init
33@@ -29,16 +29,16 @@ start () {
34 case $DAEMON in
35 master|backup)
36 log_daemon_msg "Starting IPVS Connection Synchronization Daemon" "$DAEMON"
37- $IPVSADM --syncid $SYNCID --start-daemon $DAEMON --mcast-interface \
38+ $IPVSADM --start-daemon $DAEMON --mcast-interface \
39 $IFACE --syncid $SYNCID || log_end_msg 1
40 log_end_msg 0
41 ;;
42 both)
43 log_daemon_msg "Starting IPVS Connection Synchronization Daemon" "master"
44- $IPVSADM --syncid $SYNCID --start-daemon master --mcast-interface \
45+ $IPVSADM --start-daemon master --mcast-interface \
46 $IFACE --syncid $SYNCID || FAILURE=1
47 log_progress_msg "backup"
48- $IPVSADM --syncid $SYNCID --start-daemon backup --mcast-interface \
49+ $IPVSADM --start-daemon backup --mcast-interface \
50 $IFACE --syncid $SYNCID || FAILURE=1
51 if [ "$FAILURE" -eq 1 ]
52 then

Subscribers

People subscribed via source and target branches