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.

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

Modified keyboard layout handling #104

Merged
merged 1 commit into from
Jul 15, 2020

Conversation

marmarta
Copy link
Member

Removed qubes-changed-keyboard-layout script; it is replaced by simply setting
VM property keyboard-layout.

requires QubesOS/qubes-core-admin#350

references QubesOS/qubes-issues#1396
references QubesOS/qubes-issues#4294

@@ -30,10 +27,7 @@ set_keyboard_layout() {
done
}

if [ -n "$QUBES_KEYMAP" ]; then
set_keyboard_layout "$QUBES_KEYMAP"
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to leave at least this one (and corresponding qubesdb-read), to load initial keyboard layout.


echo 'This program is deprecated; set qube property keyboard_layout instead.'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Print this on stderr. And exit with non-zero status (1?).

@marmarta marmarta force-pushed the keyboardlayout2020 branch 2 times, most recently from 1be2667 to 9037533 Compare June 22, 2020 23:38
@qubesos-bot
Copy link

qubesos-bot commented Jul 11, 2020

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/10655#dependencies

Failed tests

New failures

Compared to: https://openqa.qubes-os.org/tests/9500#dependencies

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/9500#dependencies

Copy link
Member

@marmarek marmarek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debian package build fails.

Copy link
Member

@marmarek marmarek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It still fails. You didn't removed etc/X11/Xsession.d/90qubes-keymap from debian/qubes-gui-agent.install file.

Removed qubes-changed-keyboard-layout script; it is replaced by simply setting
VM property keyboard-layout.

references QubesOS/qubes-issues#1396
references QubesOS/qubes-issues#4294
@marmarta marmarta force-pushed the keyboardlayout2020 branch from 542d550 to 59ae770 Compare July 14, 2020 13:04
@marmarek marmarek merged commit 59ae770 into QubesOS:master Jul 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants