X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=bookworm%2Fsetup_scripts%2Fsetup_desktop.sh;h=637dfc242717cb9c8c2cec741504b575a3412258;hb=f628496cf28b4db65ee965218e62989d51dd7aed;hp=216bf7c0160b0d5a43c86a96711c9fe0092d9ef3;hpb=5f8840a7eed21f8601ce5055e0e605c98f06d0d2;p=config

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 216bf7c..637dfc2 100755
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 . ./misc.sh
 
 expect_n_args 1 "(system name)" "$@"
@@ -8,7 +7,7 @@ get_system_name_arg "$1"
 
 # Set up system without user environment.
 cd "${setup_scripts_dir}"
-./setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
+./_setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
 
 # Set up printer.
 ppd_deb="hll2350dwpdrv-4.0.0-1.i386.deb"
@@ -35,7 +34,7 @@ if [ "$system_name" = "w530" ]; then
     wget https://us.download.nvidia.com/XFree86/Linux-x86_64/${driver_version}/${runscript}
     rmmod nouveau
     chmod u+x ${runscript} 
-    ./${runscript} --no-kernel-modules
+    ./${runscript} --no-kernel-modules --silent
     depmod
 fi
 
@@ -45,6 +44,5 @@ cd "${setup_scripts_dir}"
 adduser --disabled-password --gecos "" plom
 usermod -a -G sudo plom
 passwd plom
-cp setup_home.sh /home/plom
-cp misc.sh /home/plom
-chown plom:plom /home/plom/*.sh
+cp -a ~/config /home/plom
+chown -R plom:plom /home/plom/config