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] 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