From 10f2bc053d28f22a19af317ed7289848f29dfce0 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sun, 15 Nov 2015 16:18:22 +0000
Subject: [PATCH] Minor tweaks to the docker files.  - Legacy-Id: 10491

---
 docker/docker-init.sh | 5 ++++-
 docker/run            | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/docker-init.sh b/docker/docker-init.sh
index b054bf50e..311e0f916 100644
--- a/docker/docker-init.sh
+++ b/docker/docker-init.sh
@@ -29,6 +29,9 @@ if ! /etc/init.d/mysql status; then
     /etc/init.d/mysql start
 fi
 
+# Give debian-sys-maint access, to avoid complaints later
+mysql mysql <<< "GRANT ALL PRIVILEGES on *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '$(awk '/^password/ {print $3; exit}' /etc/mysql/debian.cnf )' WITH GRANT OPTION; FLUSH PRIVILEGES;"
+
 echo "Checking if the IETF database exists at $MYSQLDIR ..."
 if [ ! -d $MYSQLDIR/ietf_utf8 ]; then
     if [ -z "$DATADIR" ]; then
@@ -97,4 +100,4 @@ cd /home/$USER/$CWD || cd /home/$USER/
 
 echo "Done!"
 
-su $USER
+su $USER "$@"
diff --git a/docker/run b/docker/run
index 0b5d15cf6..ecd614b88 100755
--- a/docker/run
+++ b/docker/run
@@ -121,7 +121,6 @@ done
 # ----------------------------------------------------------------------
 # The program itself
 
-
 if [ "$(uname)" != "Linux" ]; then
     if   [ -n "$(type -p boot2docker)" ]; then
 	machine=$(type -p boot2docker)
@@ -197,12 +196,12 @@ if [ -z "$MYSQLDIR" ]; then
     docker run -ti -p $PORT:8000 -v $HOME:/home/$WHO                            \
 	-e USER=$WHO -e DATADIR=${parent#$HOME/}/data -e CWD=${PWD#$HOME/}	\
 	-e TAG=$TAG -e FILEDIR=${FILEDIR#$HOME}	\
-	$REPO:$TAG
+	$REPO:$TAG "$@"
 else
     docker run -ti -p $PORT:8000 -v $HOME:/home/$WHO -v $MYSQLDIR:/var/lib/mysql\
 	-e USER=$WHO -e DATADIR=${parent#$HOME/}/data -e CWD=${PWD#$HOME/}	\
 	-e TAG=$TAG -e FILEDIR=${FILEDIR#$HOME}	\
-	$REPO:$TAG
+	$REPO:$TAG "$@"
 fi
 
 echo ""