From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexander Koch <ipfire@starkstromkonsument.de>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] Pakfire: Add new command line argument "status"
Date: Sat, 27 Apr 2019 21:26:45 +0200
Message-ID: <1556393206-17040-2-git-send-email-ipfire@starkstromkonsument.de>
In-Reply-To: <1556393206-17040-1-git-send-email-ipfire@starkstromkonsument.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1457801601036366422=="
List-Id: <development.lists.ipfire.org>

--===============1457801601036366422==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This enables Pakfire to return a Status-Summary for the Current Core-Update-L=
evel, time since last updates, the availability of a core-/packet-update and =
if a reboot is required to complete an update. This can be used by monitoring=
 agents (e.g. zabbix_agentd) to monitor the update status of the IPFire devic=
e.

Signed-off-by: Alexander Koch <ipfire(a)starkstromkonsument.de>
---
 src/pakfire/lib/functions.pl | 52 ++++++++++++++++++++++++++++++++++++++++++=
++
 src/pakfire/pakfire          |  2 ++
 2 files changed, 54 insertions(+)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 12a405b..9ed911d 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -108,6 +108,7 @@ sub usage {
   &Pakfire::message("               <update> - Contacts the servers for new =
lists of paks.");
   &Pakfire::message("               <upgrade> - Installs the latest version =
of all paks.");
   &Pakfire::message("               <list> - Outputs a short list with all a=
vailable paks.");
+  &Pakfire::message("               <status> - Outputs a summary about avail=
able core upgrades, updates and a required reboot");
   &Pakfire::message("");
   &Pakfire::message("       Global options:");
   &Pakfire::message("               --non-interactive --> Enables the non-in=
teractive mode.");
@@ -893,4 +894,55 @@ sub progress_bar {
     sprintf "$color{'lightgreen'}%-20s %7s |%-${width}s| %10s$color{'normal'=
}\r",$show_bfile, $progress, $char x (($width-1)*$got/$total). '>', beautifys=
ize($got);
 }
=20
+sub updates_available {
+	# Get packets with updates available
+	my @upgradepaks =3D &Pakfire::dblist("upgrade", "noweb");
+
+	# Get the length of the returned array
+	my $updatecount =3D scalar @upgradepaks;
+
+	return "$updatecount";
+}
+
+sub coreupdate_available {
+	eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
+	if ("$core_release" > "$Conf::core_mine") {
+		return "yes ($core_release)";
+	}
+	else {
+		return "no";
+	}
+}
+
+sub reboot_required {
+	if ( -e "/var/run/need_reboot" ) {
+		return "yes";
+	}
+	else {
+		return "no";
+	}
+}
+
+sub status {
+	# General info
+	my $return =3D "Core-Update-Level: $Conf::core_mine\n";
+	$return .=3D "Last update: " . &General::age("/opt/pakfire/db/core/mine") .=
 " ago\n";
+	$return .=3D "Last core-list update: " . &General::age("/opt/pakfire/db/lis=
ts/core-list.db") . " ago\n";
+	$return .=3D "Last server-list update: " . &General::age("/opt/pakfire/db/l=
ists/server-list.db") . " ago\n";
+	$return .=3D "Last packages-list update: " . &General::age("/opt/pakfire/db=
/lists/packages_list.db") . " ago\n";
+
+	# Get availability of core updates
+	$return .=3D "Core-Update available: " . &Pakfire::coreupdate_available() .=
 "\n";
+
+	# Get availability of package updates
+	$return .=3D "Package-Updates available: " . &Pakfire::updates_available() =
. "\n";
+
+	# Test if reboot is required
+	$return .=3D "Reboot required: " . &Pakfire::reboot_required() . "\n";
+
+	# Return status text
+	print "$return";
+	exit 1;
+}
+
 1;
diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 041ba66..c69a8d3 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -322,6 +322,8 @@
 		} elsif ("$ARGV[1]" eq "upgrades") {
 			system("rm -f /etc/fcron.daily/pakfire-upgrade");
 		}
+	} elsif ("$ARGV[0]" eq "status") {
+		&Pakfire::status;
 	} else {
 		&Pakfire::usage;
 	}
--=20
2.7.4


--===============1457801601036366422==--