* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c
@ 2018-08-22 13:09 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2018-08-22 13:09 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10713 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 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c (commit)
via 84cd9b91627e3b70240c944e4424905c46b9e72c (commit)
via f3d59d2c94f3757bd10b74577c85740cd094ccee (commit)
via c5465a94533beee243d447e92bc31ee8d4a40ca5 (commit)
from caf5dcb1e741d93c686c2db0df6f2615bdc68c19 (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 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 14:06:53 2018 +0100
core124: Ship updated AWS setup scripts
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 84cd9b91627e3b70240c944e4424905c46b9e72c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 14:05:43 2018 +0100
Drop the network-trigger script
This is done at boot time and doesn't normally need to be done again.
On AWS or in the setup, renaming any network interfaces is being
handled automatically.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f3d59d2c94f3757bd10b74577c85740cd094ccee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 14:02:43 2018 +0100
firstsetup: There is no need to restart udev here
All network interfaces are renamed accordingly in setup
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c5465a94533beee243d447e92bc31ee8d4a40ca5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 14:00:39 2018 +0100
aws: Let udev rename all network interfaces
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/initscripts | 2 --
config/rootfiles/common/armv5tel/initscripts | 2 --
config/rootfiles/common/i586/initscripts | 2 --
config/rootfiles/common/x86_64/initscripts | 2 --
config/rootfiles/core/124/filelists/files | 2 ++
config/rootfiles/core/124/update.sh | 5 +++++
lfs/initscripts | 1 -
src/initscripts/helper/aws-setup | 29 +++++-----------------------
src/initscripts/system/aws | 3 +++
src/initscripts/system/firstsetup | 6 ------
src/initscripts/system/network-trigger | 22 ---------------------
11 files changed, 15 insertions(+), 61 deletions(-)
delete mode 100644 src/initscripts/system/network-trigger
Difference in files:
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 66a7be55b..bce6d0fb6 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
-etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig
etc/sysconfig/createfiles
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 66a7be55b..bce6d0fb6 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
-etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig
etc/sysconfig/createfiles
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 8f3d41476..f79395227 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
-etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig
etc/sysconfig/createfiles
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 8f3d41476..f79395227 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
-etc/rc.d/init.d/network-trigger
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S81pakfire
etc/rc.d/rcsysinit.d/S85firewall
-etc/rc.d/rcsysinit.d/S90network-trigger
etc/rc.d/rcsysinit.d/S92rngd
#etc/sysconfig
etc/sysconfig/createfiles
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index bfe50cffa..8d4da08ab 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -1,5 +1,7 @@
etc/system-release
etc/issue
+etc/rc.d/helpers/aws-setup
+etc/rc.d/init.d/aws
etc/rc.d/init.d/localnet
etc/rc.d/init.d/partresize
srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index f8fd2116b..d2954a00c 100644
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -33,6 +33,11 @@ done
# Stop services
+# Remove files
+rm -f \
+ /etc/rc.d/rcsysinit.d/S90network-trigger \
+ /etc/rc.d/init.d/network-trigger
+
# Extract files
extract_files
diff --git a/lfs/initscripts b/lfs/initscripts
index 1058779f1..7da018a6c 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -177,7 +177,6 @@ $(TARGET) :
ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet
ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S81pakfire
ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall
- ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger
ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd
ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat
ln -sf ../init.d/vnstat /etc/rc.d/rc0.d/K51vnstat
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 893246ba1..b2bb5a966 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -50,22 +50,6 @@ prefix2netmask() {
to_address "$(( netmask ^ 0xffffffff ))"
}
-find_interface() {
- local mac="${1}"
-
- local path
- for path in /sys/class/net/*; do
- local address="$(<${path}/address)"
-
- if [ "${mac}" = "${address}" ]; then
- basename "${path}"
- return 0
- fi
- done
-
- return 1
-}
-
import_aws_configuration() {
local instance_id="$(get meta-data/instance-id)"
@@ -243,19 +227,13 @@ import_aws_configuration() {
) >> /var/ipfire/ethernet/settings
;;
esac
-
- # Rename interface
- local interface="$(find_interface "${mac}")"
-
- if [ -n "${interface}" ] && [ -n "${interface_name}" ] && [ "${interface}" != "${interface_name}" ]; then
- ip link set "${interface}" down
- ip link set "${interface}" name "${interface_name}"
- fi
done
# Save CONFIG_TYPE
echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings
+
+
# Actions performed only on the very first start
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
# Enable SSH
@@ -322,6 +300,9 @@ case "${reason}" in
# Remove all IP addresses
ip addr flush dev "${interface}"
+
+ # Shut down the interface
+ ip link set "${interface}" down
;;
*)
diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws
index 6fce670a0..2a556801a 100644
--- a/src/initscripts/system/aws
+++ b/src/initscripts/system/aws
@@ -60,6 +60,9 @@ case "${1}" in
# End DHCP client immediately
dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null
+ # Rename network devices
+ udevadm trigger --action="add" --subsystem-match="net"
+
exit 0
;;
diff --git a/src/initscripts/system/firstsetup b/src/initscripts/system/firstsetup
index 0704a98dc..e79c144d9 100644
--- a/src/initscripts/system/firstsetup
+++ b/src/initscripts/system/firstsetup
@@ -36,11 +36,5 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
fi
fi
-echo Restarting udev...
-killall udevd
-/sbin/udevadm hwdb --update
-/sbin/udevd --daemon
-/sbin/udevadm trigger
-/sbin/udevadm settle
/etc/init.d/sysklogd stop
touch /var/ipfire/main/firstsetup_ok
diff --git a/src/initscripts/system/network-trigger b/src/initscripts/system/network-trigger
deleted file mode 100644
index 0d9de45c6..000000000
--- a/src/initscripts/system/network-trigger
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/network-trigger
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
- start)
- boot_mesg "Triggering network devices..."
- udevadm trigger --action="add" --subsystem-match="net"
- evaluate_retval
- ;;
-
- *)
- echo "Usage: ${0} {start}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/network-trigger
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-08-22 13:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-22 13:09 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox