hippolyte's changes

vm-start.sh

@@ -67,12 +67,12 @@ INIT() {
 
     mkdir -p conf
     cat << EOF > "conf/$NAME-vm_var.sh"
-NAME="$NAME"
+NAME="${NAME}"
 VMHOSTNAME="\${NAME}-vm"
 VMDRIVE="\${VMHOSTNAME}.cow"
-NPROC="$NPROC"
+NPROC="${NPROC}"
-MEMORY="$MEMORY"
+MEMORY="${MEMORY}"
-FORWARD="$FORWARD"
+FORWARD="${FORWARD}"
 LOCATION="\${NAME}-sandbox"
 EOF
     chmod +x "conf/$NAME-vm_var.sh"
@@ -168,6 +168,14 @@ SUPPRESS() {
     fi
 }
 
+set_uefi() {
+    UEFI="set"
+    OPTION="${OPTION} \
+        -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd \
+        -drive if=pflash,format=raw,file=${MAIN_LOCATION}/${LOCATION}/OVMF_VARS.4m.fd"
+
+}
+
 
 
 # gère les paramètres
@@ -222,10 +230,7 @@ for (( i=3; i<=$#; i++)); do
             MEMORY="${!i#*=}"
             ;;
         "uefi")
-            UEFI="set"
+            set_uefi
-            OPTION="$OPTION \
-                -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd \
-                -drive if=pflash,format=raw,file=${MAIN_LOCATION}/${LOCATION}/OVMF_VARS.4m.fd"
             ;;
     esac
 done
@@ -233,10 +238,7 @@ done
 
 if [ "${UEFI}" == "yes" ]
 then
-    UEFI="set"
+    set_uefi
-    OPTION="$OPTION \
-        -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd \
-        -drive if=pflash,format=raw,file=${MAIN_LOCATION}/${LOCATION}/OVMF_VARS.4m.fd"
 fi