Move code for IVP6 into separate function; allow both enable/disable …

…options

installation/routines/optimize_boot_time.sh

@@ -5,7 +5,6 @@
 OPTIMIZE_DHCP_CONF="/etc/dhcpcd.conf"
 OPTIMIZE_BOOT_CMDLINE_OPTIONS="consoleblank=1 logo.nologo quiet loglevel=0 plymouth.enable=0 vt.global_cursor_default=0 plymouth.ignore-serial-consoles splash fastboot noatime nodiratime noram"
 OPTIMIZE_DHCP_CONF_HEADER="## Jukebox DHCP Config"
-OPTIMIZE_IPV6_CONF_HEADER="## Jukebox IPV6 Config"
 OPTIMIZE_BOOT_CONF_HEADER="## Jukebox Boot Config"
 
 _optimize_disable_irrelevant_services() {
@@ -62,22 +61,9 @@ EOF
   fi
 }
 
-# TODO: Allow both Enable and Disable
 _optimize_ipv6_arp() {
   if [ "$DISABLE_IPv6" = true ] ; then
-    print_lc "  Disabling IPV6"
-    if grep -q "${OPTIMIZE_IPV6_CONF_HEADER}" "$OPTIMIZE_DHCP_CONF"; then
-      log "    Skipping. Already set up!"
-    else
-      sudo tee -a $OPTIMIZE_DHCP_CONF <<-EOF
-
-${OPTIMIZE_IPV6_CONF_HEADER}
-noarp
-ipv4only
-noipv6
-
-EOF
-    fi
+    ./options/ipv6.sh disable
   fi
 }
 

installation/routines/options/ipv6.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+source ../../includes/02_helpers.sh
+
+if [ -z "$1" ] || { [ "$1" != "enable" ] && [ "$1" != "disable" ]; }; then
+    print_lc "Error: Invalid or no argument provided.
+Usage: ./ipv6.sh <arg>
+       where <arg> can be 'enable' or 'disable'"
+    exit 1
+fi
+
+arg="$1"
+
+DHCP_CONF_PATH="/etc/dhcpcd.conf"
+START_MARKER="## Jukebox IPV6 Config Start"
+END_MARKER="## Jukebox IPV6 Config End"
+
+if [ "$arg" = "enable" ]; then
+    print_lc "Enabling IPv6..."
+    sed -i "/$START_MARKER/,/$END_MARKER/d" "$DHCP_CONF_PATH"
+elif [ "$arg" = "disable" ]; then
+    print_lc "Disabling IPv6..."
+    cp "$DHCP_CONF_PATH" "${DHCP_CONF_PATH}.bak"
+
+    # Only disable if it is enabled
+    if ! grep -q "${START_MARKER}" "$DHCP_CONF_PATH"; then
+        sudo tee -a $DHCP_CONF_PATH <<-EOF
+${START_MARKER}
+noarp
+ipv4only
+noipv6
+${END_MARKER}
+EOF
+    fi
+fi
+
+# Test
+if [ "$arg" = "enable" ]; then
+    verify_file_does_not_contain_string "${START_MARKER}" "${DHCP_CONF_PATH}"
+elif [ "$arg" = "disable" ]; then
+    verify_file_contains_string_once "${START_MARKER}" "${DHCP_CONF_PATH}"
+fi