basic network config

2021-11-06 15:45:57 +01:00
parent 90e9c3299b
commit 8feeaddd23
25 changed files with 65 additions and 7 deletions
--- a/banana-pi.sh
+++ b/banana-pi.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/beaglebone-black.sh
+++ b/beaglebone-black.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/common.d/base_image.sh
+++ b/common.d/base_image.sh
@@ -27,12 +27,6 @@ systemd-nspawn_exec eatmydata /debootstrap/debootstrap --second-stage
 include sources.list
 # APT options
 include apt_options
-# So X doesn't complain, we add kali to hosts
-include hosts
-# Set hostname
-set_hostname "${hostname}"
-# Network configs
-include network

 # Disable suspend/resume - speeds up boot massively
 mkdir -p "${work_dir}/etc/initramfs-tools/conf.d/"
@@ -53,7 +47,7 @@ status_3t=\$(grep '^status_stage3 ' \$0 | wc -l)

 status_stage3() {
  status_3i=\$((status_3i+1))
-  echo  "  ✅ Stage 3$(tput setaf 15) (\${status_3i}/\${status_3t}):$(tput sgr0) \$1"
+  echo  "  $(tput setaf 15)✅ Stage 3 (\${status_3i}/\${status_3t}):$(tput setaf 2) \$1$(tput sgr0)"
 }

 status_stage3 'Update apt'
--- a/common.d/functions.sh
+++ b/common.d/functions.sh
@@ -253,6 +253,38 @@ EOF
  done
 }

+function basic_network() {
+# Disable IPv6
+if [ "$disable_ipv6" = "yes" ]; then
+  log "Disable IPv6" green
+
+  echo "# Don't load ipv6 by default" >"${work_dir}"/etc/modprobe.d/ipv6.conf
+  echo "alias net-pf-10 off" >>"${work_dir}"/etc/modprobe.d/ipv6.conf
+fi
+
+cat <<EOF > "${work_dir}"/etc/network/interfaces
+source-directory /etc/network/interfaces.d
+
+auto lo
+  iface lo inet loopback
+
+EOF
+}
+
+function make_hosts() {
+set_hostname "${hostname}"
+log "/etc/hosts" green
+cat <<EOF > "${work_dir:=}"/etc/hosts
+127.0.1.1       ${hostname:=}
+127.0.0.1       localhost
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
+EOF
+}
+
 # Make SWAP
 function make_swap() {
  if [ "$swap" = yes ]; then
--- a/cubietruck.sh
+++ b/cubietruck.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Load the ethernet module since it doesn't load automatically at boot
--- a/cubox-i4pro.sh
+++ b/cubox-i4pro.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/cubox.sh
+++ b/cubox.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Run third stage
--- a/gateworks-newport.sh
+++ b/gateworks-newport.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/gateworks-ventana.sh
+++ b/gateworks-ventana.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/nanopc-t.sh
+++ b/nanopc-t.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0
 #add_interface wlan0

--- a/nanopi-neo-plus2.sh
+++ b/nanopi-neo-plus2.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/pinebook-pro.sh
+++ b/pinebook-pro.sh
@@ -19,6 +19,7 @@ source ./common.d/base_image.sh

 # Do *NOT* include wlan0 if using a desktop otherwise NetworkManager will ignore it
 # Network configs
+basic_network
 #add_interface wlan0

 # Third stage
--- a/pinebook.sh
+++ b/pinebook.sh
@@ -17,6 +17,10 @@ desktop=${desktop:-"xfce"}
 # Load default base_image configs
 source ./common.d/base_image.sh

+# Network configs
+basic_network
+#add_interface eth0
+
 # Do not include wlan0 on a wireless only device, otherwise NetworkManager won't run
 # wlan0 requires special editing of the /etc/network/interfaces.d/wlan0 file, to add the wireless network and ssid
 # Network configs
--- a/rpi-64bit.sh
+++ b/rpi-64bit.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/rpi.sh
+++ b/rpi.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/rpi0w-pitail.sh
+++ b/rpi0w-pitail.sh
@@ -17,6 +17,10 @@ desktop=${desktop:-"xfce"}
 # Load default base_image configs
 source ./common.d/base_image.sh

+# Network configs
+basic_network
+#add_interface eth0
+
 # Download Pi-Tail files
 git clone --depth 1 https://github.com/re4son/Kali-Pi ${work_dir}/opt/Kali-Pi
 wget -O ${work_dir}/etc/systemd/system/pi-tail.service https://raw.githubusercontent.com/Re4son/RPi-Tweaks/master/pi-tail/pi-tail.service
--- a/rpi0w.sh
+++ b/rpi0w.sh
@@ -17,6 +17,10 @@ desktop=${desktop:-"xfce"}
 # Load default base_image configs
 source ./common.d/base_image.sh

+# Network configs
+basic_network
+#add_interface eth0
+
 # Third stage
 cat <<EOF >> "${work_dir}"/third-stage
 status_stage3 'Copy rpi services'
--- a/rpi1.sh
+++ b/rpi1.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/trimslice.sh
+++ b/trimslice.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/usb-armory-mki.sh
+++ b/usb-armory-mki.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage
--- a/usb-armory-mkii.sh
+++ b/usb-armory-mkii.sh
@@ -18,6 +18,7 @@ desktop=${desktop:-"xfce"}
 source ./common.d/base_image.sh

 # Network configs
+basic_network
 add_interface eth0

 # Third stage