Merge remote-tracking branch 'remotes/origin/dev' into issue/1049

salt/redis/etc/redis.conf

@@ -858,7 +858,7 @@ acllog-max-len 128
 # limit for maxmemory so that there is some free RAM on the system for replica
 # output buffers (but this is not needed if the policy is 'noeviction').
 #
-# maxmemory <bytes>
+maxmemory 817m
 
 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
 # is reached. You can select one from the following behaviors:
@@ -889,7 +889,7 @@ acllog-max-len 128
 #
 # The default is:
 #
-# maxmemory-policy noeviction
+maxmemory-policy noeviction
 
 # LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated
 # algorithms (in order to save memory), so you can tune it for speed or
@@ -1834,4 +1834,4 @@ jemalloc-bg-thread yes
 # aof_rewrite_cpulist 8-11
 #
 # Set bgsave child process to cpu affinity 1,10,11
-# bgsave_cpulist 1,10-11
+# bgsave_cpulist 1,10-11

setup/so-setup

@@ -118,9 +118,7 @@ if [ "$OS" == ubuntu ]; then
 	update-alternatives --set newt-palette /etc/newt/palette.original >> $setup_log 2>&1
 fi
 
-if [ $automated == no ]; then
-	setterm -blank 0 >> $setup_log 2>&1
-fi
+setterm -blank 0 >> $setup_log 2>&1
 
 if [ "$setup_type" == 'iso' ] || (whiptail_you_sure); then
 	true