|
 |
acc58b |
From ea6edcfa5cb9a6a4dd5739f2238a051097f82a65 Mon Sep 17 00:00:00 2001
|
|
|
acc58b |
From: Martin Kolman <mkolman@redhat.com>
|
|
|
acc58b |
Date: Fri, 9 Jan 2015 18:06:36 +0100
|
|
|
acc58b |
Subject: [PATCH] Fix the Firstboot startup scripts for the s390 (#1180616)
|
|
|
acc58b |
|
|
|
acc58b |
Drop usage of /etc/sysconfig/i18n, which has been removed in RHEL-7
|
|
|
acc58b |
and only launch Firstboot if $DESKTOP is set.
|
|
|
acc58b |
|
|
|
acc58b |
Patch by jstodola.
|
|
|
acc58b |
|
|
|
acc58b |
Resolves rhbz#1180616
|
|
|
acc58b |
|
|
|
acc58b |
Signed-off-by: Martin Kolman <mkolman@redhat.com>
|
|
|
acc58b |
---
|
|
|
acc58b |
scripts/firstboot.csh | 5 ++++-
|
|
|
acc58b |
scripts/firstboot.sh | 6 ++++--
|
|
|
acc58b |
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
acc58b |
|
|
|
acc58b |
diff --git a/scripts/firstboot.csh b/scripts/firstboot.csh
|
|
|
acc58b |
index 07a4ab7..a4ff699 100644
|
|
|
acc58b |
--- a/scripts/firstboot.csh
|
|
|
acc58b |
+++ b/scripts/firstboot.csh
|
|
|
acc58b |
@@ -14,6 +14,9 @@ if (( $? != 0 ) && ( -x $FIRSTBOOT_EXEC )) then
|
|
|
acc58b |
set args = "--reconfig"
|
|
|
acc58b |
endif
|
|
|
acc58b |
|
|
|
acc58b |
- $FIRSTBOOT_EXEC $args
|
|
|
acc58b |
+ # run firstboot only if $DISPLAY is set
|
|
|
acc58b |
+ if ( $?DISPLAY == 1 ) then
|
|
|
acc58b |
+ $FIRSTBOOT_EXEC $args
|
|
|
acc58b |
+ endif
|
|
|
acc58b |
endif
|
|
|
acc58b |
endif
|
|
|
acc58b |
diff --git a/scripts/firstboot.sh b/scripts/firstboot.sh
|
|
|
acc58b |
index 5b4ec9d..dc4f0ef 100644
|
|
|
acc58b |
--- a/scripts/firstboot.sh
|
|
|
acc58b |
+++ b/scripts/firstboot.sh
|
|
|
acc58b |
@@ -15,7 +15,9 @@ if [ -f $FIRSTBOOT_EXEC ] && [ "${RUN_FIRSTBOOT,,}" = "yes" ]; then
|
|
|
acc58b |
args="--reconfig"
|
|
|
acc58b |
fi
|
|
|
acc58b |
|
|
|
acc58b |
- . /etc/sysconfig/i18n
|
|
|
acc58b |
- $FIRSTBOOT_EXEC $args
|
|
|
acc58b |
+ . /etc/locale.conf
|
|
|
acc58b |
+ . /etc/vconsole.conf
|
|
|
acc58b |
+ # run firstboot only if $DISPLAY is set
|
|
|
acc58b |
+ [ -n "$DISPLAY" ] && $FIRSTBOOT_EXEC $args
|
|
|
acc58b |
fi
|
|
|
acc58b |
fi
|
|
|
acc58b |
--
|
|
|
acc58b |
2.1.0
|
|
|
acc58b |
|