ppcrcd/trunk/conf.dir/usr/lib/ppcrcd: addcd.sh hw-detect

[sparky]

Author: sparky
Date: Fri Mar 17 15:10:49 2006
New Revision: 7204

Added:
   ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addcd.sh   (contents, props changed)
Modified:
   ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect
Log:
- dynamic cdrom detection (using udev)


Added: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addcd.sh
==============================================================================
--- (empty file)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addcd.sh	Fri Mar 17 15:10:49 2006
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. /usr/lib/ppcrcd/functions
+
+[ -n "$ID_CDROM" ] || exit 0
+rcdroot=$(grep /media/ppcrcd /etc/fstab | awk '{print $1}')
+[ "${DEVNAME}" = "$rcdroot" ] && exit
+
+mntdir="/media/${DEVLINKS##*/}"
+
+if [ "$ACTION" == "remove" ]; then
+	umount -f $mntdir >/dev/null 2>&1
+	rmdir $mntdir
+	sed -i "\@^$DEVNAME[ 	]@d" /etc/fstab
+
+	verbose 5 "CD: $mntdir removed"
+else
+	mkdir -p "$mntdir"
+	echo "${DEVNAME} $mntdir iso9660,udf,hfsplus,hfs " \
+		"defaults,ro,user,noauto 0 0" >> /etc/fstab
+
+	verbose 5 "CD: $mntdir created"
+fi

Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect	(original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/hw-detect	Fri Mar 17 15:10:49 2006
@@ -28,25 +28,6 @@
 done
 modprobe ide-cd
 
-# Searching for cdroms #######################################################
-verbose 2 -B " +-Searching CDROMs"
-cddevs=$(grep /media/ppcrcd /etc/fstab | awk '{print $1}')
-[ -n "$cddevs" ] && cddevs=$(lastlink $cddevs)
-cddevs=" $cddevs "
-
-for cdrom in /dev/{dvdrw,dvd,cdrw,cdwriter,cdrom} \
-			/dev/{dvdrw,dvd,cdrw,cdwriter,cdrom}*; do
-	verbose 5 " (Checking cdrom: $cdrom)"
-	[ -r $cdrom ] || continue
-	cddev=$(lastlink $cdrom)
-	echo "$cddevs" | grep -q " $cddev " && continue
-	cddevs="$cddevs $cddev "
-	verbose 4 " +-Found cdrom: $cdrom"
-	echo "$cdrom /media/$(basename $cdrom) iso9660,udf,hfsplus,hfs defaults,ro,user,noauto" \
-																>> /etc/fstab
-	mkdir -p /media/$(basename $cdrom)
-done
-
 # Searching for partitions ###################################################
 #@@ nomd:	don't try to autodetect md partitions
 cmdopt nomd || \