Add x220 to desktop setup.

[config] / buster / setup_scripts / setup_desktop.sh

diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index b0d8cd661245262f9828ffc3a4da089b7235b774..97488e1977314d11ff50a2f73a5dff7516880629 100755 (executable)
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
     echo 'Need exactly one argument (system name).'
     false
 fi
-if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]; then
+if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ] && [ ! "$1" = "x220" ] && [ ! "$1" = "w530" ]; then
     echo "Need legal system name."
     false
 fi
@@ -15,12 +15,19 @@ system_name="$1"
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
-./setup.sh "${system_name}" ""
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user "${system_name}"
-./install_for_target.sh user "${system_name}"
+if [ "$1" = "x200s" ] || [ "$1" = "x220" ] || [ "$1" = "w530" ]; then
+  ./setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
+else
+  ./setup.sh "${system_name}" "" user desktop "${system_name}"
+fi
+# For hibernation on lid switch to work, we need a newer kernel on the EeePC,
+# see <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919227>.
+if [ "${system_name}" = "eeepc" ]; then
+    apt -y install -t buster-backports linux-image-amd64
+fi
 
 # Set up printer.
-lpadmin -p 'HP_Deskjet_F300_series' -m 'drv:///hpcups.drv/hp-deskjet_f300_series.ppd' -o 'OutputMode=NormalGray'
+lpadmin -p 'HP_Deskjet_F300_series' -m 'drv:///hpcups.drv/hp-deskjet_f300_series.ppd' -o 'OutputMode=NormalGray' -E
 service cups restart
 
 # Install Firefox directly from Mozilla.