From 3926fcc07fb8171017902702050d473e05948c26 Mon Sep 17 00:00:00 2001
From: Christoph Lohmann <20h@r-36.net>
Date: Sun, 10 Jun 2012 18:23:34 +0200
Subject: Applying DVB changes for the new mdev.conf format.

---
 mdev/lib/dvbdev | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mdev/lib/dvbdev b/mdev/lib/dvbdev
index 491efb9..33e0af6 100755
--- a/mdev/lib/dvbdev
+++ b/mdev/lib/dvbdev
@@ -1,20 +1,22 @@
 #!/bin/busybox ash
 
-# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
-ADAPTER=${MDEV%.*}
-N=${ADAPTER#dvb}
-# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
-DVB_DEV=${MDEV#*.}
+[ -n "$MDEV" ] || exit 0
+[ -n "$DEVNAME" ] || exit 0
+[ "$SUBSYSTEM" = "dvb" ] || exit 0
+
+MDEV=$(basename ${MDEV})
+DVBDEVPATH=$(dirname "${DEVNAME}")
+DVBPATH=$(dirname "${DVBDEVPATH}")
 
 case "$ACTION" in
 	add|"")
-		mkdir -p dvb/adapter${N}
-		mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
+		mkdir -p ${DVBDEVPATH}
+		mv ${MDEV} ${DVBDEVPATH}
 		;;
 	remove)
-		rm -f dvb/adapter${N}/${DVB_DEV}
-		rmdir dvb/adapter${N} 2>/dev/null
-		rmdir dvb/ 2>/dev/null
+		rm -f ${DEVNAME}
+		rmdir ${DVBDEVPATH} 2>/dev/null
+		rmdir ${DVBPATH} 2>/dev/null
 esac
 
 exit 0
-- 
cgit v1.2.3