* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3e3c818958f86ae2612d626f26232209a2b5ee9
@ 2020-01-19 17:29 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2020-01-19 17:29 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6879 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 b3e3c818958f86ae2612d626f26232209a2b5ee9 (commit)
via f770492902a5c6194ecd4f596432093498ac6b66 (commit)
via c07c3e47f19307a28d91c7a83baed869e1ce5102 (commit)
via a8d162129938fe955d4e626c987eb52806894aac (commit)
from e403fa6ad97ad2d72d7add7c7564a4e15a9baa20 (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 b3e3c818958f86ae2612d626f26232209a2b5ee9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jan 19 17:28:24 2020 +0000
core140: add changed cloudsetup helper tu updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f770492902a5c6194ecd4f596432093498ac6b66
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 19 16:32:14 2020 +0000
cloud-init: Remove importing DNS settings
Those scripts used to import settings from the meta-data services
and wrote them to the local configuration files.
For the DNS settings and Amazon, this is no longer possible because
their DNS servers do not support DNSSEC at all. Therefore we default
to recursor mode.
To be consistent across cloud providers, we are doing the same for
Azure.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c07c3e47f19307a28d91c7a83baed869e1ce5102
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 19 15:50:21 2020 +0000
modules: Cleanup file
This file has an unsed line for the "fusion" module which
is no longer needed.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a8d162129938fe955d4e626c987eb52806894aac
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 19 15:50:20 2020 +0000
modules: No longer load parallel port modules
These modules are loaded by default on all systems.
They are simply a waste of space since not many systems
have parallel ports any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/140/filelists/files | 2 ++
src/initscripts/helper/aws-setup | 9 ---------
src/initscripts/helper/azure-setup | 10 ----------
src/initscripts/sysconfig/modules | 11 +----------
4 files changed, 3 insertions(+), 29 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 1bd2c314a..7253bbad6 100644
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -2,6 +2,8 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/helper/azure-setup
etc/rc.d/init.d/lvmetad
etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/red
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index af6d24c8b..cee78a283 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -115,9 +115,6 @@ import_aws_configuration() {
fi
fi
- # Import any DNS server settings
- eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
-
# Import network configuration
# After this, no network connectivity will be available from this script due to the
# renaming of the network interfaces for which they have to be shut down
@@ -161,10 +158,6 @@ import_aws_configuration() {
# The gateway is always the first IP address in the subnet
local gateway="$(to_address $(( netaddress_num + 1 )))"
- # The AWS internal DNS service is available on the second IP address of the VPC
- local dns1="$(to_address $(( vpc_netaddress_num + 2 )))"
- local dns2=
-
(
echo "RED_TYPE=STATIC"
echo "RED_DEV=${interface_name}"
@@ -175,8 +168,6 @@ import_aws_configuration() {
echo "RED_NETADDRESS=${netaddress}"
echo "RED_BROADCAST=${broadcast}"
echo "DEFAULT_GATEWAY=${gateway}"
- echo "DNS1=${DNS1:-${dns1}}"
- echo "DNS2=${DNS2:-${dns2}}"
) >> /var/ipfire/ethernet/settings
# Import aliases for RED
diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
index 86042a204..d497c43b2 100644
--- a/src/initscripts/helper/azure-setup
+++ b/src/initscripts/helper/azure-setup
@@ -138,9 +138,6 @@ import_azure_configuration() {
fi
fi
- # Import any DNS server settings
- eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
-
# Import network configuration
# After this, no network connectivity will be available from this script due to the
# renaming of the network interfaces for which they have to be shut down
@@ -175,11 +172,6 @@ import_azure_configuration() {
# The gateway is always the first IP address in the subnet
local gateway="$(to_address $(( netaddress_num + 1 )))"
- # Microsoft uses a special IP address for DNS
- # https://blogs.msdn.microsoft.com/mast/2015/05/18/what-is-the-ip-address-168-63-129-16/
- local dns1="168.63.129.16"
- local dns2=
-
(
echo "RED_TYPE=STATIC"
echo "RED_DEV=${interface_name}"
@@ -190,8 +182,6 @@ import_azure_configuration() {
echo "RED_NETADDRESS=${netaddress}"
echo "RED_BROADCAST=${broadcast}"
echo "DEFAULT_GATEWAY=${gateway}"
- echo "DNS1=${DNS1:-${dns1}}"
- echo "DNS2=${DNS2:-${dns2}}"
) >> /var/ipfire/ethernet/settings
# Import aliases for RED
diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index 5f8a77d8b..366b46cce 100644
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -15,8 +15,7 @@
# a space or a tab.
########################################################################
-### ACPI
-#
+# ACPI
ac
battery
button
@@ -25,12 +24,4 @@ processor
thermal
video
-### parport
-#
-parport_pc
-lp
-
-### fusion
-# fusion
-
# End /etc/sysconfig/modules
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-19 17:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-19 17:29 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3e3c818958f86ae2612d626f26232209a2b5ee9 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox