]> git.proxmox.com Git - pve-manager.git/commitdiff
add initramfs conf snippet disabling RESUME
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Thu, 22 Jun 2017 09:29:14 +0000 (11:29 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 22 Jun 2017 10:23:01 +0000 (12:23 +0200)
otherwise, every boot will wait for the swap ZVol on root on
ZFS systems.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Makefile
pve-initramfs.conf [new file with mode: 0644]

index 2f075607fe3950e689bc83b4867120774d00ebb5..ecae4d888d07b05e56611f1dbae764b45f76f6fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,8 @@ install: country.dat vzdump.conf vzdump-hook-script.pl pve-apt.conf mtu bridgevl
        install -D -m 0755 vlan ${DESTDIR}/etc/network/if-pre-up.d/vlan
        install -D -m 0755 vlan-down ${DESTDIR}/etc/network/if-post-down.d/vlan
 
+       install -D -m 0644 pve-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pve-initramfs.conf
+
        install -m 0644 vzdump-hook-script.pl ${DOCDIR}/examples/vzdump-hook-script.pl
        install -m 0644 spice-example-sh ${DOCDIR}/examples/spice-example-sh
        install -m 0644 country.dat ${DESTDIR}/usr/share/${PACKAGE}
diff --git a/pve-initramfs.conf b/pve-initramfs.conf
new file mode 100644 (file)
index 0000000..fc6bedc
--- /dev/null
@@ -0,0 +1,2 @@
+# disable suspend-to-disk, as it delays boot on systems with root on ZFS
+RESUME=none