[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f354601bbeddfc8e77136a70ce50b1ae827d1d22

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f354601bbeddfc8e77136a70ce50b1ae827d1d22

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5955 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f354601bbeddfc8e77136a70ce50b1ae827d1d22 (commit)
      from  56726ed954bf1aa1f52214251eb42a7ab478e925 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f354601bbeddfc8e77136a70ce50b1ae827d1d22
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Dec 7 11:36:11 2018 +0000

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 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/126/filelists/files    | 1 +
 config/rootfiles/core/126/update.sh          | 1 +
 lfs/initscripts                              | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index bce6d0fb6..18adeea21 100644
--- 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 bce6d0fb6..18adeea21 100644
--- 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 f79395227..7b2c1c5f4 100644
--- 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 f79395227..7b2c1c5f4 100644
--- 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 90534d725..60d66b9e1 100644
--- 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 ad4db089c..938732b4a 100644
--- 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 7da018a6c..bdab03dfe 100644
--- 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


hooks/post-receive
--
IPFire 2.x development tree