From 43c57f4f78e224773bcc558a0484cac35111dc0b Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 30 Jul 2015 16:03:28 -0700
Subject: [PATCH] Add more devices, but only if they really exist

---
 bashrc | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/bashrc b/bashrc
index 7370c01..348b26a 100644
--- a/bashrc
+++ b/bashrc
@@ -13,13 +13,31 @@ command_not_found_handle () {
 		return
 	fi
 
+	# Add a bunch of (optional) devices
+	# (Don't add them unconditionally: if they don't exist, it
+	# would prevent the container from starting)
+	DEVICES=
+	for DEV in /dev/kvm /dev/ttyUSB* /dev/dri/* /dev/snd/*; do
+		if [ -b "$DEV" -o -c "$DEV" ]; then
+			DEVICES="$DEVICES --device $DEV:$DEV"
+		fi
+	done
+
+	# And a few (optional) files
+	# (Here again, they don't always exist everywhere)
+	VOLUMES=
+	for VOL in /tmp/.X11-unix /run/user; do
+		if [ -e "$VOL" ]; then
+			VOLUMES="$VOLUMES --volume $VOL:$VOL"
+		fi
+	done
+
 	docker run -ti -u $(whoami) -w "$HOME" \
 		$(env | cut -d= -f1 | awk '{print "-e", $1}') \
-		-v /dev/snd:/dev/snd \
+		$DEVICES $VOLUMES \
 		-v /etc/passwd:/etc/passwd:ro \
 		-v /etc/group:/etc/group:ro \
 		-v /etc/localtime:/etc/localtime:ro \
 		-v /home:/home \
-		-v /tmp/.X11-unix:/tmp/.X11-unix \
 		"$@"
 }