From d497ddcaf2064b008b39b291e4b1b1055ebde402 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 6 Apr 2014 22:43:48 +0000 Subject: runit-scripts: frontend finish: continue plymouthd. refs #891 --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/frontend/finish | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index ed76902..ea41c96 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.1 -pkgrel=11 +pkgrel=12 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish index 417488d..702b543 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/finish +++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish @@ -1,14 +1,23 @@ -#!/bin/bash -exec 2>&1 -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions +#!/bin/bash +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions function cleanup(){ rm -f /etc/sv/frontend/.runtime/* printhl " Cleaning up /etc/sv/frontend/.runtime/" } +#unpause plymouthd that was paused in /etc/X11/Sessions/Linhes +pidfile=/run/plymouth.pid +if [ -e "$pidfile" ]; then + plypid=`cat "$pidfile"` + if [ -n "$plypid" ]; then + kill -s CONT "$plypid" + fi +fi + grep -q nox /proc/cmdline STATUS=$? if [ $STATUS = 0 ] @@ -42,4 +51,3 @@ else fi fi fi - -- cgit v0.12