search

ayufan / pve-patches

Repository with public Proxmox patches
223 stars 54 forks source link

Version 6.2.4 dosn`t work on 6.2.11. What can i do with it ? #60

Open ultrix4ever opened 3 years ago

ultrix4ever commented 3 years ago

`root@pve0:~/pve-patches# bash pve-6.2-4-diff-backup-addon apply Proxmox VE 6.2-4 - differential backup support, v3 Kamil Trzcinski, http://ayufan.eu/, ayufan@ayufan.eu

checking file usr/share/perl5/PVE/LXC/Create.pm checking file usr/share/perl5/PVE/QemuServer.pm Hunk #1 succeeded at 5504 (offset -117 lines). Hunk #2 succeeded at 6155 (offset -110 lines). Hunk #3 succeeded at 6365 (offset -110 lines). checking file usr/share/perl5/PVE/Storage.pm Hunk #1 succeeded at 536 (offset 1 line). Hunk #2 FAILED at 1397. Hunk #3 succeeded at 1435 with fuzz 1 (offset 31 lines). Hunk #4 succeeded at 1481 (offset 31 lines). 1 out of 4 hunks FAILED checking file usr/share/perl5/PVE/Storage/Plugin.pm Hunk #1 succeeded at 493 (offset 56 lines). Hunk #2 FAILED at 941. 1 out of 2 hunks FAILED checking file usr/share/perl5/PVE/VZDump.pm Hunk #2 succeeded at 644 (offset 4 lines). Hunk #3 succeeded at 734 with fuzz 2 (offset 5 lines). Hunk #4 FAILED at 952. Hunk #5 succeeded at 968 with fuzz 1. 1 out of 6 hunks FAILED checking file usr/share/perl5/PVE/VZDump/Common.pm Hunk #1 FAILED at 210. 1 out of 1 hunk FAILED checking file usr/share/perl5/PVE/VZDump/LXC.pm Hunk #1 succeeded at 333 (offset 16 lines). Hunk #2 succeeded at 435 (offset 23 lines). checking file usr/share/perl5/PVE/VZDump/QemuServer.pm Hunk #1 succeeded at 241 (offset -2 lines). Hunk #2 succeeded at 249 (offset -2 lines). Hunk #3 succeeded at 618 (offset 146 lines). Hunk #4 succeeded at 693 (offset 146 lines). checking file usr/share/pve-manager/js/pvemanagerlib.js Hunk #1 succeeded at 9289 (offset -32374 lines). FAILED to apply!`

`root@pve0:~/pve-patches# pveversion -v

proxmox-ve: 6.2-1 (running kernel: 5.4.60-1-pve) pve-manager: 6.2-11 (running version: 6.2-11/22fb4983) pve-kernel-5.4: 6.2-6 pve-kernel-helper: 6.2-6 pve-kernel-5.4.60-1-pve: 5.4.60-2 ceph-fuse: 12.2.11+dfsg1-2.1+b1 corosync: 3.0.4-pve1 criu: 3.11-3 glusterfs-client: 5.5-3 ifupdown: 0.8.35+pve1 libjs-extjs: 6.0.1-10 libknet1: 1.16-pve1 libproxmox-acme-perl: 1.0.5 libpve-access-control: 6.1-2 libpve-apiclient-perl: 3.0-3 libpve-common-perl: 6.2-2 libpve-guest-common-perl: 3.1-3 libpve-http-server-perl: 3.0-6 libpve-storage-perl: 6.2-6 libqb0: 1.0.5-1 libspice-server1: 0.14.2-4~pve6+1 lvm2: 2.03.02-pve4 lxc-pve: 4.0.3-1 lxcfs: 4.0.3-pve3 novnc-pve: 1.1.0-1 proxmox-mini-journalreader: 1.1-1 proxmox-widget-toolkit: 2.2-12 pve-cluster: 6.1-8 pve-container: 3.2-1 pve-docs: 6.2-5 pve-edk2-firmware: 2.20200531-1 pve-firewall: 4.1-2 pve-firmware: 3.1-3 pve-ha-manager: 3.1-1 pve-i18n: 2.2-1 pve-qemu-kvm: 5.1.0-2 pve-xtermjs: 4.7.0-2 qemu-server: 6.2-14 smartmontools: 7.1-pve2 spiceterm: 3.1-1 vncterm: 1.6-2 zfsutils-linux: 0.8.4-pve1`

virsibl commented 3 years ago

I confirm that patch 6.2.4 does not work with version 6.2.11

sasbibic commented 3 years ago

Same error on 6.2-12.

DaniDD commented 3 years ago

I modify the file pve-6.2-4-diff-backup-addon to patch 6.2-15, but pve-manager I must downgrade to 6.2-11. My Perl skills are very basic. Please try, but nu guarantee to perfect work.

Actually I have follow packages: pveversion -v

proxmox-ve: 6.2-2 (running kernel: 5.4.44-2-pve) pve-manager: 6.2-11 (running version: 6.2-11/22fb4983) pve-kernel-5.4: 6.2-7 pve-kernel-helper: 6.2-7 pve-kernel-5.4.65-1-pve: 5.4.65-1 pve-kernel-5.4.44-2-pve: 5.4.44-2 ceph: 14.2.11-pve1 ceph-fuse: 14.2.11-pve1 corosync: 3.0.4-pve1 criu: 3.11-3 glusterfs-client: 5.5-3 ifupdown: 0.8.35+pve1 ksm-control-daemon: 1.3-1 libjs-extjs: 6.0.1-10 libknet1: 1.16-pve1 libproxmox-acme-perl: 1.0.5 libpve-access-control: 6.1-3 libpve-apiclient-perl: 3.0-3 libpve-common-perl: 6.2-4 libpve-guest-common-perl: 3.1-3 libpve-http-server-perl: 3.0-6 libpve-storage-perl: 6.2-10 libqb0: 1.0.5-1 libspice-server1: 0.14.2-4~pve6+1 lvm2: 2.03.02-pve4 lxc-pve: 4.0.3-1 lxcfs: 4.0.3-pve3 novnc-pve: 1.1.0-1 proxmox-mini-journalreader: 1.1-1 proxmox-widget-toolkit: 2.3-10 pve-cluster: 6.2-1 pve-container: 3.2-2 pve-docs: 6.2-6 pve-edk2-firmware: 2.20200531-1 pve-firewall: 4.1-3 pve-firmware: 3.1-3 pve-ha-manager: 3.1-1 pve-i18n: 2.2-2 pve-qemu-kvm: 5.1.0-6 pve-xtermjs: 4.7.0-2 qemu-server: 6.2-19 smartmontools: 7.1-pve2 spiceterm: 3.1-1 vncterm: 1.6-2 zfsutils-linux: 0.8.4-pve2

patch.txt

myrandor commented 3 years ago

I just made a patch for 6.2-12. I don't know if it work, I'll test it more in the next days.

I will work on a patch for 6.3 fix soon.

62