aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-05-11 08:58:58 +0000
committerRoy Marples <roy@marples.name>2007-05-11 08:58:58 +0000
commit56148d60ddc1838afe9dafd90f18dd7aca758420 (patch)
tree20e72bf1402a9575e078e22b145544dd9bcc404c
parent46cd245ee3b6bfc7e6a34de6d43e5930274bd37a (diff)
Use auto for /mnt/cdrom, #177990.
-rw-r--r--ChangeLog5
-rw-r--r--share.Linux/fstab2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6840a712..25ff2c0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
+ 11 May 2007; Roy Marples <uberlord@gentoo.org>:
+
+ Use auto for /mnt/cdrom, #177990.
+ Use clock MONOTONIC to timeout, not localtime, #177514.
+
08 May 2007; Roy Marples <uberlord@gentoo.org>:
When we don't have an address return 1, #176577.
diff --git a/share.Linux/fstab b/share.Linux/fstab
index 2ba830fc..08324862 100644
--- a/share.Linux/fstab
+++ b/share.Linux/fstab
@@ -17,7 +17,7 @@
/dev/BOOT /boot ext2 noauto,noatime 1 2
/dev/ROOT / ext3 noatime 0 1
/dev/SWAP none swap sw 0 0
-/dev/cdrom /mnt/cdrom audo noauto,ro 0 0
+/dev/cdrom /mnt/cdrom auto noauto,ro 0 0
#/dev/fd0 /mnt/floppy auto noauto 0 0
# glibc 2.2 and above expects tmpfs to be mounted at /dev/shm for