initscripts: Import pakfire keys before importing AWS configuration
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 7 Dec 2018 11:36:11 +0000 (11:36 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 7 Dec 2018 11:38:55 +0000 (11:38 +0000)
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>
config/rootfiles/common/aarch64/initscripts
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
config/rootfiles/core/126/filelists/files
config/rootfiles/core/126/update.sh
lfs/initscripts

index bce6d0f..18adeea 100644 (file)
@@ -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
index bce6d0f..18adeea 100644 (file)
@@ -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
index f793952..7b2c1c5 100644 (file)
@@ -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
index f793952..7b2c1c5 100644 (file)
@@ -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
index 90534d7..60d66b9 100644 (file)
@@ -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
index ad4db08..938732b 100644 (file)
@@ -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
index 7da018a..bdab03d 100644 (file)
@@ -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