diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-13 01:11:02 +0000 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-13 01:11:02 +0000 |
| commit | 429799ecbfae01205fcd454e37c91634c9ef07ae (patch) | |
| tree | cf2f7d8f404ae9d94873259ab146212cc60d6ba8 | |
| parent | d24fa33ad1ad6af6236e3da4d985661189d70381 (diff) | |
fixup
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | common.sh | 2 | ||||
| -rw-r--r-- | config-etckeeper.PKGBUILD | 3 | ||||
| -rw-r--r-- | config-pacman-mirrorlist-repo.PKGBUILD | 2 | ||||
| -rw-r--r-- | config-pacman-mirrorlist-repomirror.PKGBUILD | 2 | ||||
| -rw-r--r-- | config-timedate-utc.PKGBUILD | 2 | ||||
| -rw-r--r-- | config-users-base.PKGBUILD | 2 | ||||
| -rw-r--r-- | config-winston-base.PKGBUILD | 8 |
8 files changed, 12 insertions, 10 deletions
@@ -25,3 +25,4 @@ $(foreach p,$(patsubst %.PKGBUILD,%,$(pkgbuilds)), \ @printf '%s' '$(subst ','\\'',$($*))' | sed 's/^/#/' | ./write-ifchanged $@ -include $(wildcard .var.*) .PHONY: FORCE +.SECONDARY: @@ -35,7 +35,7 @@ EOF add-unit() ( install -dm755 "${1%/*}" - base="$(sed 's/@[^.]\./@./' <<<"${1##*/}")" + base="$(sed 's/@[^.]*\./@./' <<<"${1##*/}")" srcs=( "etc/systemd/system/${1##*/}" "etc/systemd/system/$base" diff --git a/config-etckeeper.PKGBUILD b/config-etckeeper.PKGBUILD index 1cbd779..52bb751 100644 --- a/config-etckeeper.PKGBUILD +++ b/config-etckeeper.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.2 +pkgver=20160713.2 depends=(etckeeper pristine-etc-keeper) @@ -38,6 +38,7 @@ cat >> .gitignore <<EOF /gshadow- /passwd- /shadow- +/.updated /resolv.conf EOF _EOF_ diff --git a/config-pacman-mirrorlist-repo.PKGBUILD b/config-pacman-mirrorlist-repo.PKGBUILD index d395dc3..4fae281 100644 --- a/config-pacman-mirrorlist-repo.PKGBUILD +++ b/config-pacman-mirrorlist-repo.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.1 +pkgver=20160713.1 provides=(pacman-mirrorlist) conflicts=(pacman-mirrorlist) diff --git a/config-pacman-mirrorlist-repomirror.PKGBUILD b/config-pacman-mirrorlist-repomirror.PKGBUILD index 35b1f74..46a705e 100644 --- a/config-pacman-mirrorlist-repomirror.PKGBUILD +++ b/config-pacman-mirrorlist-repomirror.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.1 +pkgver=20160713.1 provides=(pacman-mirrorlist) conflicts=(pacman-mirrorlist) diff --git a/config-timedate-utc.PKGBUILD b/config-timedate-utc.PKGBUILD index 62ac92b..4c2b6c4 100644 --- a/config-timedate-utc.PKGBUILD +++ b/config-timedate-utc.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.1 +pkgver=20160713.2 package() { cd "$pkgdir" diff --git a/config-users-base.PKGBUILD b/config-users-base.PKGBUILD index 036d834..cd9ae3b 100644 --- a/config-users-base.PKGBUILD +++ b/config-users-base.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.1 +pkgver=20160713.1 package() { cd "$pkgdir" diff --git a/config-winston-base.PKGBUILD b/config-winston-base.PKGBUILD index 73f57f1..2fce27d 100644 --- a/config-winston-base.PKGBUILD +++ b/config-winston-base.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20160712.1 +pkgver=20160713.2 depends=(linux-libre-lts grub haveged irqbalance netctl) conflicts=(linux-libre) @@ -7,14 +7,14 @@ conflicts=(linux-libre) package() { cd "$pkgdir" -## Base setup ## +# ## Base setup add-file etc/hostname <<EOF winston.parabola.nu EOF add-file etc/machine-info <<EOF -LOCATION=1984 Hosting Company, Iceland +LOCATION="1984 Hosting Company, Iceland" EOF add-file etc/vconsole.conf <<EOF @@ -28,7 +28,7 @@ LANG=en_US.UTF-8 LC_COLLATE=C EOF -add-unit etc/systemd/system/multi-user.target.wants/getty@tty1.service +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 |