From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 691416B40F for ; Tue, 16 Mar 2021 16:33:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5FB98941B for ; Tue, 16 Mar 2021 16:33:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 97BAD939B for ; Tue, 16 Mar 2021 16:33:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5FFFF45920 for ; Tue, 16 Mar 2021 16:33:45 +0100 (CET) To: Thomas Lamprecht , Proxmox Backup Server development discussion References: <20210216170710.31767-1-s.reiter@proxmox.com> <20210216170710.31767-4-s.reiter@proxmox.com> <5fd482b7-1d3a-431b-bb1a-2d9c3ef06acb@proxmox.com> From: Stefan Reiter Message-ID: Date: Tue, 16 Mar 2021 16:33:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <5fd482b7-1d3a-431b-bb1a-2d9c3ef06acb@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.023 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: Re: [pbs-devel] applied: [PATCH proxmox-restore-vm-data 03/22] initial commit X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 15:33:47 -0000 On 15/03/2021 19:35, Thomas Lamprecht wrote: > On 16.02.21 18:06, Stefan Reiter wrote: >> proxmox-restore-vm-data provides means to build a debian package >> containing a minimalistic Linux kernel and a corresponding initramfs >> image for use in a file-restore VM. >> >> Launched with QEMU/KVM, it boots in 1.6 seconds to userspace (on AMD >> 2700X) and has a minimal attack surface (no network stack other than >> virtio-vsock, no auxiliary device support (USB, etc...), userspace >> written in Rust) as opposed to mounting backup archives directly on the >> host. >> >> Since our Rust binaries are currently not fully statically linked, we >> need to include some libraries into the initramfs as well. This is done >> in 'build_initramfs.sh'. >> >> A minimal /init is included as a Rust binary (init-shim-rs), doing only >> the bare-minimum userspace setup before handing over control to the >> file-restore daemon (see 'proxmox-backup' repository). >> >> The debian package comes with a 'activate-noawait >> pbs-file-restore-initramfs' trigger activation to rebuild the cached >> initramfs when the base image shipped here updates. This is taken care >> of by proxmox-file-restore. >> >> Signed-off-by: Stefan Reiter >> --- >> >> Brand new git repo! I called it proxmox-restore-vm-data for lack of any smarter >> ideas, open for better names :) >> >> I also decided to include the 5.10 kernel and ZFS 2.0.3 from current pve-kernel >> repository pretty last-minute, it seems to work fine though (ZFS isn't used atm >> anyway). >> >> > > applied, thanks! > > Did two big changes though: > * renamed to "proxmox-backup-restore-image" > * split build system into packaging and actual build > > As there was quite some stuff changed, which I did in a few ~10 minutes sessions with days/weeks > in-between: please re-check > https://git.proxmox.com/?p=proxmox-backup-restore-image.git;a=summary > LGTM in general, though "make test-run" was broken (and debian/ copied twice), little followup below. Also updates the kernel to 5.11 like in pve-kernel - quickly tested my current v2 with that and it worked fine, better than having the intermediary 5.10 in there. ------------------------ >8 ------------------------ From dd910d15e035f62335a5eb943753ade5dddce1a8 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Tue, 16 Mar 2021 16:26:00 +0100 Subject: [PATCH] fixup "test-run" target and update kernel to 5.11.0 Signed-off-by: Stefan Reiter --- src/Makefile | 6 +++--- src/submodules/ubuntu-hirsute | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index dcfac03..37f385f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ all: ${KERNEL_IMG} ${INITRAMFS_IMG} ${BUILDDIR}.prepared: ${CONFIG} rm -rf ${BUILDDIR} mkdir -p ${BUILDDIR} - cp -a submodules debian patches ${BUILDDIR}/ + cp -a submodules patches ${BUILDDIR}/ cp ${CONFIG} ${BUILDDIR}/${KERNEL_SUBMODULE} cd ${BUILDDIR}/${KERNEL_SUBMODULE}; \ for p in ../../patches/kernel/*.patch; do \ @@ -60,8 +60,8 @@ test-run: ${KERNEL_IMG} ${INITRAMFS_IMG} # included in the initramfs, but it can be used to test the # kernel/init-shim-rs builds qemu-system-x86_64 -serial stdio -vnc none -enable-kvm \ - -kernel ${BUILDDIR}/${KERNEL_IMG} \ - -initrd build/initramfs/initramfs.img + -kernel ${KERNEL_IMG} \ + -initrd ${INITRAMFS_IMG} .PHONY: clean clean: diff --git a/src/submodules/ubuntu-hirsute b/src/submodules/ubuntu-hirsute index 01f2ad6..f488090 160000 --- a/src/submodules/ubuntu-hirsute +++ b/src/submodules/ubuntu-hirsute @@ -1 +1 @@ -Subproject commit 01f2ad60c19fc07666c3cad5e6f527bc46af6303 +Subproject commit f48809012350997899c3ce1afc47eb77f116fcf4 -- 2.20.1