Merge pull request #300 from rancher-sandbox/etc-data-volume

Don't modify /etc until boot/05-persistent-data-volume has run

Author: jandubois

pkg/cidata/cidata.TEMPLATE.d/boot.sh

@@ -12,18 +12,17 @@ WARNING() {
 # shellcheck disable=SC2163
 while read -r line; do export "$line"; done <"${LIMA_CIDATA_MNT}"/lima.env
 
-if [ -e /etc/environment ]; then
-	sed -i '/#LIMA-START/,/#LIMA-END/d' /etc/environment
-fi
-cat "${LIMA_CIDATA_MNT}/etc_environment" >>/etc/environment
-
 # shellcheck disable=SC2163
 while read -r line; do
 	[ "$(expr "$line" : '#')" -eq 0 ] && export "$line"
 done <"${LIMA_CIDATA_MNT}"/etc_environment
 
 CODE=0
 
+# Don't make any changes to /etc or /var/lib until the boot/* scripts have run
+# because they might move the directories to /mnt/data on first boot, so changes
+# made on restart would be lost.
+
 for f in "${LIMA_CIDATA_MNT}"/boot/*; do
 	INFO "Executing $f"
 	if ! "$f"; then
@@ -32,6 +31,11 @@ for f in "${LIMA_CIDATA_MNT}"/boot/*; do
 	fi
 done
 
+if [ -e /etc/environment ]; then
+	sed -i '/#LIMA-START/,/#LIMA-END/d' /etc/environment
+fi
+cat "${LIMA_CIDATA_MNT}/etc_environment" >>/etc/environment
+
 if [ -d "${LIMA_CIDATA_MNT}"/provision.system ]; then
 	for f in "${LIMA_CIDATA_MNT}"/provision.system/*; do
 		INFO "Executing $f"