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 branch 'core36'

Browse Source
This commit is contained in:
Arne Fitzenreiter
2010-01-29 00:13:12 +01:00
parent 7b74796288 25dea62ac0
commit 8afe69f746
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/openssl
View File

@@ -9,7 +9,7 @@
#etc/ssl/misc/c_name #etc/ssl/misc/c_name
etc/ssl/openssl.cnf etc/ssl/openssl.cnf
#etc/ssl/private #etc/ssl/private
#usr/bin/c_rehash usr/bin/c_rehash
usr/bin/openssl usr/bin/openssl
#usr/include/openssl #usr/include/openssl
#usr/include/openssl/aes.h #usr/include/openssl/aes.h

5
html/cgi-bin/pakfire.cgi
View File

@@ -62,6 +62,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
if ("$pakfiresettings{'FORCE'}" eq "on") { if ("$pakfiresettings{'FORCE'}" eq "on") {
my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &"; my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
system("$command"); system("$command");
system("/bin/sleep 1");
} else { } else {
&Header::openbox("100%", "center", "Abfrage"); &Header::openbox("100%", "center", "Abfrage");
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`; my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
@@ -101,6 +102,7 @@ END
if ("$pakfiresettings{'FORCE'}" eq "on") { if ("$pakfiresettings{'FORCE'}" eq "on") {
my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &"; my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
system("$command"); system("$command");
system("/bin/sleep 1");
} else { } else {
&Header::openbox("100%", "center", "Abfrage"); &Header::openbox("100%", "center", "Abfrage");
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`; my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
@@ -138,10 +140,11 @@ END
} elsif ($pakfiresettings{'ACTION'} eq 'update') { } elsif ($pakfiresettings{'ACTION'} eq 'update') {
system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &"); system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
system("/bin/sleep 1");
} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') { } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &"; my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
system("$command"); system("$command");
system("/bin/sleep 1");
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") { } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {