Skip to content

Commit 9a9156c

Browse files
committed
bump pve-installer to 8.3.3
1 parent 66fb25d commit 9a9156c

3 files changed

Lines changed: 38 additions & 5 deletions

File tree

‎packages/pve-installer/patches/005-remove-lintain.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/Makefile b/Makefile
2-
index e96a0f2..e397190 100644
2+
index a17f6c5..bb317d4 100644
33
--- a/Makefile
44
+++ b/Makefile
5-
@@ -73,7 +73,6 @@ deb: $(DEB)
6-
$(ASSISTANT_DEB): $(DEB)
5+
@@ -81,7 +81,6 @@ $(ASSISTANT_DEB): $(DEB)
6+
$(FIRST_BOOT_DEB): $(DEB)
77
$(DEB): $(BUILDDIR)
88
cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
9-
- lintian $(DEB)
9+
- lintian $(ALL_DEBS)
1010

1111
test-$(DEB): $(INSTALLER_SOURCES)
1212
rsync --exclude='test*.img' --exclude='*.deb' --exclude='build' -a * build
13-
@@ -83,7 +82,6 @@ test-$(DEB): $(INSTALLER_SOURCES)
13+
@@ -91,7 +90,6 @@ test-$(DEB): $(INSTALLER_SOURCES)
1414
dsc: $(DSC)
1515
$(MAKE) clean
1616
$(MAKE) $(DSC)
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
diff --git a/proxmox-post-hook/src/main.rs b/proxmox-post-hook/src/main.rs
2+
index da47da9..b7b91c3 100644
3+
--- a/proxmox-post-hook/src/main.rs
4+
+++ b/proxmox-post-hook/src/main.rs
5+
@@ -174,7 +174,7 @@ struct PostHookInfo {
6+
/// Release information for the ISO used for the installation.
7+
iso: IsoInfo,
8+
/// Installed kernel version
9+
- kernel_version: KernelVersionInformation,
10+
+ /// kernel_version: KernelVersionInformation,
11+
/// Describes the boot mode of the machine and the SecureBoot status.
12+
boot_info: BootInfo,
13+
/// Information about the installed CPU(s)
14+
@@ -252,7 +252,8 @@ impl PostHookInfo {
15+
debian_version: read_file("/etc/debian_version")?,
16+
product: Self::gather_product_info(&setup_info, &run_cmd)?,
17+
iso: setup_info.iso_info.clone(),
18+
- kernel_version: Self::gather_kernel_version(&run_cmd, &open_file)?,
19+
+ //We remove this entry for port
20+
+ //kernel_version: Self::gather_kernel_version(&run_cmd, &open_file)?,
21+
boot_info: BootInfo {
22+
mode: run_env.boot_type,
23+
secureboot: run_env.secure_boot,
24+
@@ -429,7 +430,7 @@ impl PostHookInfo {
25+
///
26+
/// * `run_cmd` - Callback to run a command inside the target chroot.
27+
/// * `open_file` - Callback to open a file inside the target chroot.
28+
- #[cfg(target_arch = "x86_64")]
29+
+ ///#[cfg(target_arch = "x86_64")] This function call was removed before, so it is safe
30+
fn gather_kernel_version(
31+
run_cmd: &dyn Fn(&[&str]) -> Result<String>,
32+
open_file: &dyn Fn(&str) -> Result<File>,

‎packages/pve-installer/series‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ patches/002-add-some-depends-for-pve-installer.patch
44
patches/003-add-mmc-check-in-pve-installer.patch
55
patches/004-add-rockchip-dtb.patch
66
patches/005-remove-lintain.patch
7+
patches/006-remove-kernel-check-on-posthook.patch

0 commit comments

Comments
 (0)