summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:08:11 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-07-14 18:08:11 -0300
commitf9ffab37f4d86f65d31fd4ff56b357af59f3612a (patch)
tree9466ba8fc6d0c209c80092c9248b2a8ffd0537ad /libre
parentd1c720e0d937ab956225ca4ce869066cdcec325e (diff)
parentde9ab185a1c49d54b0ab5cee79f016d663d90b10 (diff)
downloadabslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.tar.gz
abslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.tar.bz2
abslibre-f9ffab37f4d86f65d31fd4ff56b357af59f3612a.zip
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Conflicts: libre/initscripts/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r--libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch28
-rw-r--r--libre/initscripts/PKGBUILD8
2 files changed, 34 insertions, 2 deletions
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
new file mode 100644
index 000000000..3dc75df1c
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,28 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee <dan@archlinux.org>
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+
+ bootlogd_stop
+
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+--
+1.7.11.1
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index ac9d98d27..85ada99ca 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -21,12 +21,16 @@ optdepends=('bridge-utils: Network bridging support'
makedepends=(asciidoc)
install=initscripts.install
source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+ 0001-remove-run-nologin-before-leaving-rc.multi.patch
'wireless.conf.d')
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
+}
+
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
-md5sums=('c95c3cd09975414fbb6719e4222ff74b'
- '027576534885b8d5dded9be546057b12')