aboutsummaryrefslogtreecommitdiffstats
path: root/systemd
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2011-04-04 09:57:02 +0200
committerBill Nottingham <notting@redhat.com>2011-04-04 11:33:11 -0400
commit4c34204a40e0369442adb9e595ee3d5df5c1bb3f (patch)
tree8861df1b35f16ff77151cdd070b17b27937f79db /systemd
parent93d8f7b7d63689e9244d1ce942997c0e32bdd7cb (diff)
downloadinitscripts-4c34204a40e0369442adb9e595ee3d5df5c1bb3f.tar
initscripts-4c34204a40e0369442adb9e595ee3d5df5c1bb3f.tar.gz
initscripts-4c34204a40e0369442adb9e595ee3d5df5c1bb3f.tar.bz2
initscripts-4c34204a40e0369442adb9e595ee3d5df5c1bb3f.tar.xz
initscripts-4c34204a40e0369442adb9e595ee3d5df5c1bb3f.zip
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.
Diffstat (limited to 'systemd')
-rwxr-xr-xsystemd/fedora-autorelabel5
1 files changed, 1 insertions, 4 deletions
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