Update Nummer 2

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@846 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/perl b/config/rootfiles/common/perl
index 8266a19082bb980befcf08df338be7b0a5ce1b8d..ea958cda3c549fdb6d8c6dc0d351cda6819a60a8 100644 (file)
--- 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 (file)
index 0000000..4a0d346
--- /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 (file)
index 0000000..3e4711d
--- /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 (file)
index 0000000..988c9e2
--- /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 6fe2269d8441b1bf235687456ea9b212a30bd442..d62be482f4335f67163e78c71baaf750485ea693 100644 (file)
--- 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 <<END;
        <table width='100%'>
                <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b></td><td bgcolor='$color{'color20'}'></td><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index af7137bf16fb8aa2bb7fc8bced7b780da576d045..8544e054f191765555bd07ab55a749e5e7d21ec6 100644 (file)
--- 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 "<option value=\"core\">Core-Update -- $Conf::version -- Release: $Conf::core_mine -> $core_release</option>\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);