Fixed a pakfire bug preventing the fire to go from core 9 to 10

Corrected wromg smdb to smbd entry in collectd.conf

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

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index f1c7e655d353179c0a7aa7b32483a9325c2ab728..8a9242f6dec465811377424edea751921aea67c4 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -62,7 +62,7 @@ LoadPlugin syslog
 
 <Plugin processes>
        Process "sshd"
-       Process "smdb"
+       Process "smbd"
        Process "nmbd"
        Process "squid"
        Process "squidguard"

diff --git a/config/rootfiles/core/10/files b/config/rootfiles/core/10/files
index 851b03501394003e5640c4a4690b00e939cdc9ab..b0d7b593c8d0e4a631b4ecb83eec4a7ae2b4fbcd 100644 (file)
--- a/config/rootfiles/core/10/files
+++ b/config/rootfiles/core/10/files
@@ -1,3 +1,4 @@
+etc/init.d/collectd
 usr/local/bin/wirelessctrl
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/gui.cgi

diff --git a/config/rootfiles/core/9/files b/config/rootfiles/core/9/files
index 102bb533afa8cbc86aaccc79abc8731094181a3c..6756a222abc48eee3a0a6af51724a41cfbbe4b74 100644 (file)
--- a/config/rootfiles/core/9/files
+++ b/config/rootfiles/core/9/files
@@ -19,3 +19,4 @@ srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/system.cgi
 var/ipfire/menu.d/20-status.menu
 var/ipfire/langs
+opt/pakfire/lib/functions.pl

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 7af22c0a514f3ae2a5fad5c4d4cb3f95309d36e3..2bce1922c14e9c450503993310c9d1f622835474 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -380,7 +380,7 @@ sub dblist {
        if ("$filter" eq "upgrade") {
                getcoredb("noforce");
                eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
-               if ("$core_release" gt "$Conf::core_mine") {
+               if ("$core_release" > "$Conf::core_mine") {
                        if ("$forweb" eq "forweb") {
                                print "<option value=\"core\">Core-Update -- $Conf::version -- Release: $Conf::core_mine -> $core_release</option>\n";
                        } else {
@@ -662,7 +662,7 @@ sub setuppak {
 sub upgradecore {
        getcoredb("noforce");
        eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
-       if ("$core_release" gt "$Conf::core_mine") {
+       if ("$core_release" > "$Conf::core_mine") {
                message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release");
                
                my @seq = `seq $Conf::core_mine $core_release`;