free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debian only image creation

This commit is contained in:
Bob Mottram 2016-03-30 10:35:07 +01:00
parent 4c853944e1
commit bb8b0c9c2d
4 changed files with 275 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
man/freedombone-image.1.gz
View File

Binary file not shown.

10
src/freedombone-image
View File

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

8
src/freedombone-image-customise
View File

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

2
src/freedombone-image-make
View File

@ -55,6 +55,7 @@ export MINIMAL_INSTALL
export SSH_PORT export SSH_PORT
export ONION_ONLY export ONION_ONLY
export PROJECT_REPO export PROJECT_REPO
export DEBIAN_INSTALL_ONLY
# Locate vmdebootstrap program fetched in Makefile # Locate vmdebootstrap program fetched in Makefile
basedir=`pwd` 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|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|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|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" echo $"starting $VMDEBOOTSTRAP"
# Run vmdebootstrap script to create image # Run vmdebootstrap script to create image