initscripts: Import pakfire keys before importing AWS configuration

This is useful when the user-data script is installing
packages. For that it will need valid keys for course.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index bce6d0fb63e9251a0ea6d8d1682a453f0522d135..18adeea2192973fdb3ce19f2d31869e2d3892d9a 100644 (file)
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -184,11 +184,11 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig
 etc/rc.d/rcsysinit.d/S74aws
 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/S92rngd
 #etc/sysconfig

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index bce6d0fb63e9251a0ea6d8d1682a453f0522d135..18adeea2192973fdb3ce19f2d31869e2d3892d9a 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -184,11 +184,11 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig
 etc/rc.d/rcsysinit.d/S74aws
 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/S92rngd
 #etc/sysconfig

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index f79395227dd87c145b446155e346ba26788e442a..7b2c1c5f4a88ef66775f76cd0e0cc6382d04f25c 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S74aws
 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/S92rngd
 #etc/sysconfig

diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index f79395227dd87c145b446155e346ba26788e442a..7b2c1c5f4a88ef66775f76cd0e0cc6382d04f25c 100644 (file)
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -183,10 +183,10 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S74aws
 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/S92rngd
 #etc/sysconfig

diff --git a/config/rootfiles/core/126/filelists/files b/config/rootfiles/core/126/filelists/files
index 90534d725899987ac3c7994bec0af36f813aa976..60d66b9e1d1f307404fcee55c415bc00f53167c3 100644 (file)
--- a/config/rootfiles/core/126/filelists/files
+++ b/config/rootfiles/core/126/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/rngd
+etc/rc.d/rcsysinit.d/S71pakfire
 lib/udev/rules.d/90-hwrng.rules
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs

diff --git a/config/rootfiles/core/126/update.sh b/config/rootfiles/core/126/update.sh
index ad4db089c4fb9abfa9fb7f96b5f37b0a6c11ba9a..938732b4a3b7316682393d074c185de0b87bcdee 100644 (file)
--- a/config/rootfiles/core/126/update.sh
+++ b/config/rootfiles/core/126/update.sh
@@ -82,6 +82,7 @@ rm -f  /etc/sysconfig/lm_sensors
 # Stop services
 
 # Remove files
+rm -vf /etc/rc.d/rcsysinit.d/S81pakfire
 
 # Extract files
 extract_files

diff --git a/lfs/initscripts b/lfs/initscripts
index 7da018a6c62fca676a3834eb62037623404ae20a..bdab03dfea04f95a07dfc648b3ea7189d765ed5a 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -172,10 +172,10 @@ $(TARGET) :
        ln -sf ../init.d/setclock    /etc/rc.d/rc0.d/K47setclock
        ln -sf ../init.d/setclock    /etc/rc.d/rc6.d/K47setclock
        ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
+       ln -sf ../init.d/pakfire     /etc/rc.d/rcsysinit.d/S71pakfire
        ln -sf ../init.d/aws         /etc/rc.d/rcsysinit.d/S74aws
        ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
        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/rngd        /etc/rc.d/rcsysinit.d/S92rngd
        ln -sf ../init.d/vnstat      /etc/rc.d/rc3.d/S01vnstat