Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plymouth support for merged-usr systems. #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix plymouth support for merged-usr systems. #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions defaults/initrd.scripts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,7 @@ crypt_filter() {
res=$?
if [ ${res} -eq 0 ]
then
splash set_msg 'Disk unlocked.'
splash 'set_msg' 'Disk unlocked.'
fi
return ${res}
fi
Expand Down Expand Up @@ -1550,12 +1550,12 @@ chooseKeymap() {

run mkdir -p /etc/sysconfig
echo "XKEYBOARD=${keymap}" > /etc/sysconfig/keyboard
splash set_msg "Set keymap to '${keymap}'"
splash 'set_msg' "Set keymap to '${keymap}'"
elif [ -z "${keymap}" ]
then
good_msg
good_msg "Keeping default keymap"
splash set_msg "Keeping default keymap"
splash 'set_msg' "Keeping default keymap"
else
bad_msg "Sorry, but keymap '${keymap}' is invalid!"
unset keymap
Expand Down Expand Up @@ -1601,7 +1601,9 @@ splash() {
plymouthRun --newroot="${2}"
;;
esac
return 0
fi
bad_msg "Splash failed, PLYMOUTH=${PLYMOUTH}, FBSPLASH=${FBSPLASH}"
}

plymouthRun() {
Expand Down Expand Up @@ -2143,7 +2145,7 @@ openLUKS() {
# plymouth password entry is passed through STDIN, requiring '--passphrase-fd 0 --batch'
# for newer gpg versions (>=2.1) '--pinentry-mode loopback' may also be required for the above
# '--no-tty' is included to prevent interruption of plymouth by any gpg output
if [ "${PLYMOUTH}" = '1' -a "${CRYPT_SILENT}" != '1' ]
if [ "${PLYMOUTH}" = '1' ] && [ "${CRYPT_SILENT}" != '1' ]
then
gpg_cmd="${gpg_cmd} --passphrase-fd 0 --batch --no-tty --decrypt ${mntkey}${LUKS_KEY} | "
else
Expand Down
9 changes: 6 additions & 3 deletions defaults/linuxrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,11 @@ do
export MLIST
;;
splash)
if [ -x /usr/bin/plymouth -a -x /usr/sbin/plymouthd ]
if [ -x /usr/bin/plymouth ] && { [ -x /usr/sbin/plymouthd ] || [ -x /usr/bin/plymouthd ]; }
then
PLYMOUTH=1
else
bad_msg "Plymouth executables were not found!"
fi
;;
splash=*)
Expand Down Expand Up @@ -474,7 +476,7 @@ do
overlayfs_modules=1
;;
unionfs)
if [ ! -x /sbin/unionfs ]
if [ ! -x /sbin/unionfs ] && [ ! -x /usr/bin/unionfs ]
then
USE_UNIONFS_NORMAL=0
bad_msg 'unionfs binary not found: aborting use of unionfs!'
Expand Down Expand Up @@ -561,7 +563,7 @@ then
FIRSTMODS="${FIRSTMODS} crc32_generic"
fi

if [ "${ROOTFSTYPE}" = "btrfs" -o -x /sbin/btrfs ]
if [ "${ROOTFSTYPE}" = "btrfs" ] || [ -x /sbin/btrfs ] || [ -x /usr/bin/btrfs ]
then
# We have no mechanism to trigger btrfs module loading before UDEV's btrfs builtin
# will run; In addition, loading btrfs via UDEV could cause problems for slow
Expand Down Expand Up @@ -647,6 +649,7 @@ fi
cd /

# start splash; plymouth must start after udev
good_msg "Initializing splash..."
splash 'init'

# Start iSCSI
Expand Down