From acb3aac05fbca39997d7766743557ebba33be3ed Mon Sep 17 00:00:00 2001
From: braniz <bz@z-iq.de>
Date: Sun, 15 Nov 2020 09:42:54 +0100
Subject: [PATCH] .

---
 create_vbox.sh | 30 +++++++++++++++++-------------
 create_vdi.sh  | 15 +++++++++------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/create_vbox.sh b/create_vbox.sh
index 3245cf6..1ded7ea 100644
--- a/create_vbox.sh
+++ b/create_vbox.sh
@@ -4,9 +4,6 @@
 # 
 # Create VBox
 
-#VAR_QUAN=${VAR_QUAN:-1}
-#VAR_CPU=${VAR_CPU:-1}
-#VAR_MEM=${VAR_MEM:-1024}
 VAR_OS_UBU=Ubuntu_64
 VAR_OS_RH=RedHat_64
 VAR_VID=32
@@ -16,11 +13,12 @@ VAR_NET=en0
 
 # Komponenten der Installation
 
-VAR_PATH="${HOME}/VirtualBox VMs/ISO/"
+VAR_PATH="${HOME}/VirtualBox VMs/ISO"
 VAR_VB="${HOME}/VirtualBox VMs"
-VAR_UBU=ubuntu-20.04.1-desktop-amd64.iso
-VAR_CO7=CentOS-7-x86_64-DVD-2003.iso
-VAR_CO8=
+VAR_UBUD=ubuntu-20.04.1-desktop-amd64.iso
+VAR_UBUS=ubuntu-20.04.1-live-server-amd64.iso
+VAR_CO7=CentOS-7-x86_64-Minimal-2009.iso
+VAR_CO8=CentOS-8.2.2004-x86_64-minimal.iso
 
 clear
 
@@ -30,14 +28,19 @@ read -p "Wievile VMs werden benoetigt? [1]: " VAR_QUAN
 read -p "Welche Praefix soll die VM erhalten?: " VAR_PRE
 
 PS3='Please enter your choice: '
-options=("Ubuntu" "CentOS 7" "CentOS 8" "Quit")
+options=("Ubuntu Desktop" "Ubuntu Server" "CentOS 7" "CentOS 8" "Quit")
 select opt in "${options[@]}"
 do
     case $opt in
-        "Ubuntu")
+        "Ubuntu Desktop")
             VAR_NAME="${VAR_PRE}"
             VAR_OS="${VAR_OS_UBU}"
-            VAR_ISO="${VAR_UBU}"
+            VAR_ISO="${VAR_UBUD}"
+            ;;
+        "Ubuntu Server")
+            VAR_NAME="${VAR_PRE}"
+            VAR_OS="${VAR_OS_UBU}"
+            VAR_ISO="${VAR_UBUS}"
             ;;
         "CentOS 7")
             VAR_NAME="${VAR_PRE}"
@@ -60,9 +63,10 @@ do
 read -p "Wieviele CPUs? [1] :" VAR_CPU
 read -p "Wiviel Memory? [1024] :" VAR_MEM
 
+VAR_QUAN=${VAR_QUAN:-1}
 VAR_CPU=${VAR_CPU:-1}
 VAR_MEM=${VAR_MEM:-1024}
-VAR_QUAN=${VAR_QUAN:-1}
+
 
     for N in $(seq 1 $VAR_QUAN)
     do
@@ -70,7 +74,7 @@ VAR_QUAN=${VAR_QUAN:-1}
           --name ${VAR_NAME}-${N} \
           --ostype ${VAR_OS} \
           --register \
-          --basefolder ${VAR_NAME}-${N} 
+          --basefolder ${VAR_VB}/
 
 # CPU Memory Netzwerk RDP
 echo "Netzwerk"
@@ -144,7 +148,7 @@ echo "HDD"
           --boot3 none \
           --boot4 none
 
-      VBoxManage startvm --type headless ${VAR_NAME}-${N}
+#      VBoxManage startvm --type headless ${VAR_NAME}-${N}
     done
 break
 done
diff --git a/create_vdi.sh b/create_vdi.sh
index b8e7545..f3eaa7a 100644
--- a/create_vdi.sh
+++ b/create_vdi.sh
@@ -4,9 +4,6 @@
 # 
 # Create VBox from template
 
-#VAR_QUAN=${VAR_QUAN:-1}
-#VAR_CPU=${VAR_CPU:-1}
-#VAR_MEM=${VAR_MEM:-1024}
 VAR_OS_UBU=Ubuntu_64
 VAR_OS_RH=RedHat_64
 VAR_VID=32
@@ -17,7 +14,8 @@ VAR_NET=en0
 # Komponenten der Installation
 
 VAR_PATH="${HOME}/VirtualBox VMs/VDI/"
-VAR_UBU=ubu2004_master.vdi
+VAR_UBUS=ubu2004s_master.vdi
+VAR_UBUD=ubu2004d_master.vdi
 VAR_CO7=centos7_master.vdi
 VAR_CO8=centos8_master.vdi
 
@@ -34,11 +32,16 @@ options=("Ubuntu" "CentOS 7" "CentOS 8" "Quit")
 select opt in "${options[@]}"
 do
     case $opt in
-        "Ubuntu")
+        "Ubuntu Desktop")
             VAR_NAME="${VAR_PRE}"
-            VAR_OS="${VAR_OS_UBU}"
+            VAR_OS="${VAR_OS_UBUD}"
             VAR_ISO="${VAR_UBU}"
             ;;
+        "Ubuntu Server")
+            VAR_NAME="${VAR_PRE}"
+            VAR_OS="${VAR_OS_UBUD}"
+            VAR_ISO="${VAR_UBUS}"
+            ;;
         "CentOS 7")
             VAR_NAME="${VAR_PRE}"
             VAR_OS="${VAR_OS_RH}"