Disable full upgrade during install on Debian distros.

lavabit · Oct 30, 2023 · 1720bcd · 1720bcd
1 parent dad6839
commit 1720bcd
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 27 deletions.
diff --git a/http/generic.debian10.vagrant.cfg b/http/generic.debian10.vagrant.cfg
@@ -52,7 +52,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.debian11.vagrant.cfg b/http/generic.debian11.vagrant.cfg
@@ -52,7 +52,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.debian12.docker.cfg b/http/generic.debian12.docker.cfg
@@ -48,7 +48,7 @@ d-i passwd/make-user boolean false
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.debian12.vagrant.cfg b/http/generic.debian12.vagrant.cfg
@@ -52,7 +52,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.devuan2.vagrant.cfg b/http/generic.devuan2.vagrant.cfg
@@ -50,7 +50,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed net-tools
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.devuan3.vagrant.cfg b/http/generic.devuan3.vagrant.cfg
@@ -51,7 +51,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed net-tools
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.devuan4.vagrant.cfg b/http/generic.devuan4.vagrant.cfg
@@ -51,7 +51,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed net-tools
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.devuan5.docker.cfg b/http/generic.devuan5.docker.cfg
@@ -47,7 +47,7 @@ d-i passwd/make-user boolean false
 d-i pkgsel/include string curl openssh-server sudo sed net-tools
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.devuan5.vagrant.cfg b/http/generic.devuan5.vagrant.cfg
@@ -51,7 +51,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed net-tools
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/generic.ubuntu1804.vagrant.cfg b/http/generic.ubuntu1804.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/generic.ubuntu1810.vagrant.cfg b/http/generic.ubuntu1810.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/generic.ubuntu1904.vagrant.cfg b/http/generic.ubuntu1904.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/generic.ubuntu1910.vagrant.cfg b/http/generic.ubuntu1910.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/generic.ubuntu2004.vagrant.cfg b/http/generic.ubuntu2004.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/magma.debian10.vagrant.cfg b/http/magma.debian10.vagrant.cfg
@@ -52,7 +52,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/magma.debian11.vagrant.cfg b/http/magma.debian11.vagrant.cfg
@@ -52,7 +52,7 @@ d-i passwd/username string vagrant
 d-i pkgsel/include string curl openssh-server sudo sed
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 d-i pkgsel/language-packs multiselect en
 d-i user-setup/allow-password-weak boolean true
 d-i user-setup/encrypt-home boolean false

diff --git a/http/magma.ubuntu1804.vagrant.cfg b/http/magma.ubuntu1804.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/magma.ubuntu1810.vagrant.cfg b/http/magma.ubuntu1810.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/magma.ubuntu1904.vagrant.cfg b/http/magma.ubuntu1904.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/magma.ubuntu1910.vagrant.cfg b/http/magma.ubuntu1910.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/http/magma.ubuntu2004.vagrant.cfg b/http/magma.ubuntu2004.vagrant.cfg
@@ -48,7 +48,7 @@ d-i pkgsel/include string curl openssh-server sudo sed linux-tools-$(uname -r) l
 d-i pkgsel/install-language-support boolean false
 d-i pkgsel/language-packs multiselect en
 d-i pkgsel/update-policy select none
-d-i pkgsel/upgrade select full-upgrade
+d-i pkgsel/upgrade select none
 
 d-i mirror/http/proxy string
 d-i mirror/country string manual

diff --git a/res/scripts/direct.sh b/res/scripts/direct.sh
@@ -226,7 +226,7 @@ elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf"
   ARCH="mips64"
 elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
   ARCH="mips"
-elif  [ "$ARCH" == "ppc64le" ]; then
+elif [ "$ARCH" == "ppc64le" ]; then
   ARCH="ppc64le"
 elif [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
   ARCH="mips64le"
@@ -340,7 +340,6 @@ function upload_box() {
     --header "Authorization: Bearer $VAGRANT_CLOUD_TOKEN" \
     --request DELETE \
     "https://app.vagrantup.com/api/v2/box/$ORG/$BOX/version/$VERSION/provider/${PROVIDER}/${ARCH}" || \
-     https://app.vagrantup.com/api/v2/box/$ORG/$BOX/version/$VERSION/provider/virtualbox/amd64
     { printf "${T_BYEL}  Unable to delete an existing version of the box. [ $ORG $BOX $PROVIDER $ARCH $VERSION ]${T_RESET}\n" >&2 ; }
 
   # Sleep to let the deletion propagate.
@@ -372,9 +371,9 @@ function upload_box() {
   UPLOAD_CALLBACK="$(echo "$UPLOAD_RESPONSE" | jq -r .callback)"
 
   if [ "$UPLOAD_PATH" == "" ] || [ "$UPLOAD_PATH" == "echo" ] || [ "$UPLOAD_CALLBACK" == "" ] || [ "$UPLOAD_CALLBACK" == "echo" ]; then
-     printf "\n${T_BYEL}  The $FILENAME file failed to upload. Restarting. [ $ORG $BOX $PROVIDER $ARCH $VERSION / RECURSION = $RECURSION ]${T_RESET}\n\n" >&2
-     exec "$0" "$1" $RECURSION
-     exit $?
+    printf "\n${T_BYEL}  The $FILENAME file failed to upload. Restarting. [ $ORG $BOX $PROVIDER $ARCH $VERSION / RECURSION = $RECURSION ]${T_RESET}\n\n" >&2
+    exec "$0" "$1" $RECURSION
+    exit $?
   fi
 
   # Sleep to give the cloud time to get setup.

diff --git a/res/scripts/match.sh b/res/scripts/match.sh
@@ -165,7 +165,7 @@ while [[ "${COUNT}" -le 100 ]]; do
   sleep $DELAY
 done
 
-CHECKSUM=`echo $DATA | jq -e -r ".providers[] | select( .name | contains(\"$PROVIDER\"))  | select( .architecture | contains(\"$ARCH\")) | .checksum"`
+CHECKSUM=`echo $DATA | jq -e -r ".providers[] | select( .name | contains(\"$PROVIDER\")) | select( .architecture | contains(\"$ARCH\")) | .checksum"`
 
 if [ "$CHECKSUM" == "" ]; then
   tput setaf 1; printf "\n\nThe SHA 256 hash couldn't be retrieved from the server.\n\n\n"; tput sgr0