Merge branch 'issue/393' into 'master'

SCRUM#393: Removes configuration files that change the system in an undesirable way and makes minor modifications to the code to avoid undesired operation

See merge request !15

package/debian/changelog

+le-multiterminal (0.0.6) testing; urgency=medium
+
+  * Removes configuration files that change the system in an undesirable way and makes minor modifications to the code to avoid undesired operation
+
+ -- Stephanie Briere Americo <sba16@c3sl.ufpr.br>  Fri, 02 Feb 2018 11:33:19 -0200
+
 le-multiterminal (0.0.5) testing; urgency=medium
 
   * Adds dependency (libc) to ensure operation of the binaries used

package/etc/X11/xorg.conf.d/98-proinfo-rural.conf

-Section "Device"
-    MatchSeat "__fake-seat-2__"
-    Identifier "ThinNetworks TN-502/TN-750 PCI Video Card 1"
-    BusID "PCI:0:0:0"
-    Driver "siliconmotion"
-    Option "PanelSize" "1360x768"
-    Option "Dualhead" "true"
-    Option "monitor-LVDS" "LVDS Monitor"
-    Option "monitor-VGA" "VGA Monitor"
-EndSection
-
-Section "Device"
-    MatchSeat "__fake-seat-2__"
-    Identifier "ThinNetworks TN-502/TN-750 PCI Video Card 2"
-    BusID "PCI:0:0:0"
-    Driver "siliconmotion"
-    Option "PanelSize" "1360x768"
-    Option "Dualhead" "true"
-    Option "monitor-LVDS" "LVDS Monitor"
-    Option "monitor-VGA" "VGA Monitor"
-EndSection
-
-Section "Screen"
-    MatchSeat "__fake-seat-2__"
-    Identifier "ThinNetworks TN-502/TN-750 Screen 1"
-    Device "ThinNetworks TN-502/TN-750 PCI Video Card 1"
-    DefaultDepth 16
-EndSection
-
-Section "Screen"
-    MatchSeat "__fake-seat-2__"
-    Identifier "ThinNetworks TN-502/TN-750 Screen 2"
-    Device "ThinNetworks TN-502/TN-750 PCI Video Card 2"
-    DefaultDepth 16
-EndSection
-
-Section "ServerLayout"
-    MatchSeat "__fake-seat-2__"
-    Identifier "ThinNetworks TN-502/TN-750 Dual-Card Layout"
-    Screen 0 "ThinNetworks TN-502/TN-750 Screen 1"
-    Screen 1 "ThinNetworks TN-502/TN-750 Screen 2"
-EndSection

package/etc/xdg/lightdm/lightdm.conf.d/95-enable-numlock.conf

-[Seat:*]
-greeter-setup-script=/usr/bin/numlockx on

package/etc/xdg/lightdm/lightdm.conf.d/96-disable-guest.conf

-[Seat:*]
-allow-guest=false

package/etc/xdg/lightdm/lightdm.conf.d/98-xephyr-multi-seat.conf

-[Seat:seat-V0]
-xserver-command=xephyr-wrapper :90.0 -output VGA
-
-[Seat:seat-L0]
-xserver-command=xephyr-wrapper :90.0 -output LVDS
-
-[Seat:seat-V1]
-xserver-command=xephyr-wrapper :90.1 -output VGA
-
-[Seat:seat-L1]
-xserver-command=xephyr-wrapper :90.1 -output LVDS

package/etc/xdg/lightdm/lightdm.conf.d/99-autologin.conf

-[Seat:*]
-autologin-user-timeout=60
-
-[Seat:seat0]
-autologin-user=aluno0
-
-[Seat:seat-V0]
-autologin-user=aluno1
-
-[Seat:seat-L0]
-autologin-user=aluno2
-
-[Seat:seat-V1]
-autologin-user=aluno3
-
-[Seat:seat-L1]
-autologin-user=aluno4

package/opt/le-multiterminal/configurar-multiterminal.sh

@@ -48,4 +48,3 @@ apt -y install curl xserver-xorg-video-siliconmotion-hwe-16.04 compton numlockx
 
 # Pede eventos ao kernel: "força" a identificação dos dispositivos na maquina
 udevadm trigger
-systemctl restart lightdm

package/usr/local/bin/xorg-daemon

@@ -2,7 +2,7 @@
 # Conta quantas placas de video tem
 num_cards=$(lspci | grep -c Silicon.Motion)
 # Se nao for igual a 1 ou 2 sai com erro 2
-[ ${num_cards} -ne 1 -a ${num_cards} -ne 2 ] && exit 2
+[ ${num_cards} -ne 1 ] && exit 2
 
 # executa o X
 exec Xorg ${1} -seat __fake-seat-${num_cards}__ -dpms -s 0 -nocursor