From 518f894b4a6967f0a22c2c966df6a64775c4a707 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Fri, 14 Mar 2008 10:03:50 +0000 Subject: [PATCH] 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 --- config/collectd/collectd.conf | 2 +- config/rootfiles/core/10/files | 1 + config/rootfiles/core/9/files | 1 + src/pakfire/lib/functions.pl | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index f1c7e655d3..8a9242f6de 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -62,7 +62,7 @@ LoadPlugin syslog 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 851b035013..b0d7b593c8 100644 --- 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 102bb533af..6756a222ab 100644 --- 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 7af22c0a51..2bce1922c1 100644 --- 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 "\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`; -- 2.39.2