[arch-commits] Commit in initscripts/trunk (2 files)

[Dave Reisner]

    Date: Tuesday, July 3, 2012 @ 22:37:49
  Author: dreisner
Revision: 162950

upgpkg: initscripts 2012.06.3-2

- backport hotfix for disallowed user logins

Added:
  initscripts/trunk/0001-remove-run-nologin-before-leaving-rc.multi.patch
Modified:
  initscripts/trunk/PKGBUILD

-------------------------------------------------------+
 0001-remove-run-nologin-before-leaving-rc.multi.patch |   29 ++++++++++++++++
 PKGBUILD                                              |    9 ++++
 2 files changed, 37 insertions(+), 1 deletion(-)

Added: 0001-remove-run-nologin-before-leaving-rc.multi.patch
===================================================================
--- 0001-remove-run-nologin-before-leaving-rc.multi.patch	                        (rev 0)
+++ 0001-remove-run-nologin-before-leaving-rc.multi.patch	2012-07-04 02:37:49 UTC (rev 162950)
@@ -0,0 +1,29 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects at 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 at archlinux.org>
+Signed-off-by: Dave Reisner <dreisner at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-04 02:32:01 UTC (rev 162949)
+++ PKGBUILD	2012-07-04 02:37:49 UTC (rev 162950)
@@ -5,7 +5,7 @@
 
 pkgname=initscripts
 pkgver=2012.06.3
-pkgrel=1
+pkgrel=2
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
 url="http://www.archlinux.org"
@@ -20,12 +20,19 @@
 makedepends=(asciidoc)
 install=initscripts.install
 source=("ftp://ftp.archlinux.org/other/initscripts/${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=('34493c768b587ac59c6ee7e14f275c1d'
+         'ba32b9d723c20b38487669fb3c00d3d5'
          '027576534885b8d5dded9be546057b12')