updates for wheezy

diff --git a/Makefile b/Makefile
index ec80886426f994e0c9afc8563d3ee9b1a882a918..c270bcf114e1598c21e78f10a559865b34edeca1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=2.3
+RELEASE=3.0
 
 PACKAGE=pve-cluster
-PKGVER=1.0
-PKGREL=37
+PKGVER=3.0
+PKGREL=1
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/data/PVE/Makefile.am b/data/PVE/Makefile.am
index f3568ca9f6a65c7e7e3eafa9f5e5ccf9a807c2bd..7635a7806bb5f1da828c54e3a6a1e5abc3867a5b 100644 (file)
--- a/data/PVE/Makefile.am
+++ b/data/PVE/Makefile.am
@@ -4,7 +4,7 @@ IPCC.c: IPCC.xs
        xsubpp IPCC.xs > IPCC.xsc
        mv IPCC.xsc IPCC.c
 
-CFLAGS = -shared -fPIC -Wall -I/usr/lib/perl/5.10/CORE -DXS_VERSION=VERSION
+CFLAGS = -shared -fPIC -Wall -I/usr/lib/perl/5.14.2/CORE -DXS_VERSION=VERSION
 LDADD = $(QB_LIBS)
 
 perlbin_PROGRAMS = IPCC.so

diff --git a/debian/changelog b/debian/changelog
index 32ecbd99c41466b1718f6c24780d06d4ecb76f9e..bf53906378a016db7556b9c4b12bfbf9bcd17667 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pve-cluster (3.0-1) unstable; urgency=low
+
+  * bump version for wheezy
+  
+  * use libqb0 from wheezy
+  
+  * use new perl version 5.14.2 from wheezy
+  
+  * try to load fuse modules on startup
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Mar 2013 06:58:00 +0100
+
 pve-cluster (1.0-37) unstable; urgency=low
 
   * ssh-copy-id: never use keys provided by the ssh-agent

diff --git a/debian/control b/debian/control
index adaee31ba2a86a84d58e05efa24266e9a10483a7..ef8b8a9f17ae76bf416f181abd266a6f6c038b2c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.3
 
 Package: pve-cluster
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, rsync, libsqlite3-0, sqlite3, libfuse2, fuse-utils, libcorosync4-pve, libqb, libpve-common-perl, libglib2.0-0, rsyslog, openssl, librrd4, librrds-perl, rrdcached, libdigest-hmac-perl, libxml-parser-perl, insserv
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, rsync, libsqlite3-0, sqlite3, libfuse2, fuse-utils, libcorosync4-pve, libqb0, libpve-common-perl, libglib2.0-0, rsyslog, openssl, librrd4, librrds-perl, rrdcached, libdigest-hmac-perl, libxml-parser-perl, insserv
 Description: Cluster Infrastructure for Proxmox Virtual Environment
  This package contains the Cluster Infrastructure for the Proxmox
  Virtual Environment, namely a distributed filesystem to store

diff --git a/debian/init.d b/debian/init.d
index ab679588c86f6fc93c3b31b1149e0e6ad2c85d0c..4f25caf9307d6afd3b03a188c85d64fd77427122 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -2,8 +2,8 @@
 #
 ### BEGIN INIT INFO
 # Provides:          pve-cluster
-# Required-Start:    $remote_fs $network $syslog $time fuse
-# Required-Stop:     $remote_fs $network $syslog $time fuse
+# Required-Start:    $remote_fs $network $syslog $time
+# Required-Stop:     $remote_fs $network $syslog $time
 # X-Start-Before:    apache2 cron
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
@@ -59,6 +59,10 @@ running() {
 
 start_server() {
 
+    if ! grep -qw fuse /proc/filesystems; then
+        modprobe fuse >/dev/null 2>&1 || true
+    fi
+
     start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
     errcode=$?
     return $errcode
@@ -80,6 +84,7 @@ case "$1" in
             log_end_msg 0
             exit 0
         fi
+
        errcode=0
         start_server || errcode=$?
        # try to create required directories. This only works