wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set up $HOME and /home to match the host

Browse source 
Silverblue, and rpm-ostree more generally are moving to
HOME=/var/home/$USER and make the /home symlink just a compatibility
feature. See:

 https://github.com/projectatomic/rpm-ostree/pull/1726

Matching what the host does will reduce weird side-effects. Propagate
$HOME into the container to avoid mismatches in /etc/default/useradd,
and if the host has /home as a symlink to /var/home, do the same for
the toolbox.

https://github.com/debarshiray/fedora-toolbox/pull/34
This commit is contained in:
Owen W. Taylor 2019-01-10 19:09:27 +00:00 committed by Debarshi Ray
parent 47614b980c
commit 66e982af72
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fedora-toolbox
View file

@ -38,6 +38,12 @@ create()
tmpfs_size=$((64 * 1024 * 1024)) # 64 MiB
working_container_name="fedora-toolbox-working-container-$(uuidgen --time)"
if [[ "$(readlink /home)" == var/home ]] ; then
need_home_link=true
else
need_home_link=false
fi
if [ "$DBUS_SYSTEM_BUS_ADDRESS" != "" ]; then
dbus_system_bus_address=$DBUS_SYSTEM_BUS_ADDRESS
fi
@ -65,7 +71,17 @@ create()
echo "$0: trying to configure working container $working_container_name" >&42
if $need_home_link ; then
if ! $prefix_sudo buildah run $working_container_name -- \
sh -c 'rmdir /home && mkdir -m 0755 -p /var/home && ln -s var/home /home' 2>&42; then
$prefix_sudo buildah rm $working_container_name >/dev/null 2>&42
echo "$0: failed to make /home a symlink"
exit 1
fi
fi
if ! $prefix_sudo buildah run $working_container_name -- useradd \
--home-dir $HOME \
--no-create-home \
--shell $SHELL \
--uid $UID \