diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-09-23 12:14:21 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-09-23 12:14:21 +0000 |
| commit | 42adbad63fee6bcb8809b057db94d6e7f3f42b9b (patch) | |
| tree | 58c09504d78fc2a3b855a39e93e9301c8395b0fe | |
| parent | 8da4d7a31cbaf3438f1f48803d14d016c4abdc4b (diff) | |
Revert. It seems people don't agree about which device should be used.
req. by krw@ millert@
| -rw-r--r-- | sbin/mount/mount.8 | 4 | ||||
| -rw-r--r-- | share/man/man5/fstab.5 | 4 | ||||
| -rw-r--r-- | share/man/man8/compat_linux.8 | 4 | ||||
| -rw-r--r-- | usr.bin/sudo/sudoers.mdoc.in | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index a998ef7990d..e149065728e 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount.8,v 1.71 2013/09/23 06:19:39 ajacoutot Exp $ +.\" $OpenBSD: mount.8,v 1.72 2013/09/23 12:14:20 ajacoutot Exp $ .\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -355,7 +355,7 @@ file system table Mount a CD-ROM on node .Pa /mnt/cdrom : .Pp -.Dl # mount -t cd9660 -r /dev/cd0c /mnt/cdrom +.Dl # mount -t cd9660 -r /dev/cd0a /mnt/cdrom .Pp Mount an MS-DOS USB stick with DUID 3eb7f9da875cb9ee on node .Pa /mnt/key : diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5 index afb8184664a..a139b7eb242 100644 --- a/share/man/man5/fstab.5 +++ b/share/man/man5/fstab.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fstab.5,v 1.46 2013/09/23 06:19:39 ajacoutot Exp $ +.\" $OpenBSD: fstab.5,v 1.47 2013/09/23 12:14:19 ajacoutot Exp $ .\" $NetBSD: fstab.5,v 1.5.2.1 1995/11/16 20:11:11 pk Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 @@ -286,7 +286,7 @@ swap /tmp mfs rw,nodev,nosuid,-s=153600 0 0 /dev/sd0h /usr/local ffs rw,nodev 1 2 /dev/sd0i /home ffs rw,nodev,nosuid 1 2 /dev/sd0j /usr/src ffs rw,nodev,nosuid,softdep 1 2 -/dev/cd0c /cdrom cd9660 ro,noauto 0 0 +/dev/cd0a /cdrom cd9660 ro,noauto 0 0 5b27c2761a9b0b06.i /mnt/key msdos rw,noauto 0 0 server:/export/ports /usr/ports nfs rw,nodev,nosuid,soft,intr 0 0 .Ed diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8 index bf6a799a73f..5b12d747c35 100644 --- a/share/man/man8/compat_linux.8 +++ b/share/man/man8/compat_linux.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: compat_linux.8,v 1.41 2013/09/23 06:19:39 ajacoutot Exp $ +.\" $OpenBSD: compat_linux.8,v 1.42 2013/09/23 12:14:20 ajacoutot Exp $ .\" $NetBSD: compat_linux.8,v 1.2 1995/10/16 20:17:59 fvdl Exp $ .\" .\" Copyright (c) 1995 Frank van der Linden @@ -383,7 +383,7 @@ Only the DSP device is emulated, the following link should be created: .Ss Other links Linux binaries may require CD-ROM support requires a link to the CD-ROM device, similar to: .Pp -.D1 /emul/linux/dev/cdrom -> /dev/cd0c (first CD-ROM) +.D1 /emul/linux/dev/cdrom -> /dev/cd0a (first CD-ROM) .Ss File systems Many Linux binaries expect .Pa /proc diff --git a/usr.bin/sudo/sudoers.mdoc.in b/usr.bin/sudo/sudoers.mdoc.in index d9c98a6a8d0..e9189cdcfa5 100644 --- a/usr.bin/sudo/sudoers.mdoc.in +++ b/usr.bin/sudo/sudoers.mdoc.in @@ -2554,7 +2554,7 @@ web pages) or simply to www. .Bd -literal ALL CDROM = NOPASSWD: /sbin/umount /CDROM,\e - /sbin/mount -o nosuid\,nodev /dev/cd0c /CDROM + /sbin/mount -o nosuid\,nodev /dev/cd0a /CDROM .Ed .Pp Any user may mount or unmount a CD-ROM on the machines in the CDROM |