rework internalrun

derivative-maker · Jun 29, 2023 · 67003ab · 67003ab
1 parent f0c57ea
commit 67003ab
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 23 deletions.
diff --git a/build-steps.d/1100_sanity-tests b/build-steps.d/1100_sanity-tests
@@ -14,9 +14,6 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-## TODO
-#VMNAME="internalrun"
-
 source pre
 source colors
 source variables

diff --git a/build-steps.d/1120_prepare-build-machine b/build-steps.d/1120_prepare-build-machine
@@ -14,9 +14,6 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-## TODO
-#VMNAME="internalrun"
-
 source pre
 source colors
 source variables

diff --git a/build-steps.d/1130_cowbuilder-setup b/build-steps.d/1130_cowbuilder-setup
@@ -18,9 +18,6 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-## TODO
-#VMNAME="internalrun"
-
 source pre
 source colors
 source variables

diff --git a/build-steps.d/1140_local-dependencies b/build-steps.d/1140_local-dependencies
@@ -18,9 +18,6 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-## TODO
-#VMNAME="internalrun"
-
 source pre
 source colors
 source variables

diff --git a/build-steps.d/1200_create-debian-packages b/build-steps.d/1200_create-debian-packages
@@ -30,7 +30,7 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-VMNAME="internalrun"
+dist_build_internal_run="true"
 
 source pre
 source colors

diff --git a/help-steps/analyze_image b/help-steps/analyze_image
@@ -21,10 +21,7 @@ MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$MYDIR"
 cd ..
 
-## dist_build_one_parsed is read by help-steps/variables (help-steps/parse-cmd)
-## and by help-steps/mount-raw and help-steps/unmount-raw.
-export dist_build_one_parsed="1"
-export VMNAME="internalrun"
+dist_build_internal_run="true"
 
 cd help-steps
 source pre

diff --git a/help-steps/cleanup-files b/help-steps/cleanup-files
@@ -14,9 +14,8 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-dist_build_one_parsed="1"
+dist_build_internal_run="true"
 ROOT_CHECK="0"
-VMNAME="internalrun"
 
 source pre
 source colors

diff --git a/help-steps/git_sanity_test b/help-steps/git_sanity_test
@@ -21,8 +21,7 @@ if [ "$script_was_sourced" = "false" ]; then
    cd ..
    cd help-steps
 
-   dist_build_one_parsed="1"
-   VMNAME="internalrun"
+   dist_build_internal_run="true"
 
    source pre
    source colors

diff --git a/help-steps/live-config b/help-steps/live-config
@@ -14,8 +14,7 @@ cd "$MYDIR"
 cd ..
 cd help-steps
 
-dist_build_one_parsed="1"
-VMNAME="internalrun"
+dist_build_internal_run="true"
 
 source pre
 source colors