mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
96932c6fb5
ap/vim-9.0.1667-x86_64-1.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 *) l/freetype-2.13.1-x86_64-2.txz: Rebuilt. The profile scripts still mentioned three options to choose from when there are now only two. This has been fixed. Thanks to burdi01. l/gegl-0.4.46-x86_64-1.txz: Upgraded. l/imagemagick-7.1.1_12-x86_64-1.txz: Upgraded. l/librsvg-2.56.1-x86_64-1.txz: Upgraded. l/openexr-3.1.9-x86_64-1.txz: Upgraded. l/pipewire-0.3.72-x86_64-1.txz: Upgraded. n/network-scripts-15.0-noarch-19.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. xap/vim-gvim-9.0.1667-x86_64-1.txz: Upgraded.
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
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
|
|
|