Commit 56306a46 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

scripts/setup.sh: add logname fallback 

In some circumstances, no utmp entry is available, so logname fails.

In particular, gnome-terminal no longer creates a utmp entry:
https://bugzilla.gnome.org/show_bug.cgi?id=747046



As a workaround, try $SUDO_USER - the use case here is to determine
the (unprivileged) user name so we can give them ownership of
certain files, so this is usually the right thing to use anyway.

If we are not running under sudo, the caller should have passed the
username as a parameter to scripts/setup.sh anyway, since we can't
reliably determine which user is intended.

Also check if username is actually set before using it to run chmod - it
is possible that the scripts/setup.sh caller does not want to provide
access to an unprivilieged user and just wants to run everything as
root.

Change-Id: I20631c325b52884a378029dcf38568a2b311b457
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 8b45a830

scripts/setup.sh

+10 −3
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ function linux_bind_driver() { 


	iommu_group=$(basename $(readlink -f /sys/bus/pci/devices/$bdf/iommu_group))

	if [ -e "/dev/vfio/$iommu_group" ]; then

		if [ "$username" != "" ]; then

			chown "$username" "/dev/vfio/$iommu_group"

		fi

	fi

}



function configure_linux {
@@ -76,7 +78,9 @@ function configure_linux { 
	echo "$NRHUGE" > /proc/sys/vm/nr_hugepages



	if [ "$driver_name" = "vfio-pci" ]; then

		if [ "$username" != "" ]; then

			chown "$username" /dev/hugepages

		fi



		MEMLOCK_AMNT=`ulimit -l`

		if [ "$MEMLOCK_AMNT" != "unlimited" ] ; then
@@ -174,7 +178,10 @@ if [ "$mode" == "" ]; then 
fi



if [ "$username" = "" ]; then

	username=`logname`

	username="$SUDO_USER"

	if [ "$username" = "" ]; then

		username=`logname 2>/dev/null` || true

	fi

fi



if [ `uname` = Linux ]; then