From c72ccd50158e3079667250c9e4f2e39348b3a5b3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 8 Nov 2011 08:18:09 +0100
Subject: [PATCH] base-files: improved vkpurge for kernel-snapshot pkgs.

---
 srcpkgs/base-files/files/vkpurge | 12 +++++++++---
 srcpkgs/base-files/template      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index 848a25e270..7a20b0335a 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -23,13 +23,14 @@ _EOF
 
 list_kernels()
 {
-	local k kpkg installed kver skip
+	local k kpkg installed kver kvertmp skip
 
 	for k in /var/lib/initramfs-tools/*; do
-		kver=$(basename $k|sed -e 's|-rc|rc|')
+		kver=$(basename $k)
+		kvertmp=$(basename $k|sed -e 's|-rc|rc|')
 		for kpkg in kernel kernel-snapshot; do
 			installed=$(xbps-uhelper -r / version $kpkg)
-			if [ "$installed" = "$kver" ]; then
+			if [ "$installed" = "$kvertmp" ]; then
 				skip=1
 				break
 			fi
@@ -87,6 +88,11 @@ remove_kernel()
 	fi
 	# Execute post-remove kernel hooks.
 	run_hooks post-remove $rmkver
+
+	# Make sure there are no stale files.
+	if [ -f /var/lib/initramfs-tools/${rmkver} ]; then
+		rm -f /var/lib/initramfs-tools/${rmkver}
+	fi
 }
 
 if [ "$1" = "list" ]; then
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 677e3e5e94..4805f46af2 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.55
+version=0.56
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"