summaryrefslogtreecommitdiffstats
path: root/lib/keyboard.pm
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-11-12 21:31:41 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-11-12 21:35:49 +0100
commit08ec125f51beb355f761c35ddafdd068570c259c (patch)
tree1d968878d86fed894761f10f9fc3ff6a8fa090a0 /lib/keyboard.pm
parent4ecffc3d5664f217ac64b35d910fd2eabdaa599f (diff)
downloaddrakx-kbd-mouse-x11-08ec125f51beb355f761c35ddafdd068570c259c.tar
drakx-kbd-mouse-x11-08ec125f51beb355f761c35ddafdd068570c259c.tar.gz
drakx-kbd-mouse-x11-08ec125f51beb355f761c35ddafdd068570c259c.tar.bz2
drakx-kbd-mouse-x11-08ec125f51beb355f761c35ddafdd068570c259c.tar.xz
drakx-kbd-mouse-x11-08ec125f51beb355f761c35ddafdd068570c259c.zip
fix generating 00-keyboard.conf (mga#19761)
newlines in /etc/X11/xorg.conf.d/00-keyboard.conf were garbled since commit f959a5b33a4da88c0965c5955af7eef3d059737d
Diffstat (limited to 'lib/keyboard.pm')
-rw-r--r--lib/keyboard.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index 968e79d..cbcd4ce 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -602,11 +602,12 @@ sub write {
addVarsInShMode("$::prefix/etc/vconsole.conf", 0644, $h2);
}
- my $xorgconf = "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n" .
- "# manually too freely.\n" .
- q(Section "InputClass"\n) .
- qq( Identifier "system-keyboard"\n) .
- q( MatchIsKeyboard "on"\n);
+ my $xorgconf = qq(# Read and parsed by systemd-localed. It's probably wise not to edit this file
+# manually too freely.
+Section "InputClass"
+ Identifier "system-keyboard"
+ MatchIsKeyboard "on"
+);
my $isus = $keyboard->{XkbLayout} && $keyboard->{XkbLayout} eq "us";
# kbd_option => enabled?
my %is_opt_enabled = (
@@ -617,7 +618,7 @@ sub write {
);
foreach my $opt (keys %is_opt_enabled) {
if ($keyboard->{$opt} && $is_opt_enabled{$opt}) {
- $xorgconf .= sprintf(q( Option "%s" "%s"\n), $opt, $keyboard->{$opt});
+ $xorgconf .= sprintf(q( Option "%s" "%s") . "\n", $opt, $keyboard->{$opt});
}
}
$xorgconf .= "EndSection\n";