Improve setup.

diff --git a/testing/etc/t490s/network/interfaces b/testing/etc/t490s/network/interfaces
new file mode 100644 (file)
index 0000000..97589ca
--- /dev/null
+++ b/testing/etc/t490s/network/interfaces
@@ -0,0 +1,8 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+source /etc/network/interfaces.d/*
+
+# The loopback network interface
+auto lo
+iface lo inet loopback

diff --git a/testing/scripts/setup_desktop.sh b/testing/scripts/setup_desktop.sh
index f909034b044a8bee75199bc211baa820c5d57d94..75ab1b8d0e41d2ab195c8a217a257b0b060e4afd 100755 (executable)
--- a/testing/scripts/setup_desktop.sh
+++ b/testing/scripts/setup_desktop.sh
@@ -8,13 +8,13 @@ get_system_name_arg "$1"
 MIN_MODULES="all ${system_class_name} ${system_name}"
 
 # For upgrading only very selectively prepare /etc/ files.
-PATH_REL_APT_CONF=apt/apt.conf
+PATH_REL_APT_CONF=apt/apt.conf.d
 PATH_REL_SOURCES_LIST=apt/sources.list
 cp ${PATH_MANY}/${PATH_REL_ETC}/all/${PATH_REL_APT_CONF}/* /${PATH_REL_ETC}/${PATH_REL_APT_CONF}/
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade
 apt -y -o Dpkg::Options::='--force-confnew' full-upgrade
-cp ../${PATH_REL_ETC}/all/${PATH_REL_SOURCES_LIST}/* /${PATH_REL_ETC}/
+cp ../${PATH_REL_ETC}/all/${PATH_REL_SOURCES_LIST} /${PATH_REL_ETC}/
 apt clean
 apt update
 apt -y -o Dpkg::Options::='--force-confnew' upgrade