day01: Misc updates
Change-Id: Ie0f4479a3f3ce3927c94da6c82ae092237cad953
diff --git a/common/ubuntu_info.sh b/common/ubuntu_info.sh
index 903c121..8a944bd 100644
--- a/common/ubuntu_info.sh
+++ b/common/ubuntu_info.sh
@@ -2,4 +2,9 @@
# Save some basic debug information.
-dpkg-query -W -f='${Package}=${Version}\n' >> /var/log/vcp_initial_pkgs.log
+mkdir -p /var/log/bootstrap_logs/
+pushd /var/log/bootstrap_logs/
+ dpkg-query -W -f='${Package}=${Version}\n' | sort -u >> vcp_initial_pkgs.log
+popd
+
+
diff --git a/day01-image/scripts/cleanup.sh b/day01-image/scripts/cleanup.sh
index 47b34de..0968dd5 100644
--- a/day01-image/scripts/cleanup.sh
+++ b/day01-image/scripts/cleanup.sh
@@ -4,9 +4,11 @@
apt-get purge salt-formula-* -y
apt-get -y autoremove --purge
apt-get -y clean
+
rm -rf /var/lib/apt/lists/*
rm -rf /etc/apt/sources.list.d/*
echo "" > /etc/apt/sources.list
+
rm -rf /srv/salt/reclass/classes/*
rm /srv/salt/reclass/nodes/cfg01.mcp-day01.local.yml
mkdir -p /srv/salt/reclass/classes/service
diff --git a/day01-image/scripts/info.sh b/day01-image/scripts/info.sh
new file mode 120000
index 0000000..772d054
--- /dev/null
+++ b/day01-image/scripts/info.sh
@@ -0,0 +1 @@
+../../common/ubuntu_info.sh
\ No newline at end of file
diff --git a/day01-image/template.json b/day01-image/template.json
index 4488a50..1a00889 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -82,7 +82,8 @@
"pause_before": "10s",
"scripts": [
"scripts/security.sh",
- "scripts/cleanup.sh"
+ "scripts/cleanup.sh",
+ "scripts/info.sh"
]
},
{