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>
This commit is contained in:
Michael Tremer
2018-12-07 11:36:11 +00:00
parent 56726ed954
commit f354601bbe
7 changed files with 7 additions and 5 deletions

View 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

View 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

View 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

View 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

View 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

View 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

View 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