From 4c34204a40e0369442adb9e595ee3d5df5c1bb3f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 4 Apr 2011 09:57:02 +0200 Subject: simplify the check for plymouth in fedora-autorelabel The result of the check is needed only once, so there's no advantage in caching it in a variable. --- systemd/fedora-autorelabel | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'systemd') diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index d83040a3..204c5761 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-autorelabel @@ -5,16 +5,13 @@ . /etc/init.d/functions -PLYMOUTH= -[ -x /usr/bin/plymouth ] && PLYMOUTH=yes - relabel_selinux() { # if /sbin/init is not labeled correctly this process is running in the # wrong context, so a reboot will be required after relabel AUTORELABEL= . /etc/selinux/config echo "0" > /selinux/enforce - [ -n "$PLYMOUTH" ] && plymouth --hide-splash + [ -x /usr/bin/plymouth ] && plymouth --hide-splash if [ "$AUTORELABEL" = "0" ]; then echo -- cgit v1.2.1