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

Don't preinstall repos on mesh variant

This commit is contained in:
Bob Mottram 2017-06-19 12:03:01 +01:00
parent cacb9770a7
commit 89d05deae7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/freedombone-image-customise
View File

@ -285,7 +285,7 @@ following commands, then enter your details.
} }
configure_ssh() { configure_ssh() {
if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then if [[ $VARIANT == "mesh"* ]]; then
return return
fi fi
@ -320,7 +320,7 @@ create_generic_image() {
fi fi
# Don't install any configuration. This will be a base system # Don't install any configuration. This will be a base system
if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then if [[ $VARIANT != "mesh"* ]]; then
CONFIG_FILENAME= CONFIG_FILENAME=
else else
touch $rootdir/root/.initial_mesh_setup touch $rootdir/root/.initial_mesh_setup
@ -403,7 +403,7 @@ EOF
echo " git checkout stretch" >> $rootdir/root/.bashrc echo " git checkout stretch" >> $rootdir/root/.bashrc
echo " make install" >> $rootdir/root/.bashrc echo " make install" >> $rootdir/root/.bashrc
if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then if [[ $VARIANT != "mesh"* && $VARIANT != "usb" ]]; then
if [[ "$SOCIALINSTANCE" == "gnusocial" ]]; then if [[ "$SOCIALINSTANCE" == "gnusocial" ]]; then
echo " ${PROJECT_NAME} menuconfig-gnusocial" >> $rootdir/root/.bashrc echo " ${PROJECT_NAME} menuconfig-gnusocial" >> $rootdir/root/.bashrc
else else
@ -433,7 +433,7 @@ EOF
echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc
if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then if [[ $VARIANT != "mesh"* && $VARIANT != "usb" ]]; then
echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
@ -583,7 +583,7 @@ INSTALL_DIR=$HOME/build
INSTALLING_MESH= INSTALLING_MESH=
initialise_mesh() { initialise_mesh() {
if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then if [[ $VARIANT != "mesh"* ]]; then
return return
fi fi
if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
@ -1236,6 +1236,10 @@ function image_install_nodejs {
} }
function image_preinstall_repos { function image_preinstall_repos {
if [[ $VARIANT == "mesh"* ]]; then
return
fi
if [ ! -d $rootdir/repos ]; then if [ ! -d $rootdir/repos ]; then
mkdir $rootdir/repos mkdir $rootdir/repos
fi fi
@ -1364,7 +1368,7 @@ if [ -n "$CUSTOM_SETUP" ]; then
chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)" chroot "$rootdir" gdebi -n /tmp/"$(basename $CUSTOM_SETUP)"
fi fi
if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "mesh" ]]; then if [[ $VARIANT != "mesh"* ]]; then
chroot "$rootdir" apt-get install -y openssh-server chroot "$rootdir" apt-get install -y openssh-server
fi fi
chroot "$rootdir" apt-get install -y sudo git dialog build-essential chroot "$rootdir" apt-get install -y sudo git dialog build-essential