[pve-devel] [RFC corosync-pve 4/5] remove old packaging files
Fabian Grünbichler
f.gruenbichler at proxmox.com
Wed Mar 8 14:22:08 CET 2017
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
debian/patches/disable-sched-rr.patch | 71 -----------------------------
debian/compat | 1 -
debian/control | 68 ---------------------------
debian/copyright | 66 ---------------------------
debian/corosync-pve.dirs | 3 --
debian/corosync-pve.docs | 4 --
debian/corosync-pve.examples | 4 --
debian/corosync-pve.install | 8 ----
debian/corosync-pve.postinst | 33 --------------
debian/corosync-pve.postrm | 34 --------------
debian/corosync.service | 17 -------
debian/docs | 1 -
debian/libcorosync-pve-dev.docs | 1 -
debian/libcorosync-pve-dev.install | 6 ---
debian/libcorosync4-pve.docs | 1 -
debian/libcorosync4-pve.install | 1 -
debian/patches/config-path.diff | 86 -----------------------------------
debian/patches/corosync-keygen.diff | 41 -----------------
debian/patches/cpg-join-fix.diff | 44 ------------------
debian/patches/default-config.diff | 22 ---------
debian/patches/series | 5 --
debian/rules | 31 -------------
22 files changed, 548 deletions(-)
delete mode 100644 debian/patches/disable-sched-rr.patch
delete mode 100644 debian/compat
delete mode 100644 debian/control
delete mode 100644 debian/copyright
delete mode 100644 debian/corosync-pve.dirs
delete mode 100644 debian/corosync-pve.docs
delete mode 100644 debian/corosync-pve.examples
delete mode 100644 debian/corosync-pve.install
delete mode 100644 debian/corosync-pve.postinst
delete mode 100644 debian/corosync-pve.postrm
delete mode 100644 debian/corosync.service
delete mode 100644 debian/docs
delete mode 100644 debian/libcorosync-pve-dev.docs
delete mode 100644 debian/libcorosync-pve-dev.install
delete mode 100644 debian/libcorosync4-pve.docs
delete mode 100644 debian/libcorosync4-pve.install
delete mode 100644 debian/patches/config-path.diff
delete mode 100644 debian/patches/corosync-keygen.diff
delete mode 100644 debian/patches/cpg-join-fix.diff
delete mode 100644 debian/patches/default-config.diff
delete mode 100644 debian/patches/series
delete mode 100755 debian/rules
diff --git a/debian/patches/disable-sched-rr.patch b/debian/patches/disable-sched-rr.patch
deleted file mode 100644
index 0ce96ee..0000000
--- a/debian/patches/disable-sched-rr.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: new/exec/timer.c
-===================================================================
---- new.orig/exec/timer.c 2013-01-16 11:12:46.000000000 +0100
-+++ new/exec/timer.c 2013-01-16 11:13:40.000000000 +0100
-@@ -109,7 +109,7 @@
- int fds;
- unsigned long long timeout;
-
--#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-+#if 0 && defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
- if (sched_priority != 0) {
- struct sched_param sched_param;
-
-Index: new/exec/main.c
-===================================================================
---- new.orig/exec/main.c 2013-01-16 11:12:46.000000000 +0100
-+++ new/exec/main.c 2013-01-16 11:13:40.000000000 +0100
-@@ -1265,6 +1265,7 @@
-
- static void corosync_setscheduler (void)
- {
-+#if 0
- #if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && defined(HAVE_SCHED_SETSCHEDULER)
- int res;
-
-@@ -1305,6 +1306,7 @@
- log_printf(LOGSYS_LEVEL_WARNING,
- "The Platform is missing process priority setting features. Leaving at default.");
- #endif
-+#endif
- }
-
- static void fplay_key_change_notify_fn (
-@@ -1585,6 +1587,11 @@
- corosync_setscheduler ();
- }
-
-+ if (setpriority(PRIO_PGRP, 0, -20) < 0) {
-+ fprintf(stderr, "setpriority failed\n");
-+ return EXIT_FAILURE;
-+ }
-+
- corosync_mlockall ();
-
- log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Cluster Engine ('%s'): started and ready to provide service.\n", VERSION);
-Index: new/exec/coroipcs.c
-===================================================================
---- new.orig/exec/coroipcs.c 2013-01-16 11:12:46.000000000 +0100
-+++ new/exec/coroipcs.c 2013-01-16 11:13:40.000000000 +0100
-@@ -661,7 +661,7 @@
- unsigned int new_message;
- int sem_value = 0;
-
--#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-+#if 0 && defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
- if (api->sched_policy != 0) {
- res = pthread_setschedparam (conn_info->thread,
- api->sched_policy, api->sched_param);
-Index: new/exec/logsys.c
-===================================================================
---- new.orig/exec/logsys.c 2013-01-16 11:15:29.000000000 +0100
-+++ new/exec/logsys.c 2013-01-16 11:15:35.000000000 +0100
-@@ -1568,7 +1568,7 @@
- return (0);
- }
-
--#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-+#if 0 && defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
- if (wthread_active == 0) {
- logsys_sched_policy = policy;
- memcpy(&logsys_sched_param, param, sizeof(struct sched_param));
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 0c078c6..0000000
--- a/debian/control
+++ /dev/null
@@ -1,68 +0,0 @@
-Source: corosync-pve
-Priority: extra
-Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 7), libnss3-dev, groff, quilt, dh-systemd (>= 1.4), pkg-config, libqb-dev
-Standards-Version: 3.7.3
-Section: admin
-Homepage: http://openais.org/
-
-Package: corosync-pve
-Section: admin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, psmisc, lsb-base (>= 3.0-6), libcorosync4-pve, adduser, systemd
-Conflicts: openais (<< 0.96), corosync
-Provides: corosync
-Description: Standards-based cluster framework (daemon and modules)
- The corosync project is a project to implement a production quality
- "Revised BSD" licensed implementation of all core functionalities
- required by openais. The project implements cutting edge research
- on virtual synchrony to provide 100% correct operation in the face of
- failures or partitionable networks with excellent performance
- characteristics.
- .
- The Application Interface Specification is a software API and policies
- which are used to develop applications that maintain service during
- faults.
- .
- This package contains the corosync daemon and modules.
-
-Package: libcorosync4-pve
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libopenais2 (<< 0.96-1), libcorosync4
-Provides: libcorosync4
-Description: Standards-based cluster framework (libraries)
- The corosync project is a project to implement a production quality
- "Revised BSD" licensed implementation of all core functionalities
- required by openais. The project implements cutting edge research
- on virtual synchrony to provide 100% correct operation in the face of
- failures or partitionable networks with excellent performance
- characteristics.
- .
- The Application Interface Specification is a software API and policies
- which are used to develop applications that maintain service during
- faults.
- .
- This package contains libraries that should be used by corosync clients.
-
-Package: libcorosync-pve-dev
-Section: libdevel
-Architecture: any
-Depends: libcorosync4-pve (= ${binary:Version})
-Conflicts: libopenais-dev (<< 0.96-1), libcorosync-dev
-Provides: libcorosync-dev
-Description: Standards-based cluster framework (developer files)
- The corosync project is a project to implement a production quality
- "Revised BSD" licensed implementation of all core functionalities
- required by openais. The project implements cutting edge research
- on virtual synchrony to provide 100% correct operation in the face of
- failures or partitionable networks with excellent performance
- characteristics.
- .
- The Application Interface Specification is a software API and policies
- which are used to develop applications that maintain service during
- faults.
- .
- This package contains header files required to build clients for the
- corosync infrastructure.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 7c56a74..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,66 +0,0 @@
-This package was debianized by the Proxmox Support Team
-<support at proxmox.com> on Mon, 30 Mar 2009 06:55:24 -0400.
-
-It was downloaded from <http://openais.org/>
-
-***
-All cryptographic software in this package is subject to the following legal
-notice:
-This package includes publicly available encryption source code which,
-together with object code resulting from the compiling of publicly
-available source code, may be exported from the United States under License
-Exception TSU prsuant to 15 C.F.R Section 740.13(e).
-***
------------------------------------------------------------------------------
-The following license applies to every file in this package except for
-the files exec/crypto.c and exec/crypto.h. The license for these files is
-described later in this document. Some files are contributed by other authors
-and hence not copyright MontaVista Software. In this case, the license is
-still as follows:
------------------------------------------------------------------------------
-
-Copyright (c) 2002-2004 MontaVista Software, Inc.
-
-All rights reserved.
-
-This software licensed under BSD license, the text of which follows:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-- Neither the name of the MontaVista Software, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-The corosync project uses software from the LibTomCrypt project
-www.libtomcrypt.org. This software is contained the files exec/crypto.c and
-exec/crypto.h. The following license applies to the files exec/crypto.c and
-exec/crytpo.h:
------------------------------------------------------------------------------
-LibTomCrypt is public domain. As should all quality software be.
-
-All of the software was either written by or donated to Tom St Denis for the
-purposes of this project. The only exception is the SAFER.C source which has
-no known license status (assumed copyrighted) which is why SAFER,C is shipped
-as disabled.
-
-Tom St Denis
-
-
diff --git a/debian/corosync-pve.dirs b/debian/corosync-pve.dirs
deleted file mode 100644
index 8777c20..0000000
--- a/debian/corosync-pve.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/corosync
-var/lib/corosync
-var/log/corosync
diff --git a/debian/corosync-pve.docs b/debian/corosync-pve.docs
deleted file mode 100644
index 58c5dc4..0000000
--- a/debian/corosync-pve.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTHORS
-README.recovery
-SECURITY
-debian/SOURCE
diff --git a/debian/corosync-pve.examples b/debian/corosync-pve.examples
deleted file mode 100644
index 707d0b2..0000000
--- a/debian/corosync-pve.examples
+++ /dev/null
@@ -1,4 +0,0 @@
-conf/COROSYNC-MIB.txt
-conf/corosync.conf.example.udpu
-conf/corosync.conf.example
-conf/corosync-signals.conf
diff --git a/debian/corosync-pve.install b/debian/corosync-pve.install
deleted file mode 100644
index a9bb74a..0000000
--- a/debian/corosync-pve.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/sbin
-usr/bin/corosync-blackbox
-usr/share/man/man5
-usr/share/man/man8
-debian/corosync.service lib/systemd/system
-usr/share/corosync/corosync
-usr/share/augeas/lenses/corosync.aug
-usr/share/augeas/lenses/tests/test_corosync.aug
diff --git a/debian/corosync-pve.postinst b/debian/corosync-pve.postinst
deleted file mode 100644
index 3141a78..0000000
--- a/debian/corosync-pve.postinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# postinst script for corosync
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
- configure)
-
- # create the ais user
- adduser --quiet --group --system --no-create-home ais
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/corosync-pve.postrm b/debian/corosync-pve.postrm
deleted file mode 100644
index 58c81d4..0000000
--- a/debian/corosync-pve.postrm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# postrm script for corosync
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge)
- rm -rf /var/lib/corosync
- rm -rf /var/log/corosync
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/corosync.service b/debian/corosync.service
deleted file mode 100644
index c1e989b..0000000
--- a/debian/corosync.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Corosync Cluster Engine
-ConditionKernelCommandLine=!nocluster
-ConditionPathExists=/etc/corosync/corosync.conf
-Requires=network-online.target
-After=network-online.target
-DefaultDependencies=no
-Before=shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/usr/share/corosync/corosync start
-ExecStop=/usr/share/corosync/corosync stop
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 72cc509..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/SOURCE
\ No newline at end of file
diff --git a/debian/libcorosync-pve-dev.docs b/debian/libcorosync-pve-dev.docs
deleted file mode 100644
index 8696672..0000000
--- a/debian/libcorosync-pve-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/SOURCE
diff --git a/debian/libcorosync-pve-dev.install b/debian/libcorosync-pve-dev.install
deleted file mode 100644
index ba92bd3..0000000
--- a/debian/libcorosync-pve-dev.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/share/man/man3
-
diff --git a/debian/libcorosync4-pve.docs b/debian/libcorosync4-pve.docs
deleted file mode 100644
index 8696672..0000000
--- a/debian/libcorosync4-pve.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/SOURCE
diff --git a/debian/libcorosync4-pve.install b/debian/libcorosync4-pve.install
deleted file mode 100644
index e27cbf1..0000000
--- a/debian/libcorosync4-pve.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
\ No newline at end of file
diff --git a/debian/patches/config-path.diff b/debian/patches/config-path.diff
deleted file mode 100644
index 02acedb..0000000
--- a/debian/patches/config-path.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: corosync-1.0/exec/coroparse.c
-===================================================================
---- corosync-1.0.orig/exec/coroparse.c 2009-06-10 06:33:21.000000000 -0400
-+++ corosync-1.0/exec/coroparse.c 2009-06-10 06:56:56.000000000 -0400
-@@ -261,7 +261,7 @@
-
- filename = getenv ("COROSYNC_MAIN_CONFIG_FILE");
- if (!filename)
-- filename = SYSCONFDIR "/corosync.conf";
-+ filename = SYSCONFDIR "/corosync/corosync.conf";
-
- fp = fopen (filename, "r");
- if (fp == NULL) {
-Index: corosync-1.0/exec/totemconfig.c
-===================================================================
---- corosync-1.0.orig/exec/totemconfig.c 2009-06-10 06:33:21.000000000 -0400
-+++ corosync-1.0/exec/totemconfig.c 2009-06-10 06:56:56.000000000 -0400
-@@ -764,7 +764,7 @@
- if (!got_key) {
- const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
- if (!filename)
-- filename = SYSCONFDIR "/ais/authkey";
-+ filename = SYSCONFDIR "/corosync/authkey";
- res = read_keyfile(filename, totem_config, error_string);
- if (res)
- goto key_error;
-Index: corosync-1.0/tools/corosync-keygen.c
-===================================================================
---- corosync-1.0.orig/tools/corosync-keygen.c 2009-06-10 06:33:22.000000000 -0400
-+++ corosync-1.0/tools/corosync-keygen.c 2009-06-10 07:34:39.000000000 -0400
-@@ -44,40 +44,45 @@
-
- #include <netinet/in.h>
-
--#define KEYFILE SYSCONFDIR "/ais/authkey"
-+#define KEYFILE SYSCONFDIR "/corosync/authkey"
-
- int main (void) {
- int authkey_fd;
- int random_fd;
- unsigned char key[128];
- ssize_t res;
-+ ssize_t bytes = 0;
-
- printf ("Corosync Cluster Engine Authentication key generator.\n");
- if (geteuid() != 0) {
- printf ("Error: Authorization key must be generated as root user.\n");
- exit (1);
- }
-- if (mkdir (SYSCONFDIR "/ais", 0700)) {
-+ if (mkdir (SYSCONFDIR "/corosync", 0700)) {
- if (errno != EEXIST) {
-- perror ("Failed to create directory: " SYSCONFDIR "/ais");
-+ perror ("Failed to create directory: " SYSCONFDIR "/corosync");
- exit (1);
- }
- }
-
-- printf ("Gathering %lu bits for key from /dev/random.\n", (unsigned long)(sizeof (key) * 8));
-- random_fd = open ("/dev/random", O_RDONLY);
-+ printf ("Gathering %lu bits for key from /dev/urandom.\n", (unsigned long)(sizeof (key) * 8));
-+ random_fd = open ("/dev/urandom", O_RDONLY);
- if (random_fd == -1) {
-- perror ("Is /dev/random present? Opening /dev/random");
-+ perror ("Is /dev/urandom present? Opening /dev/urandom");
- exit (1);
- }
-
- /*
- * Read random data
- */
-- res = read (random_fd, key, sizeof (key));
-- if (res != sizeof (key)) {
-- perror ("Could not read /dev/random");
-- exit (1);
-+ while (bytes < sizeof (key)) {
-+ res = read (random_fd, key + bytes, sizeof (key) - bytes);
-+ if (res <= 0) {
-+ perror ("Could not read /dev/urandom");
-+ exit (1);
-+ }
-+ bytes += res;
-+ printf ("Got %d bits\n", bytes*8);
- }
- close (random_fd);
-
diff --git a/debian/patches/corosync-keygen.diff b/debian/patches/corosync-keygen.diff
deleted file mode 100644
index f7b8492..0000000
--- a/debian/patches/corosync-keygen.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: corosync-1.1.2/tools/corosync-keygen.c
-===================================================================
---- corosync-1.1.2.orig/tools/corosync-keygen.c 2009-10-27 13:25:02.000000000 +0100
-+++ corosync-1.1.2/tools/corosync-keygen.c 2009-10-27 13:25:14.000000000 +0100
-@@ -67,9 +67,9 @@
-
- printf ("Gathering %lu bits for key from /dev/random.\n", (unsigned long)(sizeof (key) * 8));
- printf ("Press keys on your keyboard to generate entropy.\n");
-- random_fd = open ("/dev/random", O_RDONLY);
-+ random_fd = open ("/dev/urandom", O_RDONLY);
- if (random_fd == -1) {
-- perror ("Is /dev/random present? Opening /dev/random");
-+ perror ("Is /dev/urandom present? Opening /dev/urandom");
- exit (errno);
- }
-
-@@ -78,16 +78,14 @@
- */
- bytes_read = 0;
-
--retry_read:
-- res = read (random_fd, &key[bytes_read], sizeof (key) - bytes_read);
-- if (res == -1) {
-- perror ("Could not read /dev/random");
-- exit (errno);
-- }
-- bytes_read += res;
-- if (bytes_read != sizeof (key)) {
-- printf ("Press keys on your keyboard to generate entropy (bits = %d).\n", bytes_read * 8);
-- goto retry_read;
-+ while (bytes_read < sizeof (key)) {
-+ res = read (random_fd, key + bytes_read, sizeof (key) - bytes_read);
-+ if (res <= 0) {
-+ perror ("Could not read /dev/urandom");
-+ exit (1);
-+ }
-+ bytes_read += res;
-+ printf ("Got %d bits\n", bytes_read*8);
- }
- close (random_fd);
-
diff --git a/debian/patches/cpg-join-fix.diff b/debian/patches/cpg-join-fix.diff
deleted file mode 100644
index 75d4cbd..0000000
--- a/debian/patches/cpg-join-fix.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-commit 41a2a23e5da11cfbae054dcd79512fb816c37d30
-Author: Jan Friesse <jfriesse at redhat.com>
-Date: Thu Feb 25 15:38:25 2010 +0100
-
- Cpg join with undelivered leave message
-
- Patch handles situation, when on one node, one process:
- - join cpg
- - do same actions
- - leave cpg
- - join cpg again
-
- Following sequence can (racy) end with broken process_info list.
-
- To solve this problem, one more check is done in
- message_handler_req_lib_cpg_join so if process_info with same pid and
- group as new join request exists, CPG_ERR_TRY_AGAIN is returned.
-
-Index: corosync-1.2.0/services/cpg.c
-===================================================================
---- corosync-1.2.0.orig/services/cpg.c 2010-02-26 10:20:18.000000000 +0100
-+++ corosync-1.2.0/services/cpg.c 2010-02-26 10:20:32.000000000 +0100
-@@ -1063,6 +1063,21 @@
- }
- }
-
-+ /*
-+ * Same check must be done in process info list, because there may be not yet delivered
-+ * leave of client.
-+ */
-+ for (iter = process_info_list_head.next; iter != &process_info_list_head; iter = iter->next) {
-+ struct process_info *pi = list_entry (iter, struct process_info, list);
-+
-+ if (pi->nodeid == api->totem_nodeid_get () && pi->pid == req_lib_cpg_join->pid &&
-+ mar_name_compare(&req_lib_cpg_join->group_name, &pi->group) == 0) {
-+ /* We have same pid and group name joined -> return error */
-+ error = CPG_ERR_TRY_AGAIN;
-+ goto response_send;
-+ }
-+ }
-+
- switch (cpd->cpd_state) {
- case CPD_STATE_UNJOINED:
- error = CPG_OK;
diff --git a/debian/patches/default-config.diff b/debian/patches/default-config.diff
deleted file mode 100644
index ae72846..0000000
--- a/debian/patches/default-config.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: corosync-1.0/conf/corosync.conf.example
-===================================================================
---- corosync-1.0.orig/conf/corosync.conf.example 2009-06-10 06:33:21.000000000 -0400
-+++ corosync-1.0/conf/corosync.conf.example 2009-06-10 06:54:17.000000000 -0400
-@@ -1,7 +1,7 @@
- # Please read the corosync.conf.5 manual page
- totem {
- version: 2
-- secauth: off
-+ secauth: on
- threads: 0
- interface {
- ringnumber: 0
-@@ -14,7 +14,7 @@
- logging {
- fileline: off
- to_stderr: yes
-- to_logfile: yes
-+ to_logfile: no
- to_syslog: yes
- logfile: /tmp/corosync.log
- debug: off
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1196261..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-#config-path.diff
-#default-config.diff
-#corosync-keygen.diff
-#cpg-join-fix.diff
-#disable-sched-rr.patch
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 4c37c60..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# enable hardening
-export DEB_BUILD_HARDENING=1
-
-%:
- dh $@ --with=quilt,systemd
-
-override_dh_auto_configure:
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=\$${prefix}/share/man \
- --localstatedir=/var \
- --infodir=\$${prefix}/share/info \
- --enable-augeas \
- --enable-systemd
-
-override_dh_systemd_enable:
- dh_systemd_enable -pcorosync-pve --name corosync
-
-#override_dh_systemd_start:
-# dh_systemd_start -pcorosync-pve --name corosync --no-start
--
2.1.4
More information about the pve-devel
mailing list