From 33d781ff19e9b460a253ce1e40808eeefd6b59a8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 22 Mar 2015 09:30:29 +0100
Subject: [PATCH] base-files: update to 0.120.

- Create kvm system group (gid 24) and add udev rule to assign perms.
- Move vkpurge to bin.
- Move DIR_COLORS to /etc/colors.
---
 srcpkgs/base-files/files/66-kvm.rules |  1 +
 srcpkgs/base-files/files/colorls.sh   |  6 +++---
 srcpkgs/base-files/template           | 14 +++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/base-files/files/66-kvm.rules

diff --git a/srcpkgs/base-files/files/66-kvm.rules b/srcpkgs/base-files/files/66-kvm.rules
new file mode 100644
index 00000000000..c2f7317aacc
--- /dev/null
+++ b/srcpkgs/base-files/files/66-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/srcpkgs/base-files/files/colorls.sh b/srcpkgs/base-files/files/colorls.sh
index 7240591e920..81f722dbb24 100644
--- a/srcpkgs/base-files/files/colorls.sh
+++ b/srcpkgs/base-files/files/colorls.sh
@@ -17,12 +17,12 @@ if [ -z "$USER_LS_COLORS" ]; then
     [ -e "$colors" ] && COLORS="$colors" && break
   done
 
-  [ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
+  [ -z "$COLORS" ] && [ -e "/etc/colors/DIR_COLORS.256color" ] && \
       [ "x`tput colors 2>/dev/null`" = "x256" ] && \
-      COLORS="/etc/DIR_COLORS.256color"
+      COLORS="/etc/colors/DIR_COLORS.256color"
 
   if [ -z "$COLORS" ]; then
-    for colors in "/etc/DIR_COLORS.$TERM" "/etc/DIR_COLORS" ; do
+    for colors in "/etc/colors/DIR_COLORS.$TERM" "/etc/colors/DIR_COLORS" ; do
       [ -e "$colors" ] && COLORS="$colors" && break
     done
   fi
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 21088fdb72f..26a9d723a2d 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.119
+version=0.120
 revision=1
 bootstrap=yes
 depends="base-directories xbps-triggers"
@@ -25,6 +25,9 @@ conf_files="
 	/etc/crypttab
 	/etc/nsswitch.conf"
 
+# New system groups
+system_groups="kvm:24"
+
 do_install() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		vmkdir usr/lib
@@ -43,9 +46,10 @@ do_install() {
 		inputrc fstab passwd group crypttab nsswitch.conf; do
 		vinstall ${FILESDIR}/${f} 644 etc
 	done
+	vmkdir etc/colors
 	vmkdir etc/profile.d
 	install -m644 ${FILESDIR}/*.sh ${DESTDIR}/etc/profile.d
-	install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc
+	install -m644 ${FILESDIR}/DIR_COLORS* ${DESTDIR}/etc/colors
 
 	# modprobe(8) files
 	vinstall ${FILESDIR}/usb-load-ehci-first 644 usr/lib/modprobe.d usb-load-ehci-first.conf
@@ -58,7 +62,7 @@ do_install() {
 	install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses
 
 	# vkpurge
-	vinstall ${FILESDIR}/vkpurge 755 usr/sbin vkpurge
+	vbin ${FILESDIR}/vkpurge
 
 	# Install default dracut configuration.
 	vinstall ${FILESDIR}/dracut.conf.d.voidlinux.conf 644 \
@@ -66,4 +70,8 @@ do_install() {
 
 	# Create /proc/self/mounts -> /etc/mtab symlink.
 	ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab
+
+	# udev rules
+	vmkdir usr/lib/udev/rules.d
+	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/usr/lib/udev/rules.d
 }