Skip to content

Fixes for privileged path #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 3 commits into from
Jun 24, 2019
Merged

Fixes for privileged path #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f0099c
supermin: Handle missing cache disk gracefully
jlebon Jun 21, 2019
9224be0
cmdlib.sh: Don't `chown` in supermin path
jlebon Jun 21, 2019
78e127d
gf-platformid: Fix bash conditional
jlebon Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/cmdlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,14 +350,13 @@ workdir=${workdir}
# chmod will set ownership to root, not builder
export USER=$(id -u)

# ensure the user of files created do not have root ownership
trap 'chown -h -R ${USER}:${USER} ${workdir}' EXIT

$(cat "${DIR}"/supermin-init-prelude.sh)
rc=0
sh ${TMPDIR}/cmd.sh || rc=\$?
echo \$rc > ${workdir}/tmp/rc
/sbin/fstrim -v ${workdir}/cache
if [ -b /dev/sdb1 ]; then
/sbin/fstrim -v ${workdir}/cache
fi
/sbin/reboot -f
EOF
chmod a+x "${vmpreparedir}"/init
Expand Down
2 changes: 1 addition & 1 deletion src/gf-platformid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ coreos_gf_run_mount "${tmp_dest}"
# * grub config
# * BLS config (for subsequent config regeneration)
# First, the grub config.
if [ "$arch" -ne "x86_64" ] || [ "$platformid" == "metal" ]; then
if [ "$arch" != "x86_64" ] || [ "$platformid" == "metal" ]; then
if [ "$(coreos_gf exists '/boot/efi')" == 'true' ]; then
grubcfg_path=$(coreos_gf glob-expand /boot/efi/EFI/*/grub.cfg)
else
Expand Down
4 changes: 3 additions & 1 deletion src/supermin-init-prelude.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ if [ -L "${workdir}"/src/config ]; then
mount -t 9p -o rw,trans=virtio,version=9p2000.L source "${workdir}"/src/config
fi
mkdir -p "${workdir}"/cache /host/container-work
mount /dev/sdb1 "${workdir}"/cache
if [ -b /dev/sdb1 ]; then
mount /dev/sdb1 "${workdir}"/cache
fi

if [ -f "${workdir}/tmp/supermin/supermin.env" ]; then
source "${workdir}/tmp/supermin/supermin.env";
Expand Down