Removed force keyboard setting in postinst

hamonikr · Jun 4, 2024 · d5efbd2 · d5efbd2
1 parent 3aedd7e
commit d5efbd2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+xrdp (0.10.0-1hamonikr2) jammy; urgency=medium
+
+  * Fixed bugs
+   - Removed force keyboard setting in postinst
+
+  -- HamoniKR <[email protected]>  Tue, 04 Jun 2024 09:30:43 +0900
+
 xrdp (0.10.0-1hamonikr1) jammy; urgency=medium
 
   * Release for HamoniKr 7.0

diff --git a/debian/startwm.sh b/debian/startwm.sh
@@ -51,6 +51,9 @@ if [ ! "$DISPLAY" = ":0" ]; then
 
     # 104 키보드 레이아웃 처리
     if [ "$KEYBOARD_LAYOUT" = "kr" ]; then
+		localectl set-keymap us || true
+		localectl --no-convert set-x11-keymap kr pc105 kr106	
+
         xmodmap -e 'keycode 122 = Hangul'
         xmodmap -e 'keycode 121 = Hangul_Hanja'
     fi

diff --git a/debian/xrdp.postinst b/debian/xrdp.postinst
@@ -53,12 +53,6 @@ configure)
 		adduser xrdp ssl-cert
 	)
 
-	# For Korean Keyboard
-	if [ -f "/usr/bin/localectl" ]; then
-		localectl set-keymap us || true
-		localectl --no-convert set-x11-keymap kr pc105 kr106
-	fi
-
 	test -e /etc/xrdp/km-e0010412.ini || xrdp-genkeymap /etc/xrdp/km-e0010412.ini
 
 	;;