cleaning up the startup to reduce errors ...

immauss · Oct 22, 2024 · 6429e27 · 6429e27
1 parent 16517bb
commit 6429e27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scripts/fs-setup.sh b/scripts/fs-setup.sh
@@ -146,11 +146,11 @@ fi
 
 if ! [ -L /etc/gvm ]; then
 	echo "Handling config files"
-	cp -rpn /etc/gvm/* /usr/local/etc/gvm/* /data/local-etc/gvm/ 
+	cp -rpn /etc/gvm/* /usr/local/etc/gvm/* /data/local-etc/gvm/  2> /dev/null 
 	rm -rf /etc/gvm /usr/local/etc/gvm
 	ln -s /data/local-etc/gvm /etc/gvm
 	ln -s /data/local-etc/gvm /usr/local/etc/gvm
-	cp -rpn /etc/openvas/* /usr/local/etc/openvas/* /data/local-etc/openvas/ 
+	cp -rpn /etc/openvas/* /usr/local/etc/openvas/* /data/local-etc/openvas/ 2> /dev/null
 	rm -rf /etc/openvas /usr/local/etc/openvas
 	ln -s /data/local-etc/openvas /etc/openvas
 	ln -s /data/local-etc/openvas /usr/local/etc/openvas

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -17,7 +17,11 @@ else
 fi
 
 echo "Choosing container start method from:"
-echo "$@"
+if [ "$@" == ""] || ["$@" == " *"]; then
+	echo " Nothing ... so we start in the default of single container mode"
+else
+	echo "$@"
+fi
 # We'll use this later to know how to check container health
 echo "$1" > /usr/local/etc/running-as