From 94058fc3f12c09a4d6e795b81386d14e8e8bfdb0 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Wed, 19 Feb 2020 15:24:27 +0100 Subject: [PATCH 1/3] Generate ISO Debian version bump to 10.3.0 --- build/scripts/generate_dappnode_iso_debian.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/scripts/generate_dappnode_iso_debian.sh b/build/scripts/generate_dappnode_iso_debian.sh index b48ed9c..23b55e7 100755 --- a/build/scripts/generate_dappnode_iso_debian.sh +++ b/build/scripts/generate_dappnode_iso_debian.sh @@ -1,9 +1,9 @@ #!/bin/sh -echo "Downloading debian ISO image: firmware-10.2.0-amd64-netinst.iso..." -if [ ! -f /images/firmware-10.2.0-amd64-netinst.iso ]; then - wget https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/10.2.0+nonfree/amd64/iso-cd/firmware-10.2.0-amd64-netinst.iso \ - -O /images/firmware-10.2.0-amd64-netinst.iso +echo "Downloading debian ISO image: firmware-10.3.0-amd64-netinst.iso..." +if [ ! -f /images/firmware-10.3.0-amd64-netinst.iso ]; then + wget https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/10.3.0+nonfree/amd64/iso-cd/firmware-10.3.0-amd64-netinst.iso\ + -O /images/firmware-10.3.0-amd64-netinst.iso fi echo "Done!" @@ -12,11 +12,11 @@ rm -rf dappnode-iso rm DappNode-debian-* echo "Extracting the iso..." -xorriso -osirrox on -indev /images/firmware-10.2.0-amd64-netinst.iso \ +xorriso -osirrox on -indev /images/firmware-10.3.0-amd64-netinst.iso \ -extract / dappnode-iso echo "Obtaining the isohdpfx.bin for hybrid ISO..." -dd if=/images/firmware-10.2.0-amd64-netinst.iso bs=432 count=1 \ +dd if=/images/firmware-10.3.0-amd64-netinst.iso bs=432 count=1 \ of=dappnode-iso/isolinux/isohdpfx.bin cd dappnode-iso From 3a719b96111718d5b53d9ac88e937dcd632bde1e Mon Sep 17 00:00:00 2001 From: francois branciard Date: Thu, 20 Feb 2020 20:51:38 +0100 Subject: [PATCH 2/3] add wireguard install and dependencies --- build/dappnode/extra/wireguard.dependencies | 47 +++++++++++++++++++++ build/dappnode/scripts/dappnode_install.sh | 11 +++++ 2 files changed, 58 insertions(+) create mode 100644 build/dappnode/extra/wireguard.dependencies diff --git a/build/dappnode/extra/wireguard.dependencies b/build/dappnode/extra/wireguard.dependencies new file mode 100644 index 0000000..47d7188 --- /dev/null +++ b/build/dappnode/extra/wireguard.dependencies @@ -0,0 +1,47 @@ +ftp.br.debian.org/debian/pool/main/b/binutils/binutils_2.31.1-16_amd64.deb +ftp.br.debian.org/debian/pool/main/b/binutils/binutils-common_2.31.1-16_amd64.deb +ftp.br.debian.org/debian/pool/main/b/binutils/binutils-x86-64-linux-gnu_2.31.1-16_amd64.deb +ftp.br.debian.org/debian/pool/main/b/build-essential/build-essential_12.6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-defaults/cpp_8.3.0-1_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/cpp-8_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/d/dkms/dkms_2.6.1-4_all.deb +ftp.br.debian.org/debian/pool/main/d/dpkg/dpkg-dev_1.19.7_all.deb +ftp.br.debian.org/debian/pool/main/g/gcc-defaults/g++_8.3.0-1_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/g++-8_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-defaults/gcc_8.3.0-1_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/gcc-8_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libasan5_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libatomic1_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/b/binutils/libbinutils_2.31.1-16_amd64.deb +ftp.br.debian.org/debian/pool/main/g/glibc/libc6-dev_2.28-10_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libcc1-0_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/glibc/libc-dev-bin_2.28-10_amd64.deb +ftp.br.debian.org/debian/pool/main/d/dpkg/libdpkg-perl_1.19.7_all.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libgcc-8-dev_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libgomp1_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/i/isl/libisl19_0.20-2_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libitm1_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/liblsan0_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/m/mpclib3/libmpc3_1.1.0-1_amd64.deb +ftp.br.debian.org/debian/pool/main/m/mpfr4/libmpfr6_4.0.2-1_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libmpx2_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libquadmath0_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libstdc++-8-dev_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libtsan0_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/g/gcc-8/libubsan1_8.3.0-6_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-compiler-gcc-8-x86_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-all_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-all-amd64_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-amd64_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-cloud-amd64_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-common_4.19.98-1_all.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-common-rt_4.19.98-1_all.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-rt-amd64_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux-latest/linux-headers-amd64_4.19+105+deb10u3_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-kbuild-4.19_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/l/linux/linux-libc-dev_4.19.98-1_amd64.deb +ftp.br.debian.org/debian/pool/main/m/make-dfsg/make_4.2.1-1.2_amd64.deb +ftp.br.debian.org/debian/pool/main/p/patch/patch_2.7.6-3+deb10u1_amd64.deb +ftp.br.debian.org/debian/pool/main/w/wireguard/wireguard_1.0.20200206-1_all.deb +ftp.br.debian.org/debian/pool/main/w/wireguard-linux-compat/wireguard-dkms_0.0.20200215-1_all.deb +ftp.br.debian.org/debian/pool/main/w/wireguard/wireguard-tools_1.0.20200206-1_amd64.deb \ No newline at end of file diff --git a/build/dappnode/scripts/dappnode_install.sh b/build/dappnode/scripts/dappnode_install.sh index 2e69a25..7887827 100755 --- a/build/dappnode/scripts/dappnode_install.sh +++ b/build/dappnode/scripts/dappnode_install.sh @@ -188,6 +188,17 @@ dappnode_start() installExtra() { if [ -d "/usr/src/dappnode/extra" ]; then + echo -e "\e[32minstallExtra will start in few seconds ... : " 2>&1 | tee -a $LOG_DIR + # wait 10 sec to DNS resolver to be up for debian site url access ok + sleep 10 + for dependencies_file in /usr/src/dappnode/extra/*.dependencies; do + echo -e "\e[32minstallExtra. Deals dependencies file: $dependencies_file...\e[0m" 2>&1 | tee -a $LOG_DIR + while IFS="" read -r deb_link || [ -n "$deb_link" ] + do + echo -e "\e[32minstallExtra. Download .deb : $deb_link...\e[0m" 2>&1 | tee -a $LOG_DIR + eval "$WGET -P /usr/src/dappnode/extra/ \"${deb_link}\"" 2>&1 | tee -a $LOG_DIR + done < $dependencies_file + done dpkg -i /usr/src/dappnode/extra/*.deb 2>&1 | tee -a $LOG_DIR fi } From b8138b9bd15d9d911ea832d5ee8315d6a7e2d916 Mon Sep 17 00:00:00 2001 From: francois branciard Date: Mon, 2 Mar 2020 21:17:39 +0100 Subject: [PATCH 3/3] install wireguard with apt --- build/dappnode/extra/wireguard.dependencies | 47 ------------------- build/dappnode/scripts/dappnode_install.sh | 11 ----- .../dappnode/scripts/dappnode_install_pre.sh | 21 +++++++++ 3 files changed, 21 insertions(+), 58 deletions(-) delete mode 100644 build/dappnode/extra/wireguard.dependencies diff --git a/build/dappnode/extra/wireguard.dependencies b/build/dappnode/extra/wireguard.dependencies deleted file mode 100644 index 47d7188..0000000 --- a/build/dappnode/extra/wireguard.dependencies +++ /dev/null @@ -1,47 +0,0 @@ -ftp.br.debian.org/debian/pool/main/b/binutils/binutils_2.31.1-16_amd64.deb -ftp.br.debian.org/debian/pool/main/b/binutils/binutils-common_2.31.1-16_amd64.deb -ftp.br.debian.org/debian/pool/main/b/binutils/binutils-x86-64-linux-gnu_2.31.1-16_amd64.deb -ftp.br.debian.org/debian/pool/main/b/build-essential/build-essential_12.6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-defaults/cpp_8.3.0-1_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/cpp-8_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/d/dkms/dkms_2.6.1-4_all.deb -ftp.br.debian.org/debian/pool/main/d/dpkg/dpkg-dev_1.19.7_all.deb -ftp.br.debian.org/debian/pool/main/g/gcc-defaults/g++_8.3.0-1_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/g++-8_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-defaults/gcc_8.3.0-1_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/gcc-8_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libasan5_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libatomic1_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/b/binutils/libbinutils_2.31.1-16_amd64.deb -ftp.br.debian.org/debian/pool/main/g/glibc/libc6-dev_2.28-10_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libcc1-0_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/glibc/libc-dev-bin_2.28-10_amd64.deb -ftp.br.debian.org/debian/pool/main/d/dpkg/libdpkg-perl_1.19.7_all.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libgcc-8-dev_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libgomp1_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/i/isl/libisl19_0.20-2_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libitm1_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/liblsan0_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/m/mpclib3/libmpc3_1.1.0-1_amd64.deb -ftp.br.debian.org/debian/pool/main/m/mpfr4/libmpfr6_4.0.2-1_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libmpx2_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libquadmath0_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libstdc++-8-dev_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libtsan0_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/g/gcc-8/libubsan1_8.3.0-6_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-compiler-gcc-8-x86_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-all_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-all-amd64_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-amd64_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-cloud-amd64_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-common_4.19.98-1_all.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-common-rt_4.19.98-1_all.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-headers-4.19.0-8-rt-amd64_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux-latest/linux-headers-amd64_4.19+105+deb10u3_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-kbuild-4.19_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/l/linux/linux-libc-dev_4.19.98-1_amd64.deb -ftp.br.debian.org/debian/pool/main/m/make-dfsg/make_4.2.1-1.2_amd64.deb -ftp.br.debian.org/debian/pool/main/p/patch/patch_2.7.6-3+deb10u1_amd64.deb -ftp.br.debian.org/debian/pool/main/w/wireguard/wireguard_1.0.20200206-1_all.deb -ftp.br.debian.org/debian/pool/main/w/wireguard-linux-compat/wireguard-dkms_0.0.20200215-1_all.deb -ftp.br.debian.org/debian/pool/main/w/wireguard/wireguard-tools_1.0.20200206-1_amd64.deb \ No newline at end of file diff --git a/build/dappnode/scripts/dappnode_install.sh b/build/dappnode/scripts/dappnode_install.sh index 7887827..2e69a25 100755 --- a/build/dappnode/scripts/dappnode_install.sh +++ b/build/dappnode/scripts/dappnode_install.sh @@ -188,17 +188,6 @@ dappnode_start() installExtra() { if [ -d "/usr/src/dappnode/extra" ]; then - echo -e "\e[32minstallExtra will start in few seconds ... : " 2>&1 | tee -a $LOG_DIR - # wait 10 sec to DNS resolver to be up for debian site url access ok - sleep 10 - for dependencies_file in /usr/src/dappnode/extra/*.dependencies; do - echo -e "\e[32minstallExtra. Deals dependencies file: $dependencies_file...\e[0m" 2>&1 | tee -a $LOG_DIR - while IFS="" read -r deb_link || [ -n "$deb_link" ] - do - echo -e "\e[32minstallExtra. Download .deb : $deb_link...\e[0m" 2>&1 | tee -a $LOG_DIR - eval "$WGET -P /usr/src/dappnode/extra/ \"${deb_link}\"" 2>&1 | tee -a $LOG_DIR - done < $dependencies_file - done dpkg -i /usr/src/dappnode/extra/*.deb 2>&1 | tee -a $LOG_DIR fi } diff --git a/build/dappnode/scripts/dappnode_install_pre.sh b/build/dappnode/scripts/dappnode_install_pre.sh index a3fc560..44bf4ea 100755 --- a/build/dappnode/scripts/dappnode_install_pre.sh +++ b/build/dappnode/scripts/dappnode_install_pre.sh @@ -114,6 +114,20 @@ install_docker_compose() fi } +install_wireguard() +{ + ############################################## + ############################################## + #### WIREGUARD INSTALLATION #### + ############################################## + ############################################## + + echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list + printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' > /etc/apt/preferences.d/limit-unstable + apt update | tee -a $LOG_FILE + apt -y install wireguard | tee -a $LOG_FILE +} + ############################################## ############################################## #### SCRIPT START #### @@ -141,3 +155,10 @@ if docker-compose -v >/dev/null 2>&1 ; then else install_docker_compose 2>&1 | tee -a $LOG_FILE fi + +# Only install wireguard if needed +if modprobe wireguard >/dev/null 2>&1 ; then + echo -e "\e[32m \n\n wireguard is already installed \n\n \e[0m" 2>&1 | tee -a $LOG_FILE +else + install_wireguard 2>&1 | tee -a $LOG_FILE +fi