Merge pull request #164 from tteck/v3

V3
This commit is contained in:
tteckster 2022-04-18 01:36:55 -04:00 committed by GitHub
commit 094912ca11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 24 deletions

View File

@ -239,7 +239,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -238,7 +238,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -240,7 +240,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -238,7 +238,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -239,7 +239,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -244,7 +244,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -298,8 +298,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -240,7 +240,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE

View File

@ -239,7 +239,7 @@ header_info
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" "; if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else else
VLAN="-tag $VLAN1" VLAN=",tag=$VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}" echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi; fi;
echo -e " ${CM}${CL} \n" echo -e " ${CM}${CL} \n"
@ -293,8 +293,7 @@ export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS=" export PCT_OPTIONS="
-features $FEATURES -features $FEATURES
-hostname $HN -hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET$GATE -net0 name=eth0,bridge=vmbr0,ip=$NET$GATE$VLAN
$VLAN
-onboot 1 -onboot 1
-cores $CORE_COUNT -cores $CORE_COUNT
-memory $RAM_SIZE -memory $RAM_SIZE