aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2010-03-11 10:33:36 +0000
committerJohn Rigby <john.rigby@linaro.org>2011-08-21 21:28:51 -0600
commit0ef16cbe3eaaeb3c8f81870395587a962e091c4a (patch)
treefe23082cdc002b35325afcaf16d0147582d3b452 /drivers
parent5b30b9af16b082d4fc629a78f3bca7cf84c58b8c (diff)
UBUNTU: SAUCE: (no-up) cdrom -- default to not locking the tray when in use
BugLink: http://bugs.launchpad.net/bugs/397734 It seems that users are have a high expectation that the eject button on their CDROM drive will eject the disk regardless of whether it is in use or not. To this end we are now changing the default LOCK mode for mounted CDROMS to 0 to allow ejects. This however does not handle the direct open cases like music and video players. From the launchpad bug commentary: So, according to the upstream discussion David Zeuthen recommended to just not lock CD-ROM trays by default. Kernel/userspace already handles prematurely removed USB storage devices reasonably, and with read-only devices like CD-ROMs it is even less of an issue. So we should just set /proc/sys/dev/cdrom/lock to 0 by default. Note that we still will have the drive mounted after the eject. There is a media change uevent generated and this will be used to trigger the unmount of the drive in udisks. The burner software will also have to be looked at to ensure they are explicitly locking the drive closed during the burn. This will all be handled under the bug above. Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Colin King <colin.king@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cdrom/cdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 75fb965b8f7..79f9aea1d34 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -292,7 +292,7 @@ static int keeplocked;
/* default compatibility mode */
static int autoclose=1;
static int autoeject;
-static int lockdoor = 1;
+static int lockdoor = 0;
/* will we ever get to use this... sigh. */
static int check_media_type;
/* automatically restart mrw format */