[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 793a273ab5da4c03db0a62b54104bbd4d8225b1c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 793a273ab5da4c03db0a62b54104bbd4d8225b1c

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 4853 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  793a273ab5da4c03db0a62b54104bbd4d8225b1c (commit)
       via  559e94bafbcbd68a44de695f14287e46d0044713 (commit)
       via  99f2c6951123b5d961f4af92c2d9eb188204580e (commit)
      from  10dd2afd6d339247e5c918f53d1a7fcbb5c43ddb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 793a273ab5da4c03db0a62b54104bbd4d8225b1c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Aug 9 12:31:46 2019 +0200

    dhcpcd: add noip4ll parameter to config
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 559e94bafbcbd68a44de695f14287e46d0044713
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Aug 9 08:14:29 2019 +0200

    initskripts: smt: hide error on cpu's that not support smt at all
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 99f2c6951123b5d961f4af92c2d9eb188204580e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Aug 9 08:02:19 2019 +0200

    partresize: check for apu only if dmi is present
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/dhcpc/dhcpcd.conf                  |  3 +++
 config/rootfiles/core/135/filelists/files |  1 +
 config/rootfiles/core/135/update.sh       |  5 +++++
 src/initscripts/system/partresize         | 14 ++++++++------
 src/initscripts/system/smt                |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
index eb625a70c..7b18896ec 100644
--- a/config/dhcpc/dhcpcd.conf
+++ b/config/dhcpc/dhcpcd.conf
@@ -21,3 +21,6 @@ require dhcp_server_identifier
 # A hook script is provided to lookup the hostname if not set by the DHCP
 # server, but it should not be run by default.
 nohook lookup-hostname
+
+# disable ipv4ll (IPv4 local link/apipa) ip's
+noipv4ll
diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files
index 4c5fdce6c..c6c87ba18 100644
--- a/config/rootfiles/core/135/filelists/files
+++ b/config/rootfiles/core/135/filelists/files
@@ -9,6 +9,7 @@ etc/rc.d/init.d/functions
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/partresize
+etc/rc.d/init.d/smt
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/unbound
 etc/sysctl.conf
diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/core/135/update.sh
index c59f2dc2c..13959a647 100644
--- a/config/rootfiles/core/135/update.sh
+++ b/config/rootfiles/core/135/update.sh
@@ -91,6 +91,11 @@ rm -vf \
 # Extract files
 extract_files
 
+# update dhcpcd.conf
+sed -i -e "s|.*ipv4ll.*||g" /var/ipfire/dhcpc/dhcpcd.conf
+echo "# disable ipv4ll (IPv4 local link/apipa) ip's" >> /var/ipfire/dhcpc/dhcpcd.conf
+echo "noipv4ll"                                      >> /var/ipfire/dhcpc/dhcpcd.conf
+
 # update linker config
 ldconfig
 
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index f3d8dfe20..040c6c369 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -36,12 +36,14 @@ case "${1}" in
 			if [ ! "$(grep "console=ttyS0" /proc/cmdline)" == "" ]; then
 				scon="on";
 			fi
-			IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name;
-			case ${DMI_PRODUCT_NAME} in
-				APU|apu[1-4]|PC\ Engines\ apu[1-4] )
-						scon="on";
-					;;
-			esac
+			if [ -e /sys/class/dmi/id/product_name ]; then
+				IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name;
+				case ${DMI_PRODUCT_NAME} in
+					APU|apu[1-4]|PC\ Engines\ apu[1-4] )
+							scon="on";
+						;;
+				esac
+			fi
 
 			# Enable the serial console on all systems on Azure
 			if running_on_azure; then
diff --git a/src/initscripts/system/smt b/src/initscripts/system/smt
index f83776c1a..cc4128b2d 100644
--- a/src/initscripts/system/smt
+++ b/src/initscripts/system/smt
@@ -18,7 +18,7 @@ case "${1}" in
 		# Nothing to do when SMT is not enabled or not supported anyways
 		if [ "$(</sys/devices/system/cpu/smt/control)" != "on" ]; then
 			exit 0
-		fi
+		fi 2>/dev/null
 
 		# Disable SMT when the processor is vulnerable to Foreshadow or Fallout/ZombieLoad/RIDL
 		for vuln in l1tf mds; do


hooks/post-receive
--
IPFire 2.x development tree