summaryrefslogtreecommitdiffstats
path: root/patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-06-26 19:44:44 +0000
committer Eric Hameleers <alien@slackware.com>2023-06-27 13:30:30 +0200
commit57f9e5505b5fa3040aed5b66af8f1cba94dc5dcf (patch)
treefefc9af3755177dd58fe4e75d79f22905b944ccc /patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
parentf6bfd2162716fa9de25138a5e17fc6fd33df9950 (diff)
downloadcurrent-e1c9eba864d28bd0d127c9b2819e938f3f51c90c.tar.gz
current-e1c9eba864d28bd0d127c9b2819e938f3f51c90c.tar.xz
Mon Jun 26 19:44:44 UTC 202320230626194444_15.0
patches/packages/network-scripts-15.0-noarch-19_slack15.0.txz: Rebuilt. This update fixes a bug and adds a new feature: Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf. Expand the help text for DHCP_IPADDR in rc.inet1.conf. Add support for a DHCP_OPTS parameter. Thanks to ljb643 and Darren 'Tadgy' Austin. patches/packages/vim-9.0.1667-x86_64-1_slack15.0.txz: Upgraded. This fixes a rare divide-by-zero bug that could cause vim to crash. In an interactive program such as vim, I can't really see this qualifying as a security issue, but since it was brought up as such on LQ we'll just go along with it this time. :) Thanks to marav for the heads-up. (* Security fix *) patches/packages/vim-gvim-9.0.1667-x86_64-1_slack15.0.txz: Upgraded.
Diffstat (limited to 'patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch')
-rw-r--r--patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch b/patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
new file mode 100644
index 000000000..7be077718
--- /dev/null
+++ b/patches/source/network-scripts/0003-76218fa6e7c097c875af2a29cc7670995bef2ae4.patch
@@ -0,0 +1,30 @@
+From 76218fa6e7c097c875af2a29cc7670995bef2ae4 Mon Sep 17 00:00:00 2001
+From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
+Date: Wed, 21 Jun 2023 14:36:55 +0100
+Subject: Re-add support for the DHCP_IPADDR parameter from rc.inet1.conf.
+
+During the last major updates, somehow the DHCP_IPADDR option
+got missed while I re-implemented the options handling.
+This commit re-adds the support for that option.
+
+Note that this commit changes the previously used '-s' dhcpcd
+option with the '-r' option as this seems more appropriate.
+---
+ rc.inet1 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rc.inet1 b/rc.inet1
+index dc853fb..f998a21 100644
+--- a/rc.inet1
++++ b/rc.inet1
+@@ -398,6 +398,7 @@ if_up() {
+ [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "resolv.conf")
+ [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS+=("-C" "ntp.conf")
+ [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS+=("-G")
++ [ -n "${DHCP_IPADDR[$i]}" ] && DHCP_OPTIONS+=("-r" "${DHCP_IPADDR[$i]}")
+ [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS+=("-d")
+ # The -L option used to be hard coded into the dhcpcd command line in -current. It was added to assist ARM users
+ # get networking up and running. Previous versions of Slackware did not have -L hard coded - the code here keeps
+--
+cgit v1.2.3
+