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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 6182 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  42deeb3b450c74138dfb76d9d45d4588a5271887 (commit)
       via  eb68e27dd27b538d84c8382389f83f1a57ba59e7 (commit)
      from  5876642d175609919d2f43892deec822d650bdf0 (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 42deeb3b450c74138dfb76d9d45d4588a5271887
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 19 19:45:24 2018 +0000

    Revert "installer: Import the Pakfire key at install time"
    
    This reverts commit 7d995c9f56055f39e559bd6e355a9a1689585c6d.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit eb68e27dd27b538d84c8382389f83f1a57ba59e7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 19 19:44:50 2018 +0000

    pakfire: Import key when system boots up
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/common/armv5tel/initscripts | 2 ++
 config/rootfiles/common/i586/initscripts     | 2 ++
 config/rootfiles/common/x86_64/initscripts   | 2 ++
 config/rootfiles/core/120/filelists/files    | 2 ++
 lfs/initscripts                              | 1 +
 src/installer/main.c                         | 7 -------
 6 files changed, 9 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 43802216d..7b94faf5c 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -63,6 +63,7 @@ etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
+etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
@@ -181,6 +182,7 @@ etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S73swconfig
 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
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 5463f675d..cc0e4580d 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -64,6 +64,7 @@ etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
+etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
@@ -183,6 +184,7 @@ etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
 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
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 5463f675d..cc0e4580d 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -64,6 +64,7 @@ etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
+etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
@@ -183,6 +184,7 @@ etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S70console
 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
diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files
index c8877f528..679f627de 100644
--- a/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@ -3,7 +3,9 @@ etc/issue
 etc/sysctl.conf
 etc/fcron.daily/openvpn-crl-updater
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/unbound
+etc/rc.d/rcsysinit.d/S81pakfire
 opt/pakfire/lib/functions.pl
 opt/pakfire/pakfire.key
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
diff --git a/lfs/initscripts b/lfs/initscripts
index 9d3a52c77..cb3f4e048 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -175,6 +175,7 @@ $(TARGET) :
 	ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
 	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/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger
 	ln -sf ../init.d/rngd        /etc/rc.d/rcsysinit.d/S92rngd
diff --git a/src/installer/main.c b/src/installer/main.c
index e154fb935..a3642551d 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -879,13 +879,6 @@ int main(int argc, char *argv[]) {
 		free(backup_file);
 	}
 
-	/* Import Pakfire key */
-	snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/gpg --import /opt/pakfire/pakfire.key");
-	if (runcommandwithstatus(commandstring, title, _("Setting up package management system..."), logfile)) {
-		errorbox(_("Could not import the Pakfire key."));
-		goto EXIT;
-	}
-
 	// Download and execute the postinstall script
 	if (*config.postinstall) {
 		snprintf(commandstring, sizeof(commandstring),


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