Improve setup.

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index 75ab1b8d0e41d2ab195c8a217a257b0b060e4afd..a5a22f3960fec17d938a8f7a40ffecebfb0d36d5 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -57,13 +57,13 @@ if [ "$system_name" = "h610m" ]; then
     apt-mark hold linux-image-amd64 linux-headers-amd64
 fi
 for root in "${PATH_MANY}" '..'; do
     apt-mark hold linux-image-amd64 linux-headers-amd64
 fi
 for root in "${PATH_MANY}" '..'; do

-    install_for_modules "${root}/${PATH_REL_APTMARK}" ${MIN_MODULES}
+    install_for_modules "${root}/${PATH_REL_APTMARK}" ${MIN_MODULES} user desktop

 done
 apt -y --purge autoremove
 
 # Adapt /etc/ to our needs.
 for root in "${PATH_MANY}" '..'; do
 done
 apt -y --purge autoremove
 
 # Adapt /etc/ to our needs.
 for root in "${PATH_MANY}" '..'; do

-    copy_dirtree "${root}/${PATH_REL_ETC}" '/etc' ${MIN_MODULES}
+    copy_dirtree "${root}/${PATH_REL_ETC}" '/etc' ${MIN_MODULES} user desktop

 done
 
 # Ensure our desired locale is available.
 done
 
 # Ensure our desired locale is available.


@@ -82,7 +82,7 @@ done
 adduser --disabled-password --gecos "" "${USERNAME}"
 usermod -a -G sudo "${USERNAME}"
 for root in "${PATH_MANY}" '..'; do
 adduser --disabled-password --gecos "" "${USERNAME}"
 usermod -a -G sudo "${USERNAME}"
 for root in "${PATH_MANY}" '..'; do

-    copy_dirtree "${root}/${PATH_REL_HOME}" "${PATH_USER_HOME}" ${MIN_MODULES} desktop
+    copy_dirtree "${root}/${PATH_REL_HOME}" "${PATH_USER_HOME}" ${MIN_MODULES} user desktop

 done
 chown -R "${USERNAME}:${USERNAME}" "${PATH_USER_HOME}"
 passwd "${USERNAME}"
 done
 chown -R "${USERNAME}:${USERNAME}" "${PATH_USER_HOME}"
 passwd "${USERNAME}"