more

6 files changed, 22 insertions, 6 deletions

diff --git a/config-etckeeper.PKGBUILD b/config-etckeeper.PKGBUILD
index 5f56b43..b5a9ef0 100644
--- a/config-etckeeper.PKGBUILD
+++ b/config-etckeeper.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.2
+pkgver=20160713.7
 
 depends=(etckeeper pristine-etc-keeper)
 
@@ -24,6 +24,14 @@ add-unit etc/systemd/system/multi-user.target.wants/etckeeper.timer
 # [pristine-etc-keeper]: https://www.parabola.nu/packages/pcr/any/pristine-etc-keeper-git/
 add-unit etc/systemd/system/multi-user.target.wants/pristine-etc-keeper.timer
 
+# etckeeper is configured to automatically "forget" about files that
+# become .gitignore'ed; normally you'd have to manually run
+# `git rm --cached` on them.
+add-file -m755 etc/etckeeper/commit.d/40git-ignore <<EOF
+#!/bin/sh
+git ls-files --ignored --exclude-standard -z|xargs -0r git rm --cached --
+EOF
+
 # The etckeeper update-ignore hook is customized to ignore a couple
 # more files in `/etc` (and avoid ignoring `/etc/mtab`).  We ignore
 # `resolv.conf` because it is managed by [resolvconf][openresolv].
@@ -65,4 +73,5 @@ add-file etc/pacman.d/.gitignore <<EOF
 /gnupg/
 EOF
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }
diff --git a/config-pacman-mirrorlist-repo.PKGBUILD b/config-pacman-mirrorlist-repo.PKGBUILD
index 4fae281..97e13a2 100644
--- a/config-pacman-mirrorlist-repo.PKGBUILD
+++ b/config-pacman-mirrorlist-repo.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.1
+pkgver=20160713.2
 
 provides=(pacman-mirrorlist)
 conflicts=(pacman-mirrorlist)
@@ -11,4 +11,5 @@ add-file etc/pacman.d/mirrorlist <<EOF
 Server = https://repo.parabola.nu/\$repo/os/\$arch
 EOF
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }
diff --git a/config-pacman-mirrorlist-repomirror.PKGBUILD b/config-pacman-mirrorlist-repomirror.PKGBUILD
index 46a705e..0abbf9b 100644
--- a/config-pacman-mirrorlist-repomirror.PKGBUILD
+++ b/config-pacman-mirrorlist-repomirror.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.1
+pkgver=20160713.2
 
 provides=(pacman-mirrorlist)
 conflicts=(pacman-mirrorlist)
@@ -11,4 +11,5 @@ add-file etc/pacman.d/mirrorlist <<EOF
 Server = https://repomirror.parabola.nu/\$repo/os/\$arch
 EOF
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }
diff --git a/config-timedate-utc.PKGBUILD b/config-timedate-utc.PKGBUILD
index 4c2b6c4..a4658f1 100644
--- a/config-timedate-utc.PKGBUILD
+++ b/config-timedate-utc.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.2
+pkgver=20160713.3
 
 package() {
 cd "$pkgdir"
@@ -12,4 +12,5 @@ ln -s ../usr/share/zoneinfo/UTC etc/localtime
 # Use timesyncd NTP client daemon.
 add-unit etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }
diff --git a/config-users-base.PKGBUILD b/config-users-base.PKGBUILD
index cd9ae3b..c7c07c0 100644
--- a/config-users-base.PKGBUILD
+++ b/config-users-base.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.1
+pkgver=20160713.2
 
 package() {
 cd "$pkgdir"
@@ -16,4 +16,5 @@ ExecStart=/bin/bash -c '/usr/bin/pwck -r && /usr/bin/pwck -s'
 ExecStart=/bin/bash -c '/usr/bin/grpck -r && /usr/bin/grpck -s'
 EOF
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }
diff --git a/config-winston-base.PKGBUILD b/config-winston-base.PKGBUILD
index c61e4f7..fa4b054 100644
--- a/config-winston-base.PKGBUILD
+++ b/config-winston-base.PKGBUILD
@@ -1,5 +1,5 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20160713.2
+pkgver=20160713.5
 
 depends=(linux-libre-lts grub haveged irqbalance netctl)
 conflicts=(linux-libre)
@@ -32,6 +32,8 @@ add-unit etc/systemd/system/getty.target.wants/getty@tty1.service
 add-unit etc/systemd/system/multi-user.target.wants/haveged.service
 add-unit etc/systemd/system/multi-user.target.wants/irqbalance.service
 
+ln -s ../usr/lib/os-release etc/os-release
+
 # ## Networking
 
 # `/etc/udev/rules.d/80-net-setup-link.rules` is a symlink to
@@ -57,4 +59,5 @@ EOF
 
 netctl-enable eth0-static
 
+backup=($(find "$pkgdir" -printf '%P\n'))
 }