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

Can configure wifi from image builder

This commit is contained in:
Bob Mottram 2016-04-26 15:41:35 +01:00
parent 266c31e10a
commit ddc7f1a7bb
No known key found for this signature in database
GPG Key ID: BA68F26108DC9F87
3 changed files with 152 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
src/freedombone-image
View File

@ -100,6 +100,13 @@ MIRROR='http://ftp.de.debian.org/debian'
# Whether to only install debian but nothing else # Whether to only install debian but nothing else
DEBIAN_INSTALL_ONLY='no' DEBIAN_INSTALL_ONLY='no'
# wifi settings
WIFI_INTERFACE='wlan0'
WIFI_SSID=
WIFI_TYPE='wpa-psk'
WIFI_PASSPHRASE=
WIFI_HOTSPOT='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
@ -220,24 +227,46 @@ do
shift shift
DEBIAN_INSTALL_ONLY="$1" DEBIAN_INSTALL_ONLY="$1"
;; ;;
*) --interface|--if)
# unknown option shift
;; WIFI_INTERFACE="$1"
esac ;;
shift --ssid|--essid)
shift
WIFI_SSID="$1"
;;
--wifitype)
shift
WIFI_TYPE="$1"
;;
--wifipass|--passphrase)
shift
WIFI_PASSPHRASE="$1"
;;
--hotspot)
shift
if [[ $"$1" == $'yes' || $"$1" == $'y' ]]; then
WIFI_HOTSPOT='yes'
fi
;;
*)
# unknown option
;;
esac
shift
done done
if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL" ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
if [ -f freedombone.cfg ]; then if [ -f freedombone.cfg ]; then
CONFIG_FILENAME=freedombone.cfg CONFIG_FILENAME=freedombone.cfg
DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}') DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
fi fi
fi fi
if [[ $GENERIC_IMAGE == "yes" ]]; then if [[ $GENERIC_IMAGE == "yes" ]]; then
USERNAME=$GENERIC_IMAGE_USERNAME USERNAME=$GENERIC_IMAGE_USERNAME
PASSWORD=$GENERIC_IMAGE_PASSWORD PASSWORD=$GENERIC_IMAGE_PASSWORD
fi fi
# If this is a mesh variant then create an appropriate script # If this is a mesh variant then create an appropriate script
@ -248,45 +277,45 @@ fi
#fi #fi
if [ ! $PASSWORD ]; then if [ ! $PASSWORD ]; then
# generate a random password # generate a random password
PASSWORD="$(openssl rand -base64 10 | cut -c1-8)" PASSWORD="$(openssl rand -base64 10 | cut -c1-8)"
fi fi
# Move any existing images into a build subdirectory # Move any existing images into a build subdirectory
image_types=( xz img sig vdi qcow2 ) image_types=( xz img sig vdi qcow2 )
for im in "${image_types[@]}" for im in "${image_types[@]}"
do do
no_of_files=$(ls -afq ${CURR_DIR}/${PROJECT_NAME}*.${im} | wc -l) no_of_files=$(ls -afq ${CURR_DIR}/${PROJECT_NAME}*.${im} | wc -l)
if (( no_of_files > 0 )); then if (( no_of_files > 0 )); then
if [ ! -d ${CURR_DIR}/build ]; then if [ ! -d ${CURR_DIR}/build ]; then
mkdir ${CURR_DIR}/build mkdir ${CURR_DIR}/build
fi fi
mv -f ${CURR_DIR}/${PROJECT_NAME}*.${im} ${CURR_DIR}/build mv -f ${CURR_DIR}/${PROJECT_NAME}*.${im} ${CURR_DIR}/build
fi fi
done done
# Delete anything which didn't move # Delete anything which didn't move
for im in "${image_types[@]}" for im in "${image_types[@]}"
do do
no_of_files=$(ls -afq ${CURR_DIR}/${PROJECT_NAME}*.${im} | wc -l) no_of_files=$(ls -afq ${CURR_DIR}/${PROJECT_NAME}*.${im} | wc -l)
if (( no_of_files > 0 )); then if (( no_of_files > 0 )); then
rm -f ${CURR_DIR}/${PROJECT_NAME}*.${im} rm -f ${CURR_DIR}/${PROJECT_NAME}*.${im}
fi fi
done done
# Remove any existing login credentials file # Remove any existing login credentials file
if [ -f ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt ]; then if [ -f ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt ]; then
rm ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt rm ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
fi fi
if [ -d $TEMPBUILD_DIR ]; then if [ -d $TEMPBUILD_DIR ]; then
rm -rf $TEMPBUILD_DIR rm -rf $TEMPBUILD_DIR
fi fi
mkdir -p $TEMPBUILD_DIR mkdir -p $TEMPBUILD_DIR
if [ -f /usr/local/bin/$MAKEFILE ]; then if [ -f /usr/local/bin/$MAKEFILE ]; then
cp /usr/local/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile cp /usr/local/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
else else
cp /usr/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile cp /usr/bin/$MAKEFILE $TEMPBUILD_DIR/Makefile
fi fi
cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR
@ -295,64 +324,69 @@ chown -R $CURR_USER:$CURR_USER $TEMPBUILD_DIR
cd $TEMPBUILD_DIR cd $TEMPBUILD_DIR
if [[ $MINIMAL_INSTALL == "yes" ]]; then if [[ $MINIMAL_INSTALL == "yes" ]]; then
IMAGE_NAME='min' IMAGE_NAME='min'
fi fi
if [[ $ONION_ONLY != "no" ]]; then if [[ $ONION_ONLY != "no" ]]; then
IMAGE_NAME='onion' IMAGE_NAME='onion'
fi fi
cd $TEMPBUILD_DIR cd $TEMPBUILD_DIR
make $IMAGE_TYPE \ make $IMAGE_TYPE \
USERNAME="$USERNAME" \ USERNAME="$USERNAME" \
PASSWORD="$PASSWORD" \ PASSWORD="$PASSWORD" \
ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \ ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \ BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
NAMESERVER1="$NAMESERVER1" \ NAMESERVER1="$NAMESERVER1" \
NAMESERVER2="$NAMESERVER2" \ NAMESERVER2="$NAMESERVER2" \
PROJECT_NAME="$PROJECT_NAME" \ PROJECT_NAME="$PROJECT_NAME" \
CONFIG_FILENAME="$CONFIG_FILENAME" \ CONFIG_FILENAME="$CONFIG_FILENAME" \
IMAGE_SIZE="$IMAGE_SIZE" \ IMAGE_SIZE="$IMAGE_SIZE" \
SSH_PUBKEY="$SSH_PUBKEY" \ SSH_PUBKEY="$SSH_PUBKEY" \
GENERIC_IMAGE="$GENERIC_IMAGE" \ GENERIC_IMAGE="$GENERIC_IMAGE" \
MINIMAL_INSTALL="$MINIMAL_INSTALL" \ MINIMAL_INSTALL="$MINIMAL_INSTALL" \
SSH_PORT="$SSH_PORT" \ SSH_PORT="$SSH_PORT" \
ONION_ONLY="$ONION_ONLY" \ ONION_ONLY="$ONION_ONLY" \
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" DEBIAN_INSTALL_ONLY="$DEBIAN_INSTALL_ONLY" \
WIFI_INTERFACE="$WIFI_INTERFACE" \
WIFI_SSID="$WIFI_SSID" \
WIFI_TYPE="$WIFI_TYPE" \
WIFI_PASSPHRASE="$WIFI_PASSPHRASE" \
WIFI_HOTSPOT="$WIFI_HOTSPOT"
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
echo $'Build failed' echo $'Build failed'
rm -rf $TEMPBUILD_DIR rm -rf $TEMPBUILD_DIR
exit 1 exit 1
fi fi
EXPECTED_EXTENSION='xz' EXPECTED_EXTENSION='xz'
if [[ $IMAGE_TYPE == "qemu"* ]]; then if [[ $IMAGE_TYPE == "qemu"* ]]; then
EXPECTED_EXTENSION='qcow2' EXPECTED_EXTENSION='qcow2'
fi fi
if [[ $IMAGE_TYPE == "virtualbox"* ]]; then if [[ $IMAGE_TYPE == "virtualbox"* ]]; then
EXPECTED_EXTENSION='vdi' EXPECTED_EXTENSION='vdi'
fi fi
shopt -s nullglob shopt -s nullglob
imgfiles=(build/${PROJECT_NAME}*.${EXPECTED_EXTENSION}) imgfiles=(build/${PROJECT_NAME}*.${EXPECTED_EXTENSION})
if [ ${#imgfiles[@]} -eq 0 ]; then if [ ${#imgfiles[@]} -eq 0 ]; then
echo $'Image was not created' echo $'Image was not created'
rm -rf $TEMPBUILD_DIR rm -rf $TEMPBUILD_DIR
exit 2 exit 2
fi fi
# Move images from temporary directory to the current directory # Move images from temporary directory to the current directory
for im in "${image_types[@]}" for im in "${image_types[@]}"
do do
no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l) no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l)
if (( no_of_files > 0 )); then if (( no_of_files > 0 )); then
mv build/${PROJECT_NAME}*.${im} ${CURR_DIR}/ mv build/${PROJECT_NAME}*.${im} ${CURR_DIR}/
fi fi
done done
# Remove the temporary directory # Remove the temporary directory
@ -367,32 +401,32 @@ Image was created.
You will be able to log into it with: You will be able to log into it with:
" "
if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
echo $" ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT echo $" ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT
Password: $PASSWORD Password: $PASSWORD
" "
else else
if [[ $IMAGE_TYPE != "qemu"* ]]; then if [[ $IMAGE_TYPE != "qemu"* ]]; then
echo $" Username: $USERNAME echo $" Username: $USERNAME
Password: $PASSWORD Password: $PASSWORD
" "
else else
if [[ $IMAGE_TYPE != "qemu-x86_64"* && $IMAGE_TYPE != "qemu-amd64"* ]]; then if [[ $IMAGE_TYPE != "qemu-x86_64"* && $IMAGE_TYPE != "qemu-amd64"* ]]; then
echo "qemu-system-i386 -m ${VM_MEMORY} $(ls ${PROJECT_NAME}*.qcow2)" echo "qemu-system-i386 -m ${VM_MEMORY} $(ls ${PROJECT_NAME}*.qcow2)"
else else
echo "qemu-system-x86_64 -m ${VM_MEMORY} $(ls ${PROJECT_NAME}*.qcow2)" echo "qemu-system-x86_64 -m ${VM_MEMORY} $(ls ${PROJECT_NAME}*.qcow2)"
fi fi
echo $" echo $"
Username: $USERNAME Username: $USERNAME
Password: $PASSWORD Password: $PASSWORD
" "
fi fi
fi fi
ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2 ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.xz ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
# Remove the mesh script after use # Remove the mesh script after use
if [[ $VARIANT == "mesh"* ]]; then if [[ $VARIANT == "mesh"* ]]; then
rm -f $CONFIG_FILENAME rm -f $CONFIG_FILENAME
fi fi
# record the default login credentials for later use # record the default login credentials for later use
@ -401,12 +435,12 @@ Password: $PASSWORD" > ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
chmod 600 ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt chmod 600 ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
echo '' echo ''
echo $'You can copy the image to a microSD card with:' echo $'You can copy the image to a microSD card with:'
echo '' echo ''
echo " unxz -k ${PROJECT_NAME}*.img.xz" echo " unxz -k ${PROJECT_NAME}*.img.xz"
echo " sudo dd bs=1M if=${PROJECT_NAME}*.img of=/dev/sdX conv=fdatasync" echo " sudo dd bs=1M if=${PROJECT_NAME}*.img of=/dev/sdX conv=fdatasync"
echo '' echo ''
fi fi
exit 0 exit 0

23
src/freedombone-image-customise
View File

@ -78,7 +78,12 @@ ONION_ONLY="no"
# Whether to only install debian and nothing else # Whether to only install debian and nothing else
DEBIAN_INSTALL_ONLY="no" DEBIAN_INSTALL_ONLY="no"
# wifi settings
WIFI_INTERFACE='wlan0' WIFI_INTERFACE='wlan0'
WIFI_SSID=
WIFI_TYPE='wpa-psk'
WIFI_PASSPHRASE=
WIFI_HOTSPOT='no'
enable_eatmydata_override() { enable_eatmydata_override() {
chroot $rootdir apt-get install --no-install-recommends -y eatmydata chroot $rootdir apt-get install --no-install-recommends -y eatmydata
@ -421,6 +426,23 @@ initialise_mesh() {
chroot "$rootdir" systemctl enable $MESH_SERVICE chroot "$rootdir" systemctl enable $MESH_SERVICE
} }
configure_wifi() {
if [[ $VARIANT == "mesh" ]]; then
return
fi
if [[ $WIFI_TYPE != 'none' ]]; then
if [ ! $WIFI_PASSPHRASE ]; then
return
fi
if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
return
fi
chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT
else
chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT
fi
}
# Set to true/false to control if eatmydata is used during build # Set to true/false to control if eatmydata is used during build
use_eatmydata=true use_eatmydata=true
@ -540,6 +562,7 @@ create_generic_image
atheros_wifi atheros_wifi
continue_installation continue_installation
initialise_mesh initialise_mesh
configure_wifi
cd / cd /
echo $"info: killing leftover processes in chroot" echo $"info: killing leftover processes in chroot"

10
src/freedombone-image-make
View File

@ -56,6 +56,11 @@ export SSH_PORT
export ONION_ONLY export ONION_ONLY
export PROJECT_REPO export PROJECT_REPO
export DEBIAN_INSTALL_ONLY export DEBIAN_INSTALL_ONLY
export WIFI_INTERFACE
export WIFI_SSID
export WIFI_TYPE
export WIFI_PASSPHRASE
export WIFI_HOTSPOT
# Locate vmdebootstrap program fetched in Makefile # Locate vmdebootstrap program fetched in Makefile
basedir=`pwd` basedir=`pwd`
@ -171,6 +176,11 @@ 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 sudo sed -i "s|DEBIAN_INSTALL_ONLY=.*|DEBIAN_INSTALL_ONLY=\"${DEBIAN_INSTALL_ONLY}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|WIFI_INTERFACE=.*|WIFI_INTERFACE=\"${WIFI_INTERFACE}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|WIFI_SSID=.*|WIFI_SSID=\"${WIFI_SSID}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|WIFI_TYPE=.*|WIFI_TYPE=\"${WIFI_TYPE}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|WIFI_PASSPHRASE=.*|WIFI_PASSPHRASE=\"${WIFI_PASSPHRASE}\"|g" $TEMP_CUSTOMISE
sudo sed -i "s|WIFI_HOTSPOT=.*|WIFI_HOTSPOT=\"${WIFI_HOTSPOT}\"|g" $TEMP_CUSTOMISE
echo $"starting $VMDEBOOTSTRAP" echo $"starting $VMDEBOOTSTRAP"
# Run vmdebootstrap script to create image # Run vmdebootstrap script to create image