From 702d7684d3738eb810e55ac25f5fc1b53117c8bd Mon Sep 17 00:00:00 2001
From: Shery Sheng <sherysheng@google.com>
Date: Thu, 13 Jun 2024 16:08:08 +0800
Subject: [PATCH 01/10] semi-automated PD on raspbian scripts

---
 examples/platforms/raspbian/default       |  1 +
 script/_dhcpv6_pd_ref                     | 76 +++++++++++++++++++++++
 script/bootstrap                          | 14 +++++
 script/reference-device/dhcpcd.enter-hook | 59 ++++++++++++++++++
 script/reference-device/dhcpcd.exit-hook  | 48 ++++++++++++++
 script/setup                              |  3 +
 6 files changed, 201 insertions(+)
 create mode 100644 script/_dhcpv6_pd_ref
 create mode 100644 script/reference-device/dhcpcd.enter-hook
 create mode 100644 script/reference-device/dhcpcd.exit-hook

diff --git a/examples/platforms/raspbian/default b/examples/platforms/raspbian/default
index f5bb3f07449..3ed3e5a1150 100644
--- a/examples/platforms/raspbian/default
+++ b/examples/platforms/raspbian/default
@@ -31,6 +31,7 @@
 NAT64=1
 DNS64=0
 DHCPV6_PD=0
+DHCPV6_PD_REF=1
 NETWORK_MANAGER=0
 BACKBONE_ROUTER=1
 BORDER_ROUTING=1
diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
new file mode 100644
index 00000000000..4ca98f9e4e0
--- /dev/null
+++ b/script/_dhcpv6_pd_ref
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+customise_dhcpcd_conf()
+{
+sudo tee /etc/dhcpcd.conf > /dev/null <<EOF
+# A sample configuration for dhcpcd.
+# See dhcpcd.conf(5) for details.
+
+# Allow users of this group to interact with dhcpcd via the control socket.
+#controlgroup wheel
+
+# Inform the DHCP server of our hostname for DDNS.
+#hostname
+
+# Use the hardware address of the interface for the Client ID.
+#clientid
+# or
+# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
+# Some non-RFC compliant DHCP servers do not reply with this set.
+# In this case, comment out duid and enable clientid above.
+#duid
+
+# Rapid commit support.
+# Safe to enable by default because it requires the equivalent option set
+# on the server to actually work.
+option rapid_commit
+
+# A ServerID is required by RFC2131.
+#require dhcp_server_identifier
+
+noipv6rs 
+# disable routing solicitation
+# denyinterfaces eth1  # Don't touch other_interfaces at all
+interface eth0
+  ipv6rs
+  iaid 1
+  ia_pd 2/::/64 -
+EOF
+}
+
+# customise_dhcpcd_hooks90
+# {
+#     #dhcpcd.enter-hook
+# sudo tee /etc/dhcpcd.enter-hook > /dev/null <<EOF
+
+# EOF
+
+#     #dhcpcd.exit-hook
+# sudo tee /etc/dhcpcd.exit-hook > /dev/null <<EOF
+# EOF
+# }
+
+dhcp6_pd_ref_stop()
+{
+    if [[ -f "/etc/dhcpcd.conf.orig" ]]; then
+        sudo mv /etc/dhcpcd.conf.orig /etc/dhcpcd.conf
+    fi
+    # sudo systemctl restart dhcpcd 
+    sudo rm /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
+
+}
+
+dhcp6_pd_ref_start()
+{
+    if [[ -f "/etc/dhcpcd.conf" ]]; then
+        sudo mv /etc/dhcpcd.conf /etc/dhcpcd.conf.orig
+    fi
+    customise_dhcpcd_conf
+    # Add dhcpcd.hooks
+    sudo mv ~/repo/script/reference-device/dhcpcd.enter-hook /etc/dhcpcd.enter-hook
+    sudo mv ~/repo/script/reference-device/dhcpcd.exit-hook /etc/dhcpcd.exit-hook
+    sudo chmod +x /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
+
+}
+
+dhcp6_pd_ref "$@"
diff --git a/script/bootstrap b/script/bootstrap
index 7a6d917dc77..8a7fc0a1403 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -108,6 +108,20 @@ install_packages_apt()
         fi
     }
 
+    # dhcpv6 pd
+    with DHCPV6_PD_REF && if [[ "$PLATFORM" = "raspbian" ]]; then
+        sudo apt-get install --no-install-recommends -y dhcpcd
+        sudo mkdir -p /etc/systemd/system/dhcpcd.service.d
+        # allow edit system config file eg. /etc/radvd.conf
+sudo tee /etc/systemd/system/dhcpcd.service.d/custom.conf > /dev/null <<EOF
+[Service]
+ProtectSystem=false
+EOF
+    # reload dhcpcd daemon to activate the custom.conf
+    sudo systemctl daemon-reload
+    sudo apt-get install --no-install-recommends -y radvd
+    fi
+
     # network-manager
     without NETWORK_MANAGER || sudo apt-get install --no-install-recommends -y dnsmasq network-manager
 
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
new file mode 100644
index 00000000000..46bbf1eccd7
--- /dev/null
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+WAN_INTERFACE="eth0"
+WPAN_INTERFACE="wpan0"
+RADVD_CONF="/etc/radvd.conf"
+LOG_TAG="dhcpcd.enter.hook:"
+
+
+config_ra()
+{
+    logger -t "$LOG_TAG $reason start config radvd"
+
+sudo tee "${RADVD_CONF}" > /dev/null <<EOF
+interface ${WPAN_INTERFACE}
+{
+    AdvSendAdvert on;
+    prefix ${1}/${2}
+    {
+        AdvOnLink on;
+        AdvAutonomous on;
+        AdvRouterAddr off;
+        AdvPreferredLifetime ${3};
+        AdvValidLifetime ${4};
+    };
+};
+EOF
+}
+
+
+if [ "${interface}" = "eth0" ]; then
+
+    for var in $(env); do
+        # Split the variable into name and value
+        name="${var%%=*}"
+        value="${var#*=}"
+        # Log to syslog
+        logger -t "$LOG_TAG $reason sysenv: " "$name=$value"
+    done
+
+    case $reason in
+    # | DELEGATED6 | BOUND6 | RENEW6 | REBIND6 | ROUTERADVERT
+        DELEGATED6 | REBIND6 | RENEW6 | BOUND6 )
+            logger "$LOG_TAG prefix is $new_dhcp6_ia_pd1_prefix1  length is $new_dhcp6_ia_pd1_prefix1_length pltime is  $new_dhcp6_ia_pd1_prefix1_pltime vltime is $new_dhcp6_ia_pd1_prefix1_vltime"
+            config_ra $new_dhcp6_ia_pd1_prefix1 $new_dhcp6_ia_pd1_prefix1_length $new_dhcp6_ia_pd1_prefix1_pltime  $new_dhcp6_ia_pd1_prefix1_vltime
+            #  "$new_dhcp6_ia_pd1_prefix1" "$new_dhcp6_ia_pd1_prefix1_pltime" "$new_dhcp6_ia_pd1_prefix1_vltime"
+            sudo systemctl restart radvd || logger "$LOG_TAG Failed to restart radvd"
+            ;;
+        # RENEW6)
+        #     if ["${new_dhcp6_ia_pd1_prefix1}" == "${old_dhcp6_ia_pd1_prefix1}"]; then
+        #     {
+        #         config_ra $new_dhcp6_ia_pd1_prefix1 $new_dhcp6_ia_pd1_prefix1_length $new_dhcp6_ia_pd1_prefix1_pltime  $new_dhcp6_ia_pd1_prefix1_vltime
+        #         sudo systemctl restart radvd || logger "$LOG_TAG Failed to restart radvd"
+        #     }
+        #     else
+        #     {
+
+        #     }
+    esac
+fi
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
new file mode 100644
index 00000000000..ca009bd73e4
--- /dev/null
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -0,0 +1,48 @@
+#!/bin/bash
+#dhcpcd.exit-hook
+
+
+WAN_INTERFACE="eth0"
+WPAN_INTERFACE="wpan0"
+
+RADVD_CONF="/etc/radvd.conf"
+LOG_TAG="dhcpcd.exit.hook:"
+
+config_ra()
+{
+    logger -t "$LOG_TAG $reason start config radvd"
+
+sudo tee "${RADVD_CONF}" > /dev/null <<EOF
+interface ${WPAN_INTERFACE}
+{
+    AdvSendAdvert on;
+    prefix ${1}/${2}
+    {
+        AdvOnLink on;
+        AdvAutonomous on;
+        AdvRouterAddr off;
+        AdvPreferredLifetime ${3};
+        AdvValidLifetime ${4};
+    };
+};
+EOF
+}
+
+if [ “${interface}” = “eth0” ]; then
+
+    for var in $(env); do
+        # Split the variable into name and value
+        name="${var%%=*}"
+        value="${var#*=}"
+        # Log to syslog
+        logger -t "$LOG_TAG $reason sysenv: " "$name=$value"
+    done
+
+    case $reason in
+        EXPIRE6 | STOP6)
+            config_ra $old_dhcp6_ia_pd1_prefix1 $old_dhcp6_ia_pd1_prefix1 0 0
+            sudo systemctl restart radvd
+            ;;
+    esac
+fi
+
diff --git a/script/setup b/script/setup
index 8262be89d26..607a1e64e3e 100755
--- a/script/setup
+++ b/script/setup
@@ -38,6 +38,7 @@
 . script/_nat64
 . script/_dns64
 . script/_dhcpv6_pd
+. script/_dhcpv6_pd_ref
 . script/_network_manager
 . script/_rt_tables
 . script/_swapfile
@@ -56,6 +57,7 @@ main()
     border_routing_uninstall
     network_manager_uninstall
     dhcpv6_pd_uninstall
+    dhcpv6_pd_ref_stop
     nat64_uninstall
     dns64_uninstall
     rt_tables_uninstall
@@ -69,6 +71,7 @@ main()
     dns64_install
     network_manager_install
     dhcpv6_pd_install
+    dhcpv6_pd_ref_start
     border_routing_install
     otbr_install
     # shellcheck source=/dev/null

From 94e7b6ebb0f78c39eefe567e66b9e327d1ae71d4 Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Thu, 26 Sep 2024 06:59:06 +0000
Subject: [PATCH 02/10] semi-automated PD on raspbian scripts: fix the issue
 where 'mv' command permanently removes the hook files

---
 script/_dhcpv6_pd_ref | 17 +++++++----------
 script/bootstrap      | 10 +++++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index 4ca98f9e4e0..f118bae4a93 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -2,7 +2,7 @@
 
 customise_dhcpcd_conf()
 {
-sudo tee /etc/dhcpcd.conf > /dev/null <<EOF
+    sudo tee /etc/dhcpcd.conf >/dev/null <<EOF
 # A sample configuration for dhcpcd.
 # See dhcpcd.conf(5) for details.
 
@@ -50,27 +50,24 @@ EOF
 # EOF
 # }
 
-dhcp6_pd_ref_stop()
+dhcpv6_pd_ref_stop()
 {
     if [[ -f "/etc/dhcpcd.conf.orig" ]]; then
         sudo mv /etc/dhcpcd.conf.orig /etc/dhcpcd.conf
     fi
-    # sudo systemctl restart dhcpcd 
-    sudo rm /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
+    # sudo systemctl restart dhcpcd
+    sudo rm -f /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
 
 }
 
-dhcp6_pd_ref_start()
+dhcpv6_pd_ref_start()
 {
     if [[ -f "/etc/dhcpcd.conf" ]]; then
         sudo mv /etc/dhcpcd.conf /etc/dhcpcd.conf.orig
     fi
     customise_dhcpcd_conf
     # Add dhcpcd.hooks
-    sudo mv ~/repo/script/reference-device/dhcpcd.enter-hook /etc/dhcpcd.enter-hook
-    sudo mv ~/repo/script/reference-device/dhcpcd.exit-hook /etc/dhcpcd.exit-hook
-    sudo chmod +x /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
+    sudo install -m 755 "$(dirname "$0")"/reference-device/dhcpcd.enter-hook /etc/dhcpcd.enter-hook
+    sudo install -m 755 "$(dirname "$0")"/reference-device/dhcpcd.exit-hook /etc/dhcpcd.exit-hook
 
 }
-
-dhcp6_pd_ref "$@"
diff --git a/script/bootstrap b/script/bootstrap
index 8a7fc0a1403..4e8fdb024bc 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -109,17 +109,17 @@ install_packages_apt()
     }
 
     # dhcpv6 pd
-    with DHCPV6_PD_REF && if [[ "$PLATFORM" = "raspbian" ]]; then
+    with DHCPV6_PD_REF && if [[ $PLATFORM == "raspbian" ]]; then
         sudo apt-get install --no-install-recommends -y dhcpcd
         sudo mkdir -p /etc/systemd/system/dhcpcd.service.d
         # allow edit system config file eg. /etc/radvd.conf
-sudo tee /etc/systemd/system/dhcpcd.service.d/custom.conf > /dev/null <<EOF
+        sudo tee /etc/systemd/system/dhcpcd.service.d/custom.conf >/dev/null <<EOF
 [Service]
 ProtectSystem=false
 EOF
-    # reload dhcpcd daemon to activate the custom.conf
-    sudo systemctl daemon-reload
-    sudo apt-get install --no-install-recommends -y radvd
+        # reload dhcpcd daemon to activate the custom.conf
+        sudo systemctl daemon-reload
+        sudo apt-get install --no-install-recommends -y radvd
     fi
 
     # network-manager

From 6d74f5b7ab7ec4a4d2869837ed126bb879b57a0f Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Fri, 27 Sep 2024 02:47:55 +0000
Subject: [PATCH 03/10] semi-automated PD on raspbian scripts: remove redundant
 comments

---
 script/_dhcpv6_pd_ref                     | 12 ------------
 script/reference-device/dhcpcd.enter-hook | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index f118bae4a93..8e84521a095 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -38,18 +38,6 @@ interface eth0
 EOF
 }
 
-# customise_dhcpcd_hooks90
-# {
-#     #dhcpcd.enter-hook
-# sudo tee /etc/dhcpcd.enter-hook > /dev/null <<EOF
-
-# EOF
-
-#     #dhcpcd.exit-hook
-# sudo tee /etc/dhcpcd.exit-hook > /dev/null <<EOF
-# EOF
-# }
-
 dhcpv6_pd_ref_stop()
 {
     if [[ -f "/etc/dhcpcd.conf.orig" ]]; then
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index 46bbf1eccd7..fb9e041cb8f 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -38,22 +38,10 @@ if [ "${interface}" = "eth0" ]; then
     done
 
     case $reason in
-    # | DELEGATED6 | BOUND6 | RENEW6 | REBIND6 | ROUTERADVERT
         DELEGATED6 | REBIND6 | RENEW6 | BOUND6 )
             logger "$LOG_TAG prefix is $new_dhcp6_ia_pd1_prefix1  length is $new_dhcp6_ia_pd1_prefix1_length pltime is  $new_dhcp6_ia_pd1_prefix1_pltime vltime is $new_dhcp6_ia_pd1_prefix1_vltime"
             config_ra $new_dhcp6_ia_pd1_prefix1 $new_dhcp6_ia_pd1_prefix1_length $new_dhcp6_ia_pd1_prefix1_pltime  $new_dhcp6_ia_pd1_prefix1_vltime
-            #  "$new_dhcp6_ia_pd1_prefix1" "$new_dhcp6_ia_pd1_prefix1_pltime" "$new_dhcp6_ia_pd1_prefix1_vltime"
             sudo systemctl restart radvd || logger "$LOG_TAG Failed to restart radvd"
             ;;
-        # RENEW6)
-        #     if ["${new_dhcp6_ia_pd1_prefix1}" == "${old_dhcp6_ia_pd1_prefix1}"]; then
-        #     {
-        #         config_ra $new_dhcp6_ia_pd1_prefix1 $new_dhcp6_ia_pd1_prefix1_length $new_dhcp6_ia_pd1_prefix1_pltime  $new_dhcp6_ia_pd1_prefix1_vltime
-        #         sudo systemctl restart radvd || logger "$LOG_TAG Failed to restart radvd"
-        #     }
-        #     else
-        #     {
-
-        #     }
     esac
 fi

From 11e3318c25607dc148687b3ff115f7c764d4bc10 Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Wed, 9 Oct 2024 04:05:16 +0000
Subject: [PATCH 04/10] semi-automated PD on raspbian scripts: support of
 debian platform for latest Raspi OS

---
 examples/platforms/debian/default         | 1 +
 script/_border_routing                    | 1 -
 script/_dhcpv6_pd_ref                     | 5 +++++
 script/_otbr                              | 6 ++++++
 script/bootstrap                          | 2 +-
 script/reference-device/dhcpcd.enter-hook | 6 ++++--
 script/reference-device/dhcpcd.exit-hook  | 7 ++++---
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/examples/platforms/debian/default b/examples/platforms/debian/default
index c76b5423e6c..054a032bf86 100644
--- a/examples/platforms/debian/default
+++ b/examples/platforms/debian/default
@@ -31,6 +31,7 @@
 NAT64=0
 DNS64=0
 DHCPV6_PD=0
+DHCPV6_PD_REF=1
 NETWORK_MANAGER=0
 BACKBONE_ROUTER=1
 BORDER_ROUTING=1
diff --git a/script/_border_routing b/script/_border_routing
index f17c8fe6900..9af4cf46490 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -81,7 +81,6 @@ dhcpcd_disable_ipv6()
     if [ -f $DHCPCD_CONF_FILE ]; then
         sudo cp $DHCPCD_CONF_FILE $DHCPCD_CONF_BACKUP_FILE
         sudo tee -a $DHCPCD_CONF_FILE <<EOF
-noipv6
 noipv6rs
 EOF
     fi
diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index 8e84521a095..6b59542139b 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -35,6 +35,11 @@ interface eth0
   ipv6rs
   iaid 1
   ia_pd 2/::/64 -
+
+interface wlan0
+  ipv6rs
+  iaid 2
+  ia_pd 3/::/64 -
 EOF
 }
 
diff --git a/script/_otbr b/script/_otbr
index dbccc73c88c..a6228a9d6ad 100644
--- a/script/_otbr
+++ b/script/_otbr
@@ -91,6 +91,12 @@ otbr_install()
         )
     fi
 
+    if with DHCPV6_PD_REF; then
+        otbr_options+=(
+            "-DOTBR_DHCP6_PD=ON"
+        )
+    fi
+
     if with REST_API; then
         otbr_options+=("-DOTBR_REST=ON")
     fi
diff --git a/script/bootstrap b/script/bootstrap
index 5f93320fa77..d6f8a6ad080 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -107,7 +107,7 @@ install_packages_apt()
     }
 
     # dhcpv6 pd
-    with DHCPV6_PD_REF && if [[ $PLATFORM == "raspbian" ]]; then
+    with DHCPV6_PD_REF && if command -v apt-get &>/dev/null; then
         sudo apt-get install --no-install-recommends -y dhcpcd
         sudo mkdir -p /etc/systemd/system/dhcpcd.service.d
         # allow edit system config file eg. /etc/radvd.conf
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index fb9e041cb8f..113d2da3538 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -1,14 +1,16 @@
 #!/bin/bash
 
 WAN_INTERFACE="eth0"
+WLAN_INTERFACE="wlan0"
 WPAN_INTERFACE="wpan0"
+
 RADVD_CONF="/etc/radvd.conf"
 LOG_TAG="dhcpcd.enter.hook:"
 
 
 config_ra()
 {
-    logger -t "$LOG_TAG $reason start config radvd"
+    logger "$LOG_TAG $reason start config radvd"
 
 sudo tee "${RADVD_CONF}" > /dev/null <<EOF
 interface ${WPAN_INTERFACE}
@@ -27,7 +29,7 @@ EOF
 }
 
 
-if [ "${interface}" = "eth0" ]; then
+if [ "${interface}" = "eth0" ] || [ “${interface}” = “wlan0” ]; then
 
     for var in $(env); do
         # Split the variable into name and value
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
index ca009bd73e4..8aba12527d5 100644
--- a/script/reference-device/dhcpcd.exit-hook
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -3,6 +3,7 @@
 
 
 WAN_INTERFACE="eth0"
+WLAN_INTERFACE="wlan0"
 WPAN_INTERFACE="wpan0"
 
 RADVD_CONF="/etc/radvd.conf"
@@ -10,7 +11,7 @@ LOG_TAG="dhcpcd.exit.hook:"
 
 config_ra()
 {
-    logger -t "$LOG_TAG $reason start config radvd"
+    logger "$LOG_TAG $reason start config radvd"
 
 sudo tee "${RADVD_CONF}" > /dev/null <<EOF
 interface ${WPAN_INTERFACE}
@@ -28,7 +29,7 @@ interface ${WPAN_INTERFACE}
 EOF
 }
 
-if [ “${interface}” = “eth0” ]; then
+if [ “${interface}” = “eth0” ] || [ “${interface}” = “wlan0” ]; then
 
     for var in $(env); do
         # Split the variable into name and value
@@ -40,7 +41,7 @@ if [ “${interface}” = “eth0” ]; then
 
     case $reason in
         EXPIRE6 | STOP6)
-            config_ra $old_dhcp6_ia_pd1_prefix1 $old_dhcp6_ia_pd1_prefix1 0 0
+            config_ra $old_dhcp6_ia_pd1_prefix1 $old_dhcp6_ia_pd1_prefix1_length 0 0
             sudo systemctl restart radvd
             ;;
     esac

From 3a6e85f628ea9fe6175191882c18e049b344b8b0 Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Sat, 12 Oct 2024 07:31:05 +0000
Subject: [PATCH 05/10] semi-automated PD on raspbian scripts: bug fix

---
 script/_border_routing                    | 17 +++++++----
 script/_dhcpv6_pd_ref                     | 36 +++++------------------
 script/reference-device/dhcpcd.enter-hook |  1 -
 script/setup                              |  4 +--
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/script/_border_routing b/script/_border_routing
index 9af4cf46490..71bb3d807ad 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -68,13 +68,18 @@ accept_ra_enable()
     fi
 }
 
-# This function disables IPv6 support in dhcpcd.
+# This function disables IPv6 Router Solicitation (RS) in dhcpcd.
 #
-# dhcpcd on raspberry Pi enables IPv6 support by default. The problem with
-# dhcpcd is that it does't support Route Information Option (RIO), so we need
-# to rely on the kernel implementation. dhcpcd will force set accept_ra to 0
-# for all interfaces it is currently running on, if IPv6 is enabled. This
-# conflicts with our accept_ra* configurations.
+# dhcpcd on Raspberry Pi enables IPv6 support by default, including Router
+# Solicitations (RS).  While we want to use dhcpcd for IPv6 address management,
+# dhcpcd's handling of RS can conflict with the kernel's IPv6 configuration,
+# specifically the 'accept_ra' setting.
+#
+# By disabling RS in dhcpcd with 'noipv6rs', we prevent dhcpcd from interfering
+# with the kernel's 'accept_ra' setting, allowing us to manage IPv6 routing and
+# other aspects of IPv6 configuration at the kernel level. This approach ensures
+# that we can leverage dhcpcd for IPv6 address assignment while maintaining
+# control over 'accept_ra'.
 #
 dhcpcd_disable_ipv6()
 {
diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index 6b59542139b..4d4e13fea06 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -3,34 +3,8 @@
 customise_dhcpcd_conf()
 {
     sudo tee /etc/dhcpcd.conf >/dev/null <<EOF
-# A sample configuration for dhcpcd.
-# See dhcpcd.conf(5) for details.
-
-# Allow users of this group to interact with dhcpcd via the control socket.
-#controlgroup wheel
-
-# Inform the DHCP server of our hostname for DDNS.
-#hostname
-
-# Use the hardware address of the interface for the Client ID.
-#clientid
-# or
-# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
-# Some non-RFC compliant DHCP servers do not reply with this set.
-# In this case, comment out duid and enable clientid above.
-#duid
-
-# Rapid commit support.
-# Safe to enable by default because it requires the equivalent option set
-# on the server to actually work.
-option rapid_commit
-
-# A ServerID is required by RFC2131.
-#require dhcp_server_identifier
-
 noipv6rs 
 # disable routing solicitation
-# denyinterfaces eth1  # Don't touch other_interfaces at all
 interface eth0
   ipv6rs
   iaid 1
@@ -43,18 +17,22 @@ interface wlan0
 EOF
 }
 
-dhcpv6_pd_ref_stop()
+dhcpv6_pd_ref_uninstall()
 {
+    with DHCPV6_PD_REF || return 0
+
     if [[ -f "/etc/dhcpcd.conf.orig" ]]; then
         sudo mv /etc/dhcpcd.conf.orig /etc/dhcpcd.conf
     fi
-    # sudo systemctl restart dhcpcd
+    sudo systemctl restart dhcpcd
     sudo rm -f /etc/dhcpcd.enter-hook /etc/dhcpcd.exit-hook
 
 }
 
-dhcpv6_pd_ref_start()
+dhcpv6_pd_ref_install()
 {
+    with DHCPV6_PD_REF || return 0
+
     if [[ -f "/etc/dhcpcd.conf" ]]; then
         sudo mv /etc/dhcpcd.conf /etc/dhcpcd.conf.orig
     fi
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index 113d2da3538..99566b33b36 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -35,7 +35,6 @@ if [ "${interface}" = "eth0" ] || [ “${interface}” = “wlan0” ]; then
         # Split the variable into name and value
         name="${var%%=*}"
         value="${var#*=}"
-        # Log to syslog
         logger -t "$LOG_TAG $reason sysenv: " "$name=$value"
     done
 
diff --git a/script/setup b/script/setup
index 607a1e64e3e..b8878fa507f 100755
--- a/script/setup
+++ b/script/setup
@@ -57,7 +57,7 @@ main()
     border_routing_uninstall
     network_manager_uninstall
     dhcpv6_pd_uninstall
-    dhcpv6_pd_ref_stop
+    dhcpv6_pd_ref_uninstall
     nat64_uninstall
     dns64_uninstall
     rt_tables_uninstall
@@ -71,7 +71,7 @@ main()
     dns64_install
     network_manager_install
     dhcpv6_pd_install
-    dhcpv6_pd_ref_start
+    dhcpv6_pd_ref_install
     border_routing_install
     otbr_install
     # shellcheck source=/dev/null

From 78e33698b1e8a28f95ea537370123b32a57948b6 Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Mon, 14 Oct 2024 06:29:16 +0000
Subject: [PATCH 06/10] semi-automated PD on raspbian scripts: bug fix

---
 script/_dhcpv6_pd_ref                     | 11 +++--------
 script/bootstrap                          |  6 +++---
 script/reference-device/dhcpcd.enter-hook |  6 +++---
 script/reference-device/dhcpcd.exit-hook  |  7 ++++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index 4d4e13fea06..d6d74eeab14 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -2,18 +2,14 @@
 
 customise_dhcpcd_conf()
 {
+    # This has to be run after script/_border_routing, and this will
+    # invalidate all changes to dhcpcd.conf made by script/_border_routing.
     sudo tee /etc/dhcpcd.conf >/dev/null <<EOF
 noipv6rs 
-# disable routing solicitation
+# disable router solicitation
 interface eth0
-  ipv6rs
   iaid 1
   ia_pd 2/::/64 -
-
-interface wlan0
-  ipv6rs
-  iaid 2
-  ia_pd 3/::/64 -
 EOF
 }
 
@@ -40,5 +36,4 @@ dhcpv6_pd_ref_install()
     # Add dhcpcd.hooks
     sudo install -m 755 "$(dirname "$0")"/reference-device/dhcpcd.enter-hook /etc/dhcpcd.enter-hook
     sudo install -m 755 "$(dirname "$0")"/reference-device/dhcpcd.exit-hook /etc/dhcpcd.exit-hook
-
 }
diff --git a/script/bootstrap b/script/bootstrap
index d6f8a6ad080..7c5ce223e96 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -106,8 +106,8 @@ install_packages_apt()
         fi
     }
 
-    # dhcpv6 pd
-    with DHCPV6_PD_REF && if command -v apt-get &>/dev/null; then
+    # dhcpv6-pd
+    without DHCPV6_PD_REF || {
         sudo apt-get install --no-install-recommends -y dhcpcd
         sudo mkdir -p /etc/systemd/system/dhcpcd.service.d
         # allow edit system config file eg. /etc/radvd.conf
@@ -118,7 +118,7 @@ EOF
         # reload dhcpcd daemon to activate the custom.conf
         sudo systemctl daemon-reload
         sudo apt-get install --no-install-recommends -y radvd
-    fi
+    }
 
     # network-manager
     without NETWORK_MANAGER || sudo apt-get install --no-install-recommends -y dnsmasq network-manager
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index 99566b33b36..bd02ccc65e2 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-WAN_INTERFACE="eth0"
-WLAN_INTERFACE="wlan0"
+UPSTREAM_INTERFACE="eth0"
 WPAN_INTERFACE="wpan0"
 
 RADVD_CONF="/etc/radvd.conf"
@@ -29,7 +28,8 @@ EOF
 }
 
 
-if [ "${interface}" = "eth0" ] || [ “${interface}” = “wlan0” ]; then
+# TODO: set the upstream interface according to the environment variables of `script/setup`.
+if [ "${interface}" = ${UPSTREAM_INTERFACE} ]; then
 
     for var in $(env); do
         # Split the variable into name and value
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
index 8aba12527d5..ce79b9385cd 100644
--- a/script/reference-device/dhcpcd.exit-hook
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -2,8 +2,7 @@
 #dhcpcd.exit-hook
 
 
-WAN_INTERFACE="eth0"
-WLAN_INTERFACE="wlan0"
+UPSTREAM_INTERFACE="eth0"
 WPAN_INTERFACE="wpan0"
 
 RADVD_CONF="/etc/radvd.conf"
@@ -29,7 +28,9 @@ interface ${WPAN_INTERFACE}
 EOF
 }
 
-if [ “${interface}” = “eth0” ] || [ “${interface}” = “wlan0” ]; then
+
+# TODO: set the upstream interface according to the environment variables of `script/setup`.
+if [ “${interface}” = ${UPSTREAM_INTERFACE} ]; then
 
     for var in $(env); do
         # Split the variable into name and value

From 519386b0dc7fd31bb6e30d75320ba7913ed11c3a Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Tue, 15 Oct 2024 05:36:08 +0000
Subject: [PATCH 07/10] semi-automated PD on raspbian scripts: bug fix

---
 script/_border_routing                    | 15 +++------
 script/_dhcpv6_pd_ref                     | 33 ++++++++++++++++++--
 script/reference-device/dhcpcd.enter-hook | 34 +++++++++++++++++++--
 script/reference-device/dhcpcd.exit-hook  | 37 ++++++++++++++++++++---
 4 files changed, 100 insertions(+), 19 deletions(-)

diff --git a/script/_border_routing b/script/_border_routing
index 71bb3d807ad..88febb1ba06 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -70,16 +70,11 @@ accept_ra_enable()
 
 # This function disables IPv6 Router Solicitation (RS) in dhcpcd.
 #
-# dhcpcd on Raspberry Pi enables IPv6 support by default, including Router
-# Solicitations (RS).  While we want to use dhcpcd for IPv6 address management,
-# dhcpcd's handling of RS can conflict with the kernel's IPv6 configuration,
-# specifically the 'accept_ra' setting.
-#
-# By disabling RS in dhcpcd with 'noipv6rs', we prevent dhcpcd from interfering
-# with the kernel's 'accept_ra' setting, allowing us to manage IPv6 routing and
-# other aspects of IPv6 configuration at the kernel level. This approach ensures
-# that we can leverage dhcpcd for IPv6 address assignment while maintaining
-# control over 'accept_ra'.
+# dhcpcd on raspberry Pi enables IPv6 support by default. The problem with
+# dhcpcd is that it does't support Route Information Option (RIO), so we need
+# to rely on the kernel implementation. dhcpcd will force set accept_ra to 0
+# for all interfaces it is currently running on, if IPv6 RS is enabled. This
+# conflicts with our accept_ra* configurations.
 #
 dhcpcd_disable_ipv6()
 {
diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index d6d74eeab14..008170fc2f5 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -1,12 +1,41 @@
 #!/bin/bash
+#
+#  Copyright (c) 2024, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+#   Description:
+#       This script sets up border routing configurations.
+#
 
 customise_dhcpcd_conf()
 {
     # This has to be run after script/_border_routing, and this will
     # invalidate all changes to dhcpcd.conf made by script/_border_routing.
     sudo tee /etc/dhcpcd.conf >/dev/null <<EOF
-noipv6rs 
-# disable router solicitation
+noipv6rs # disable router solicitation
 interface eth0
   iaid 1
   ia_pd 2/::/64 -
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index bd02ccc65e2..bd565188adc 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -1,5 +1,36 @@
 #!/bin/bash
+#
+#  Copyright (c) 2024, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+#   Description:
+#       This script sets up border routing configurations.
+#
 
+# TODO: set the upstream interface according to the environment variables of `script/setup`.
 UPSTREAM_INTERFACE="eth0"
 WPAN_INTERFACE="wpan0"
 
@@ -28,8 +59,7 @@ EOF
 }
 
 
-# TODO: set the upstream interface according to the environment variables of `script/setup`.
-if [ "${interface}" = ${UPSTREAM_INTERFACE} ]; then
+if [ ${interface} = ${UPSTREAM_INTERFACE} ]; then
 
     for var in $(env); do
         # Split the variable into name and value
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
index ce79b9385cd..8708addd43b 100644
--- a/script/reference-device/dhcpcd.exit-hook
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -1,7 +1,36 @@
 #!/bin/bash
-#dhcpcd.exit-hook
-
+#
+#  Copyright (c) 2024, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+#   Description:
+#       This script sets up border routing configurations.
+#
 
+# TODO: set the upstream interface according to the environment variables of `script/setup`.
 UPSTREAM_INTERFACE="eth0"
 WPAN_INTERFACE="wpan0"
 
@@ -29,14 +58,12 @@ EOF
 }
 
 
-# TODO: set the upstream interface according to the environment variables of `script/setup`.
-if [ “${interface}” = ${UPSTREAM_INTERFACE} ]; then
+if [ ${interface} = ${UPSTREAM_INTERFACE} ]; then
 
     for var in $(env); do
         # Split the variable into name and value
         name="${var%%=*}"
         value="${var#*=}"
-        # Log to syslog
         logger -t "$LOG_TAG $reason sysenv: " "$name=$value"
     done
 

From 9756e0839f7aa5cad63f6ff4aaca50ed614ba08d Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Tue, 15 Oct 2024 05:50:30 +0000
Subject: [PATCH 08/10] semi-automated PD on raspbian scripts: comment and
 naming update

---
 script/_border_routing                    | 4 ++--
 script/_dhcpv6_pd_ref                     | 2 +-
 script/reference-device/dhcpcd.enter-hook | 3 ---
 script/reference-device/dhcpcd.exit-hook  | 3 ---
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/script/_border_routing b/script/_border_routing
index 88febb1ba06..712de6d6160 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -76,7 +76,7 @@ accept_ra_enable()
 # for all interfaces it is currently running on, if IPv6 RS is enabled. This
 # conflicts with our accept_ra* configurations.
 #
-dhcpcd_disable_ipv6()
+dhcpcd_disable_ipv6rs()
 {
     if [ -f $DHCPCD_CONF_FILE ]; then
         sudo cp $DHCPCD_CONF_FILE $DHCPCD_CONF_BACKUP_FILE
@@ -106,7 +106,7 @@ border_routing_install()
 {
     with BORDER_ROUTING || return 0
 
-    dhcpcd_disable_ipv6
+    dhcpcd_disable_ipv6rs
     accept_ra_install
 
     # /proc/sys/net/ipv6/conf/* files are read-only in docker
diff --git a/script/_dhcpv6_pd_ref b/script/_dhcpv6_pd_ref
index 008170fc2f5..b431ce625da 100644
--- a/script/_dhcpv6_pd_ref
+++ b/script/_dhcpv6_pd_ref
@@ -27,7 +27,7 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 #   Description:
-#       This script sets up border routing configurations.
+#       This script manipulates DHCPv6-PD-REF configuration.
 #
 
 customise_dhcpcd_conf()
diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index bd565188adc..7a9fd98b108 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -26,9 +26,6 @@
 #  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 #  POSSIBILITY OF SUCH DAMAGE.
 #
-#   Description:
-#       This script sets up border routing configurations.
-#
 
 # TODO: set the upstream interface according to the environment variables of `script/setup`.
 UPSTREAM_INTERFACE="eth0"
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
index 8708addd43b..e11259f90cf 100644
--- a/script/reference-device/dhcpcd.exit-hook
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -26,9 +26,6 @@
 #  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 #  POSSIBILITY OF SUCH DAMAGE.
 #
-#   Description:
-#       This script sets up border routing configurations.
-#
 
 # TODO: set the upstream interface according to the environment variables of `script/setup`.
 UPSTREAM_INTERFACE="eth0"

From b1ed4819f0aba05e13c5c7bc2351efe1d29d38bb Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Tue, 15 Oct 2024 05:55:19 +0000
Subject: [PATCH 09/10] semi-automated PD on raspbian scripts: comment and
 naming update

---
 script/_border_routing | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/_border_routing b/script/_border_routing
index 712de6d6160..e9b79c76932 100644
--- a/script/_border_routing
+++ b/script/_border_routing
@@ -86,8 +86,8 @@ EOF
     fi
 }
 
-# This function enables IPv6 support in dhcpcd.
-dhcpcd_enable_ipv6()
+# This function enables IPv6 Router Solicitation (RS) in dhcpcd.
+dhcpcd_enable_ipv6rs()
 {
     if [ -f $DHCPCD_CONF_BACKUP_FILE ]; then
         sudo cp $DHCPCD_CONF_BACKUP_FILE $DHCPCD_CONF_FILE
@@ -99,7 +99,7 @@ border_routing_uninstall()
     with BORDER_ROUTING || return 0
 
     accept_ra_uninstall
-    dhcpcd_enable_ipv6
+    dhcpcd_enable_ipv6rs
 }
 
 border_routing_install()

From d0c2b487120ecc9d423cf3fed5a4e4cc6374af78 Mon Sep 17 00:00:00 2001
From: Yang Song <yangsongcn@google.com>
Date: Tue, 15 Oct 2024 09:09:43 +0000
Subject: [PATCH 10/10] semi-automated PD on raspbian scripts: reload radvd to
 keep current settings

---
 script/reference-device/dhcpcd.enter-hook | 2 +-
 script/reference-device/dhcpcd.exit-hook  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/reference-device/dhcpcd.enter-hook b/script/reference-device/dhcpcd.enter-hook
index 7a9fd98b108..cfa62800502 100644
--- a/script/reference-device/dhcpcd.enter-hook
+++ b/script/reference-device/dhcpcd.enter-hook
@@ -69,7 +69,7 @@ if [ ${interface} = ${UPSTREAM_INTERFACE} ]; then
         DELEGATED6 | REBIND6 | RENEW6 | BOUND6 )
             logger "$LOG_TAG prefix is $new_dhcp6_ia_pd1_prefix1  length is $new_dhcp6_ia_pd1_prefix1_length pltime is  $new_dhcp6_ia_pd1_prefix1_pltime vltime is $new_dhcp6_ia_pd1_prefix1_vltime"
             config_ra $new_dhcp6_ia_pd1_prefix1 $new_dhcp6_ia_pd1_prefix1_length $new_dhcp6_ia_pd1_prefix1_pltime  $new_dhcp6_ia_pd1_prefix1_vltime
-            sudo systemctl restart radvd || logger "$LOG_TAG Failed to restart radvd"
+            sudo systemctl reload radvd || logger "$LOG_TAG Failed to reload radvd"
             ;;
     esac
 fi
diff --git a/script/reference-device/dhcpcd.exit-hook b/script/reference-device/dhcpcd.exit-hook
index e11259f90cf..faed780ade0 100644
--- a/script/reference-device/dhcpcd.exit-hook
+++ b/script/reference-device/dhcpcd.exit-hook
@@ -67,7 +67,7 @@ if [ ${interface} = ${UPSTREAM_INTERFACE} ]; then
     case $reason in
         EXPIRE6 | STOP6)
             config_ra $old_dhcp6_ia_pd1_prefix1 $old_dhcp6_ia_pd1_prefix1_length 0 0
-            sudo systemctl restart radvd
+            sudo systemctl reload radvd
             ;;
     esac
 fi