From 8872dfacf0da5f3594c835b8f31a447422e61331 Mon Sep 17 00:00:00 2001
From: vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Sat, 7 Oct 2006 15:00:29 +0000
Subject: eject: remove unmounting. It is buggy for many non-trivial mounts,
and can be done as shell script.
git-svn-id: svn://busybox.net/trunk/busybox@16338 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
miscutils/eject.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/miscutils/eject.c b/miscutils/eject.c
index b07f536b1..ff23b1666 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -14,7 +14,6 @@
*/
#include "busybox.h"
-#include <mntent.h>
/* various defines swiped from linux/cdrom.h */
#define CDROMCLOSETRAY 0x5319 /* pendant of CDROMEJECT */
@@ -30,23 +29,20 @@ int eject_main(int argc, char **argv)
{
unsigned long flags;
char *device;
- struct mntent *m;
int dev, cmd;
opt_complementary = "?:?1:t--T:T--t";
flags = getopt32(argc, argv, "tT");
device = argv[optind] ? : "/dev/cdrom";
- // FIXME: what if something is mounted OVER our cdrom?
- // We will unmount something else??!
- // What if cdrom is mounted many times?
- m = find_mount_point(device, bb_path_mtab_file);
- if (m) {
- if (umount(m->mnt_dir))
- bb_error_msg_and_die("can't umount %s", device);
- if (ENABLE_FEATURE_MTAB_SUPPORT)
- erase_mtab(m->mnt_fsname);
- }
+ // We used to do "umount <device>" here, but it was buggy
+ // if something was mounted OVER cdrom and
+ // if cdrom is mounted many times.
+ //
+ // This works equally well (or better):
+ // #!/bin/sh
+ // umount /dev/cdrom
+ // eject
dev = xopen(device, O_RDONLY|O_NONBLOCK);
cmd = CDROMEJECT;
--
cgit v1.2.3-55-g6feb