Author: ngie
Date: Sat Oct 17 08:51:10 2015
New Revision: 289449
URL: https://svnweb.freebsd.org/changeset/base/289449
Log:
Replace /dev/acd0 with /dev/cd1
atapicd(4) has been removed since r249083, and if a system has more than one
optical drive, it will likely be /dev/cd1
Update mount.conf(8) to reflect the change in behavior
MFC after: never
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sbin/mount/mount.conf.8
head/sys/kern/vfs_mountroot.c
Modified: head/sbin/mount/mount.conf.8
==============================================================================
--- head/sbin/mount/mount.conf.8 Sat Oct 17 08:43:25 2015
(r289448)
+++ head/sbin/mount/mount.conf.8 Sat Oct 17 08:51:10 2015
(r289449)
@@ -26,7 +26,7 @@
.\" $FreeBSD$
.\"
.\"
-.Dd July 7, 2013
+.Dd October 17, 2013
.Dt MOUNT.CONF 8
.Os
.Sh NAME
@@ -154,7 +154,7 @@ will direct the kernel to try mounting t
first as an ISO CD9660 file system on
.Pa /dev/cd0 ,
then if that does not work, as an ISO CD9660 file system on
-.Pa /dev/acd0 ,
+.Pa /dev/cd1 ,
and then if that does not work, as a UFS file system on
.Pa /dev/ada0s1a .
If that does not work, a
@@ -167,7 +167,7 @@ Finally if that does not work, the kerne
.Li .timeout 3
cd9660:/dev/cd0 ro
.Li .timeout 0
-cd9660:/dev/acd0 ro
+cd9660:/dev/cd1 ro
.Li .timeout 3
ufs:/dev/ada0s1a
.Li .ask
Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c Sat Oct 17 08:43:25 2015
(r289448)
+++ head/sys/kern/vfs_mountroot.c Sat Oct 17 08:51:10 2015
(r289449)
@@ -468,9 +468,9 @@ parse_dir_ask(char **conf)
printf("\n");
printf(" eg. ufs:/dev/da0s1a\n");
printf(" zfs:tank\n");
- printf(" cd9660:/dev/acd0 ro\n");
+ printf(" cd9660:/dev/cd0 ro\n");
printf(" (which is equivalent to: ");
- printf("mount -t cd9660 -o ro /dev/acd0 /)\n");
+ printf("mount -t cd9660 -o ro /dev/cd0 /)\n");
printf("\n");
printf(" ? List valid disk boot devices\n");
printf(" . Yield 1 second (for background tasks)\n");
@@ -837,7 +837,7 @@ vfs_mountroot_conf0(struct sbuf *sb)
if (boothowto & RB_CDROM) {
sbuf_printf(sb, "cd9660:/dev/cd0 ro\n");
sbuf_printf(sb, ".timeout 0\n");
- sbuf_printf(sb, "cd9660:/dev/acd0 ro\n");
+ sbuf_printf(sb, "cd9660:/dev/cd1 ro\n");
sbuf_printf(sb, ".timeout %d\n", root_mount_timeout);
}
s = kern_getenv("vfs.root.mountfrom");
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
