Browse Source

Account for root ownership of overlay files.

Since we chown and chmod files in the overlay, we need to ensure that we
can write to them in each of the bootstrap-rootfs-overlay generation
scripts.

Eventually, I think we should make overlays as tarballs with ownership
and permissions inside the archive to avoid this dance.

Changelog: Title
Signed-off-by: Drew Moseley <drew.moseley@northern.tech>
revert-252-rm-only-tag-2.2.x
Drew Moseley 4 years ago
parent
commit
1709148ddc
  1. 1
      .dockerignore
  2. 1
      scripts/bootstrap-rootfs-overlay-demo-server.sh
  3. 1
      scripts/bootstrap-rootfs-overlay-hosted-server.sh
  4. 1
      scripts/bootstrap-rootfs-overlay-production-server.sh

1
.dockerignore

@ -1,3 +1,4 @@
deploy deploy
input input
work work
rootfs_overlay*

1
scripts/bootstrap-rootfs-overlay-demo-server.sh

@ -52,6 +52,7 @@ if [ -z "${server_ip}" ]; then
exit 1 exit 1
fi fi
sudo chown -R $(id -u).$(id -g) ${output_dir}
mkdir -p ${output_dir}/etc/mender mkdir -p ${output_dir}/etc/mender
cat <<- EOF > ${output_dir}/etc/mender/mender.conf cat <<- EOF > ${output_dir}/etc/mender/mender.conf
{ {

1
scripts/bootstrap-rootfs-overlay-hosted-server.sh

@ -53,6 +53,7 @@ if [ -z "${tenant_token}" ]; then
exit 1 exit 1
fi fi
sudo chown -R $(id -u).$(id -g) ${output_dir}
mkdir -p ${output_dir}/etc/mender mkdir -p ${output_dir}/etc/mender
cat <<- EOF > ${output_dir}/etc/mender/mender.conf cat <<- EOF > ${output_dir}/etc/mender/mender.conf
{ {

1
scripts/bootstrap-rootfs-overlay-production-server.sh

@ -57,6 +57,7 @@ if [ -z "${server_url}" ]; then
exit 1 exit 1
fi fi
sudo chown -R $(id -u).$(id -g) ${output_dir}
mkdir -p ${output_dir}/etc/mender mkdir -p ${output_dir}/etc/mender
cat <<- EOF > ${output_dir}/etc/mender/mender.conf cat <<- EOF > ${output_dir}/etc/mender/mender.conf
{ {

Loading…
Cancel
Save