From 84cd9b91627e3b70240c944e4424905c46b9e72c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 22 Aug 2018 14:05:43 +0100 Subject: [PATCH] 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 --- 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/update.sh | 5 +++++ lfs/initscripts | 1 - src/initscripts/system/network-trigger | 22 -------------------- 7 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 src/initscripts/system/network-trigger diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 66a7be55b8..bce6d0fb63 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 66a7be55b8..bce6d0fb63 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 8f3d41476d..f79395227d 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 8f3d41476d..f79395227d 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/update.sh b/config/rootfiles/core/124/update.sh index f8fd2116b1..d2954a00c1 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 1058779f11..7da018a6c6 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/system/network-trigger b/src/initscripts/system/network-trigger deleted file mode 100644 index 0d9de45c6b..0000000000 --- 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 -- 2.39.2