PATH_REL_APT_CONF=${PATH_REL_APT}/apt.conf.d
 TAG_ALL=all
 TAGS_USER='user desktop'
+THINKPAD_NAMES="x220 w530 t490s"
 
 export DEBIAN_FRONTEND=noninteractive
 
 }
 
 get_system_class_for() {
-    THINKPAD_NAMES="x220 w530 t490s"
     for THINKPAD_NAME in $THINKPAD_NAMES; do
         if [ "$1" = "${THINKPAD_NAME}" ]; then
             printf 'thinkpad'
 # Ensure package installation state as defined by what packages are
 # defined as required by Debian policy and by settings in ./aptmark.
 mark_nonrequireds_auto
-if [ "${SYSTEM_NAME}" = "h610m" ]; then
+if [ "${SYSTEM_NAME}" = 'h610m' ]; then
     # Hold kernel known to work with nvidia-drivers.
     apt-mark hold linux-image-amd64 linux-headers-amd64
 fi