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@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 66a7be55b8518610d2a560d8b8425b973b742755..bce6d0fb63e9251a0ea6d8d1682a453f0522d135 100644 (file)
--- 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 66a7be55b8518610d2a560d8b8425b973b742755..bce6d0fb63e9251a0ea6d8d1682a453f0522d135 100644 (file)
--- 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 8f3d41476d502f9ce5bdcb9d4d64b5022c706e43..f79395227dd87c145b446155e346ba26788e442a 100644 (file)
--- 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 8f3d41476d502f9ce5bdcb9d4d64b5022c706e43..f79395227dd87c145b446155e346ba26788e442a 100644 (file)
--- 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 f8fd2116b10c7f43a156f38bc0e05016f68ce665..d2954a00c167dba3291b5efa607b6b05bb912794 100644 (file)
--- 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 1058779f11a4ed167be7210b7f50f7422f1a025c..7da018a6c62fca676a3834eb62037623404ae20a 100644 (file)
--- 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 (file)
index 0d9de45..0000000
--- 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