From b6ef336cc51137d8fa759c773c703108f9f59291 Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Mon, 19 Sep 2022 22:19:18 +0100 Subject: [PATCH] Wrap some things in tests to allow for re-bootstrapping. --- bootstrap | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index e8a4525..63c8bd5 100755 --- a/bootstrap +++ b/bootstrap @@ -40,7 +40,7 @@ echo "----> Generic blocking rc.firewall installed - change it if required." # Restart crond for new configurations. echo "-> Restarting crond..." -/etc/rc.d/rc.crond restart +[[ -x /etc/rc.d/rc.crond ]] && /etc/rc.d/rc.crond restart echo "-> Fixing base files' permissions..." # Correct file/directory specific permissions. @@ -110,7 +110,7 @@ passwd root # Make Tadgy's account. echo "-> Adding user 'tadgy'..." -adduser tadgy +grep "^tadgy:" /etc/passwd >/dev/null || adduser tadgy # Move the 'console' group. I dislike it above 100. echo "-> Fixing 'console' GID..." @@ -152,8 +152,10 @@ unset PASS # Create log archive directories and move old log files. echo "-> Archiving old logs..." [[ ! -d /var/log/Archived ]] && mkdir -m 750 /var/log/Archived -[[ ! -d /var/log/Archived/pre-bootstrapping ]] && mkdir -m 750 /var/log/Archived/pre-bootstrapping -mv -f /var/log/{btmp.*,{cron,debug,maillog,messages,secure,spooler,syslog}{,.*}} /var/log/Archived/pre-bootstrapping/ 2>/dev/null +[[ ! -d /var/log/Archived/pre-bootstrapping ]] && { + mkdir -m 750 /var/log/Archived/pre-bootstrapping + mv -f /var/log/{btmp.*,{cron,debug,maillog,messages,secure,spooler,syslog}{,.*}} /var/log/Archived/pre-bootstrapping/ 2>/dev/null +} # Restart syslogd. echo "-> Restarting syslogd for new config..."