slitaz-tools rev 871
We need xorg.conf to avoid config on each boot
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed Apr 30 20:36:56 2014 +0200 (2014-04-30) |
parents | 0746b6a94061 |
children | 650d2b556063 |
files | tinyutils/tazx |
line diff
1.1 --- a/tinyutils/tazx Wed Apr 30 20:04:24 2014 +0200 1.2 +++ b/tinyutils/tazx Wed Apr 30 20:36:56 2014 +0200 1.3 @@ -41,6 +41,17 @@ 1.4 $xorg_config/$1.conf 1.5 } 1.6 1.7 +gen_xorg_conf_file() { 1.8 + # Create a xorg.conf if needed. 1.9 + if [ ! -f /etc/X11/xorg.conf ]; then 1.10 + cat > /etc/X11/xorg.conf << EOT 1.11 +# You can put here your own Xorg configurations. This config file is read 1.12 +# before all files in /etc/X11/xorg.conf.d and will NOT be erased by any 1.13 +# updates. 1.14 +EOT 1.15 + fi 1.16 +} 1.17 + 1.18 # Generate or regenerate 40-Keyboard.conf 1.19 keyboard_conf() { 1.20 # Configure the keyboard with the right keymap. 1.21 @@ -115,17 +126,9 @@ 1.22 # Remove the template. 1.23 rm $xorg_template 1.24 1.25 - # Keyboard 1.26 + # Keyboard & xorg.conf 1.27 keyboard_conf 1.28 - 1.29 - # Create a xorg.conf if needed. 1.30 - if [ ! -f /etc/X11/xorg.conf ]; then 1.31 - cat > /etc/X11/xorg.conf << EOT 1.32 -# You can put here your own Xorg configurations. This config file is read 1.33 -# before all files in /etc/X11/xorg.conf.d and will NOT be erased by any 1.34 -# updates. 1.35 -EOT 1.36 - fi 1.37 + gen_xorg_conf_file 1.38 } 1.39 1.40 # Install xorg server. 1.41 @@ -238,7 +241,8 @@ 1.42 # gest files for start a X session and config the keyboard. 1.43 check_root 1.44 slitaz_apps_conf 1.45 - keyboard_conf ;; 1.46 + keyboard_conf 1.47 + gen_xorg_conf_file ;; 1.48 1.49 keybard) 1.50 echo "Generating: 40-Keyboard.conf"