webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into kernel-4.14

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-04-03 20:15:58 +02:00
parent 6703371d2d d6d058a56b
commit 783f6aa36d
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/rootfiles/core/120/update.sh
View File

@@ -74,6 +74,12 @@ fi
# Remove deprecated SSH configuration option # Remove deprecated SSH configuration option
sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
# Remove any pakfire keys stored in /
rm -rfv /.gnupg
# Move old pakfire keystore into new place
mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
# Import new Pakfire key # Import new Pakfire key
/etc/init.d/pakfire start /etc/init.d/pakfire start

2
src/initscripts/system/pakfire
View File

@@ -9,6 +9,8 @@
. /etc/sysconfig/rc . /etc/sysconfig/rc
. ${rc_functions} . ${rc_functions}
export GNUPGHOME="/opt/pakfire/etc/.gnupg"
case "${1}" in case "${1}" in
start) start)
boot_mesg "Setting up Pakfire Package Manager..." boot_mesg "Setting up Pakfire Package Manager..."

3
src/pakfire/pakfire
View File

@@ -24,6 +24,9 @@
delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)}; delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
$< = $>; $< = $>;
# Store keys here
$ENV{"GNUPGHOME"} = "/opt/pakfire/etc/.gnupg";
require "/opt/pakfire/lib/functions.pl"; require "/opt/pakfire/lib/functions.pl";
my $interactive = 1; my $interactive = 1;