add ability to test multiple disks

to allow easier testing of ZFS modes requiring more than one disk.
Also add a target which defaults to 4 disks.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 09cf0a87370499aee165e77c98cd1130d8ad7a3e..c72df6cadda5d28a9845bfc33b74a5aeefbf641f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,14 +64,19 @@ upload-pmg: ${PMG_DEB}
 upload-pve: ${PVE_DEB}
        tar cf - ${PVE_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
 
-test.img:
-       truncate -s 2G test.img
+%.img:
+       truncate -s 2G $@
 
 check-pve: ${PVE_DEB} test.img
        rm -rf testdir
        dpkg -X ${PVE_DEB} testdir
        G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img
 
+check-pve-multidisks: ${PVE_DEB} test.img test2.img test3.img test4.img
+       rm -rf testdir
+       dpkg -X ${PVE_DEB} testdir
+       G_SLICE=always-malloc perl -I testdir/usr/share/perl5 testdir/usr/bin/proxinstall -t test.img,test2.img,test3.img,test4.img
+
 check-pmg: ${PMG_DEB} test.img
        rm -rf testdir
        dpkg -X ${PMG_DEB} testdir
@@ -80,5 +85,5 @@ check-pmg: ${PMG_DEB} test.img
 .phony: clean
 clean:
        make -C html-common clean
-       rm -rf *~ *.deb target build packages packages.tmp testdir test.img pve-final.pkglist *.buildinfo *.changes country.dat final.pkglist
+       rm -rf *~ *.deb target build packages packages.tmp testdir test*.img pve-final.pkglist *.buildinfo *.changes country.dat final.pkglist
        find . -name '*~' -exec rm {} ';'

diff --git a/proxinstall b/proxinstall
index 5ef12cb70799f7f5343563caf7b43ac97f4fff7e..1a1d2f668a672713ef67c6052eb2aee195c4bed2 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -559,7 +559,11 @@ sub hd_list {
     my $res = ();
 
     if ($opt_testmode) {
-       push @$res, [-1, $opt_testmode, int((-s $opt_testmode)/512), "TESTDISK"];
+       my @disks = split /,/, $opt_testmode;
+
+       for my $disk (@disks) {
+           push @$res, [-1, $disk, int((-s $disk)/512), "TESTDISK"];
+       }
        return $res;
     }