Author: sparky
Date: Sun Mar 12 01:56:15 2006
New Revision: 7148
Modified:
ppcrcd/trunk/conf.dir/etc/udev/rules.d/hotplug_disk.rules
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addpart.sh
Log:
- cleanup after removing device
Modified: ppcrcd/trunk/conf.dir/etc/udev/rules.d/hotplug_disk.rules
==============================================================================
--- ppcrcd/trunk/conf.dir/etc/udev/rules.d/hotplug_disk.rules (original)
+++ ppcrcd/trunk/conf.dir/etc/udev/rules.d/hotplug_disk.rules Sun Mar 12
01:56:15 2006
@@ -1 +1,2 @@
ACTION="add", SUBSYSTEM="block", RUN+="/usr/lib/ppcrcd/addpart.sh"
+ACTION="remove", SUBSYSTEM="block", RUN+="/usr/lib/ppcrcd/addpart.sh"
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addpart.sh
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addpart.sh (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/addpart.sh Sun Mar 12 01:56:15 2006
@@ -30,9 +30,17 @@
mntdir="/mnt/${DEVNAME##*/}_${LABEL}"
mkdir -p "$mntdir"
-FS_OPTIONS="defaults,noauto,noatime"
-[[ $ID_FS_TYPE == *fat* ]] && FS_OPTIONS="$FS_OPTIONS,exec,showexec"
+if [ "$ACTION" == "remove" ]; then
+ umount -f $mntdir >/dev/null 2>&1
+ rmdir $mntdir
+ sed -i "[EMAIL PROTECTED] [EMAIL PROTECTED]" /etc/fstab
-echo "${DEVNAME} $mntdir ${ID_FS_TYPE} ${FS_OPTIONS} 0 0" >> /etc/fstab
+ verbose 5 "$mntdir removed"
+else
+ FS_OPTIONS="defaults,noauto,noatime"
+ [[ $ID_FS_TYPE == *fat* ]] && FS_OPTIONS="$FS_OPTIONS,exec,showexec"
-verbose 5 "$mntdir created"
+ echo "${DEVNAME} $mntdir ${ID_FS_TYPE} ${FS_OPTIONS} 0 0" >> /etc/fstab
+
+ verbose 5 "$mntdir created"
+fi
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
