[pve-devel] [PATCH] pve-sheepdog : bump to 0.8.0

[Dietmar Maurer]

I am unable to apply this patch:

Applying: pve-sheepdog : bump to 0.8.0
error: patch failed: Makefile:2
error: Makefile: patch does not apply
error: patch failed: debian/changelog:1
...


> -----Original Message-----
> From: pve-devel-bounces at pve.proxmox.com [mailto:pve-devel-
> bounces at pve.proxmox.com] On Behalf Of Alexandre Derumier
> Sent: Montag, 27. Jänner 2014 03:56
> To: pve-devel at pve.proxmox.com
> Subject: [pve-devel] [PATCH] pve-sheepdog : bump to 0.8.0
> 
> Please note that sheepdog 0.8 cluster format is not compatible with < 0.8
> sheepdog format.
> 
> you need to backup your vdi before upgrade, and restore them after.
> 
> They are no upgrade path
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  Makefile                             |    2 +-
>  debian/changelog                     |    6 ++++++
>  debian/patches/series                |    2 +-
>  debian/pve-sheepdog.sheepdog.default |    2 +-
>  debian/pve-sheepdog.sheepdog.init.d  |    2 +-
>  5 files changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 314ecbf..f299780 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2,7 +2,7 @@ RELEASE=3.1
> 
>  PACKAGE=pve-sheepdog
>  PKGREL=1
> -SDVER=0.6.3
> +SDVER=0.8.0
> 
>  ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)  GITVERSION:=$(shell cat
> .git/refs/heads/master) diff --git a/debian/changelog b/debian/changelog index
> 1508dd9..3e97241 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +pve-sheepdog (0.8.0-1) unstable; urgency=low
> +
> +  * Bump to sheepdog 0.8.0
> +
> + -- Proxmox Support Team <support at proxmox.com>  Fri, 27 Jan 2014
> + 15:10:00 +0200
> +
>  pve-sheepdog (0.6.3-1) unstable; urgency=low
> 
>    * Bump to sheepdog 0.6.3
> diff --git a/debian/patches/series b/debian/patches/series index
> 4b2d5b6..938dd07 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,2 +1,2 @@
> -do-not-install-generic-init-script.patch
> +#do-not-install-generic-init-script.patch
>  simplify-log-rotation.patch
> diff --git a/debian/pve-sheepdog.sheepdog.default b/debian/pve-
> sheepdog.sheepdog.default
> index 6730b34..f05e4f4 100644
> --- a/debian/pve-sheepdog.sheepdog.default
> +++ b/debian/pve-sheepdog.sheepdog.default
> @@ -5,4 +5,4 @@
>  START=yes
>  # sheepdog root directory
>  #ROOTDIR=/var/lib/sheepdog/
> -#JOURNALSIZE=256
> +#JOURNALSIZE=256M
> diff --git a/debian/pve-sheepdog.sheepdog.init.d b/debian/pve-
> sheepdog.sheepdog.init.d
> index 2de8744..1ff5e4e 100644
> --- a/debian/pve-sheepdog.sheepdog.init.d
> +++ b/debian/pve-sheepdog.sheepdog.init.d
> @@ -23,7 +23,7 @@ PIDFILE="/var/run/sheep.pid"
>  [ -x $DAEMON ] || exit 0
> 
>  ROOTDIR="/var/lib/sheepdog/"
> -JOURNALSIZE="256"
> +JOURNALSIZE="256M"
> 
>  # Read configuration variable file if it is present  [ -r /etc/default/$NAME ] && .
> /etc/default/$NAME
> --
> 1.7.10.4
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel