Do not create a swap zvol

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 5a857f51f2e387fbeada0d3a71a006b0a10d7ea3..f1a0262d1e72e532a2845f6e35c82fc2b8300791 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -814,36 +814,6 @@ sub zfs_create_rpool {
         if defined($value) && $value != 1;
 }
 
-sub zfs_create_swap {
-    my ($swapsize) = @_;
-
-    my $cmd = "zfs create -V ${swapsize}K -b 4K";
-
-    $cmd .= " -o com.sun:auto-snapshot=false";
-
-    # copies for swap does not make sense
-    $cmd .= " -o copies=1";
-
-    # reduces memory pressure
-    $cmd .= " -o sync=always";
-
-    # cheapest compression to drop zero pages
-    $cmd .= " -o compression=zle";
-
-    # skip log devices
-    $cmd .= " -o logbias=throughput";
-    # only cache metadata in RAM (caching swap content does not make sense)
-    $cmd .= " -o primarycache=metadata";
-    # don't cache anything in L2ARC
-    $cmd .= " -o secondarycache=none";
-
-    $cmd .= " $zfspoolname/swap";
-    syscmd ($cmd)  == 0 ||
-       die "unable to create zfs swap device\n";
-
-    return "/dev/zvol/$zfspoolname/swap";
-}
-
 my $udevadm_trigger_block = sub {
     my ($nowait) = @_;
 
@@ -1169,9 +1139,6 @@ sub extract_data {
 
            zfs_create_rpool($vdev);
 
-           my $swap_size = compute_swapsize($disksize);
-           $swapfile = zfs_create_swap($swap_size) if $swap_size;
-
        } else {
 
            die "target '$target_hd' is not a valid block device\n" if ! -b $target_hd;