Debian only image creation

src/freedombone-image

@@ -97,6 +97,9 @@ ONION_ONLY="no"
 #MIRROR='http://httpredir.debian.org/debian'
 MIRROR='http://ftp.de.debian.org/debian'
 
+# Whether to only install debian but nothing else
+DEBIAN_INSTALL_ONLY='no'
+
 mesh_router_setup_script() {
     # create a setup script for a mesh router
     mesh_script_filename=$1
@@ -213,6 +216,10 @@ do
             shift
             MIRROR="$1"
             ;;
+        --debianonly|--basic|--minimal)
+            shift
+            DEBIAN_INSTALL_ONLY="$1"
+            ;;
         *)
             # unknown option
             ;;
@@ -314,7 +321,8 @@ make $IMAGE_TYPE \
      IMAGE_NAME="$IMAGE_NAME" \
      PROJECT_REPO="$PROJECT_REPO" \
      MIRROR="$MIRROR" \
-	 BUILD_MIRROR="$MIRROR"
+     BUILD_MIRROR="$MIRROR" \
+     DEBIAN_INSTALL_ONLY="$DEBIAN_INSTALL_ONLY"
 
 if [ ! "$?" = "0" ]; then
     echo $'Build failed'

src/freedombone-image-customise

@@ -75,6 +75,9 @@ TRACKER_PORT=6969
 # Whether sites are accessible only within a Tor browser
 ONION_ONLY="no"
 
+# Whether to only install debian and nothing else
+DEBIAN_INSTALL_ONLY="no"
+
 WIFI_INTERFACE='wlan0'
 
 enable_eatmydata_override() {
@@ -211,6 +214,9 @@ admin_user_sudo() {
 }
 
 create_generic_image() {
+    if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
+        return
+    fi  
     if [[ $GENERIC_IMAGE == "no" ]]; then
         return
     fi
@@ -380,7 +386,7 @@ atheros_wifi() {
 
 
 initialise_mesh() {
-    if [[ $VARIANT != "mesh" ]]; then
+    if [[ $VARIANT != "mesh" || $DEBIAN_INSTALL_ONLY != "no" ]]; then
         return
     fi
     freedombone-mesh-install -f firewall -r "${rootdir}"

src/freedombone-image-make

@@ -55,6 +55,7 @@ export MINIMAL_INSTALL
 export SSH_PORT
 export ONION_ONLY
 export PROJECT_REPO
+export DEBIAN_INSTALL_ONLY
 
 # Locate vmdebootstrap program fetched in Makefile
 basedir=`pwd`
@@ -169,6 +170,7 @@ sudo sed -i "s|MINIMAL_INSTALL=.*|MINIMAL_INSTALL=\"${MINIMAL_INSTALL}\"|g" $TEM
 sudo sed -i "s|SSH_PORT=.*|SSH_PORT=\"${SSH_PORT}\"|g" $TEMP_CUSTOMISE
 sudo sed -i "s|ONION_ONLY=.*|ONION_ONLY=\"${ONION_ONLY}\"|g" $TEMP_CUSTOMISE
 sudo sed -i "s|PROJECT_REPO=.*|PROJECT_REPO=\"${PROJECT_REPO}\"|g" $TEMP_CUSTOMISE
+sudo sed -i "s|DEBIAN_INSTALL_ONLY=.*|DEBIAN_INSTALL_ONLY=\"${DEBIAN_INSTALL_ONLY}\"|g" $TEMP_CUSTOMISE
 
 echo $"starting $VMDEBOOTSTRAP"
 # Run vmdebootstrap script to create image