From b512f6a9abe3e02f739cb458109281d5f17d1219 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 9 Jul 2015 09:25:14 +0200 Subject: [PATCH] - rel 3; fix DELAY_LOGIN handling (visible if sysconfig/system is empty for example) --- rc-scripts-git.patch | 36 ++++++++++++++++++++++++++++++++++++ rc-scripts.spec | 4 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 rc-scripts-git.patch diff --git a/rc-scripts-git.patch b/rc-scripts-git.patch new file mode 100644 index 0000000..a433857 --- /dev/null +++ b/rc-scripts-git.patch @@ -0,0 +1,36 @@ +commit f60ef786cf271e20da75988326a8c0cf90a7c485 +Author: Arkadiusz Miśkiewicz +Date: Thu Jul 9 09:18:37 2015 +0200 + + Make DELAY_LOGIN checks consistent with the one in rc.sysinit (broken in 277e5f5352e622c4317852cded63e2a287506655). + +diff --git a/rc.d/init.d/allowlogin b/rc.d/init.d/allowlogin +index dcd789e..d837189 100755 +--- a/rc.d/init.d/allowlogin ++++ b/rc.d/init.d/allowlogin +@@ -24,14 +24,14 @@ esac + . /etc/rc.d/init.d/functions + + start() { +- if is_yes "$DELAY_LOGIN" && [ -f /etc/nologin.boot ]; then ++ if ! is_no "$DELAY_LOGIN" && [ -f /etc/nologin.boot ]; then + run_cmd "Allowing users to login" rm -f /etc/nologin /etc/nologin.boot + fi + } + + stop() { + # /etc/nologin when shutting down system +- if is_yes "$DELAY_LOGIN" && [ ! -f /etc/nologin ]; then ++ if ! is_no "$DELAY_LOGIN" && [ ! -f /etc/nologin ]; then + nls "System shutdown in progress\n" > /etc/nologin + chmod 644 /etc/nologin + cp -fp /etc/nologin /etc/nologin.boot +@@ -39,7 +39,7 @@ stop() { + } + + status() { +- if is_yes "$DELAY_LOGIN"; then ++ if ! is_no "$DELAY_LOGIN"; then + nls "Delay login is enabled" + else + nls "Delay login is not enabled" diff --git a/rc-scripts.spec b/rc-scripts.spec index b66d36f..6769fba 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -9,7 +9,7 @@ Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.14 -Release: 2 +Release: 3 License: GPL v2 Group: Base #Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ Source0: %{name}-%{version}.tar.gz Source1: rc-local.service Source2: sys-chroots.service Source3: %{name}.tmpfiles +Patch0: %{name}-git.patch URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts BuildRequires: autoconf BuildRequires: automake @@ -128,6 +129,7 @@ directories are silently ignored. %prep %setup -q +%patch0 -p1 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch: #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic" -- 2.44.0