From 2c8135270dafee602cd86cb19dc73366fa0a8b98 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 5 Aug 2023 10:54:13 +0200
Subject: T5428: remove hardcoded dhcp lease file path from dhclient hook

---
 .../dhclient-exit-hooks.d/03-vyatta-dhclient-hook  | 44 ---------------------
 .../dhclient-exit-hooks.d/03-vyos-dhclient-hook    | 45 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 44 deletions(-)
 delete mode 100644 src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook
 create mode 100644 src/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook

diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook
deleted file mode 100644
index e828b433e..000000000
--- a/src/etc/dhcp/dhclient-exit-hooks.d/03-vyatta-dhclient-hook
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# Author: Stig Thormodsrud <stig@vyatta.com>
-# Date: 2007
-# Description: dhcp client hook
-
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2006, 2007, 2008 Vyatta, Inc.
-# All Rights Reserved.
-# **** End License ****
-
-# To enable this script set the following variable to "yes"
-RUN="yes"
-
-proto=""
-if [[ $reason =~ ^(REBOOT6|INIT6|EXPIRE6|RELEASE6|STOP6|INFORM6|BOUND6|REBIND6|DELEGATED6)$ ]]; then
-        proto="v6"
-fi
-
-if [ "$RUN" = "yes" ]; then
-        LOG=/run/dhclient/dhclient_"$interface"."$proto"lease
-        echo `date` > $LOG
-
-        for i in reason interface new_expiry new_dhcp_lease_time medium \
-                        alias_ip_address new_ip_address new_broadcast_address \
-                        new_subnet_mask new_domain_name new_network_number \
-                        new_domain_name_servers new_routers new_static_routes \
-			new_dhcp_server_identifier new_dhcp_message_type \
-                        old_ip_address old_subnet_mask old_domain_name \
-                        old_domain_name_servers old_routers \
-                        old_static_routes; do
-                echo $i=\'${!i}\' >> $LOG
-        done
-fi
diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook
new file mode 100644
index 000000000..35721d009
--- /dev/null
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/03-vyos-dhclient-hook
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+# Author: Stig Thormodsrud <stig@vyatta.com>
+# Date: 2007
+# Description: dhcp client hook
+
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2006, 2007, 2008 Vyatta, Inc.
+# All Rights Reserved.
+# **** End License ****
+
+# To enable this script set the following variable to "yes"
+RUN="yes"
+
+proto=""
+if [[ $reason =~ ^(REBOOT6|INIT6|EXPIRE6|RELEASE6|STOP6|INFORM6|BOUND6|REBIND6|DELEGATED6)$ ]]; then
+        proto="v6"
+fi
+
+if [ "$RUN" = "yes" ]; then
+        BASE_PATH=$(python3 -c "from vyos.defaults import directories; print(directories['isc_dhclient_dir'])")
+        LOG=${BASE_PATH}/dhclient_"$interface"."$proto"lease
+        echo `date` > $LOG
+
+        for i in reason interface new_expiry new_dhcp_lease_time medium \
+                        alias_ip_address new_ip_address new_broadcast_address \
+                        new_subnet_mask new_domain_name new_network_number \
+                        new_domain_name_servers new_routers new_static_routes \
+			new_dhcp_server_identifier new_dhcp_message_type \
+                        old_ip_address old_subnet_mask old_domain_name \
+                        old_domain_name_servers old_routers \
+                        old_static_routes; do
+                echo $i=\'${!i}\' >> $LOG
+        done
+fi
-- 
cgit v1.2.3