diff --git a/config/rootfiles/common/perl b/config/rootfiles/common/perl index 8266a1908..ea958cda3 100644 --- a/config/rootfiles/common/perl +++ b/config/rootfiles/common/perl @@ -1099,7 +1099,7 @@ usr/lib/perl5/5.8.8/syslog.pl usr/lib/perl5/5.8.8/tainted.pl usr/lib/perl5/5.8.8/termcap.pl usr/lib/perl5/5.8.8/timelocal.pl -usr/lib/perl5/5.8.8/unicore +#usr/lib/perl5/5.8.8/unicore #usr/lib/perl5/5.8.8/unicore/ArabicShaping.txt #usr/lib/perl5/5.8.8/unicore/BidiMirroring.txt #usr/lib/perl5/5.8.8/unicore/Blocks.txt diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files new file mode 100644 index 000000000..4a0d346be --- /dev/null +++ b/config/rootfiles/core/2/files @@ -0,0 +1,6 @@ +etc/init.d/networking/red +etc/init.d/dhcp +srv/web/ipfire/cgi-bin/pakfire.cgi +opt/pakfire/lib/functions.pl +usr/local/bin/syslogdctrl +var/ipfire/graphs.pl diff --git a/config/rootfiles/core/2/meta b/config/rootfiles/core/2/meta new file mode 100644 index 000000000..3e4711dfe --- /dev/null +++ b/config/rootfiles/core/2/meta @@ -0,0 +1,3 @@ +DEPS="" +DESCDE= +DESCEN= diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh new file mode 100644 index 000000000..988c9e2c0 --- /dev/null +++ b/config/rootfiles/core/2/update.sh @@ -0,0 +1,6 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files + +reload_all diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 6fe2269d8..d62be482f 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -186,8 +186,6 @@ END &Header::openbox("100%", "center", "Pakfire"); -system("pakfire update &>dev/null"); - print < $Lang::tr{'pakfire available addons'}$Lang::tr{'pakfire installed addons'} diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index af7137bf1..8544e054f 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -349,6 +349,21 @@ sub dblist { close(FILE); if ("$filter" eq "upgrade") { + getcoredb(); + eval(`grep "core_" $Conf::dbdir/lists/core-list.db`); + if ("$core_release" gt "$Conf::core_mine") { + if ("$forweb" eq "forweb") { + print "\n"; + } else { + my $command = "Core-Update $Conf::version\nRelease: $Conf::core_mine -> $core_release\n"; + if ("$Pakfire::enable_colors" eq "1") { + print "$color{'lila'}$command$color{'normal'}\n"; + } else { + print "$command\n"; + } + } + } + opendir(DIR,"$Conf::dbdir/meta"); my @files = readdir(DIR); closedir(DIR);