X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=0d117e6d98e1c0a774decd27826fa25eeb6c20c1;hb=f15f0b7fc24bfea874ae0f2fab5a62cfb0f0f631;hp=acf0db27fc0ae019e02b49d71063eadc0b4eaba8;hpb=fe81034ee9664d8e131bac218b40d99a58a31649;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index acf0db2..0d117e6 100755
--- a/fai-revm
+++ b/fai-revm
@@ -71,9 +71,21 @@ done
 
 # change this to test different disk counts. 1 and > 1 should be the only
 # important things to test.
-disk_count=2
+disk_count=1
 
 
+if ! ip l show br0 &>/dev/null; then
+  cat <<'EOF'
+fai-rvm error: no bridge detected. add one to interfaces like this:
+iface eth0 inet manual
+iface br0 inet dhcp
+  bridge_ports eth0
+  bridge_stp off
+  bridge_maxwait 0
+EOF
+  exit 1
+fi
+
 if [[ $script_dir == /a/bin/* ]]; then
   # Copy our script elsewhere so we can develop it
   # and save it at the same time it's running
@@ -137,6 +149,9 @@ for ((i=1; i <= disk_count; i++)); do
   disk_arg+=("--disk path=$f")
   if $new_disk || [[ ! -e $f ]]; then
     sudo rm -f $f
+    # https://btrfs.wiki.kernel.org/index.php/FAQ
+    sudo touch $f
+    chattr +C $f
     e sudo qemu-img create -o preallocation=metadata -f qcow2 $f 50G
   fi
 done
@@ -157,8 +172,13 @@ e sudo iptables -P FORWARD ACCEPT
   #   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
   #   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
+cpus=1
+if (( $(nproc) > 2 )); then
+  cpus=2
+fi
+
 e sudo systemctl start libvirtd
-e sudo virt-install --rng /dev/urandom --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus 1 \
+e sudo virt-install --rng /dev/urandom --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus $cpus \
   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &