diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-10-17 08:51:10 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-10-17 08:51:10 +0000 |
| commit | 3f18b7fa1262ecd3a8e5ca8a1f5569d2115e8c42 (patch) | |
| tree | d860ce607e0631615580c446a01d2d2c4528510e | |
| parent | b3af24b4ff6df484d17808b4e915a2708841f1f9 (diff) | |
Notes
| -rw-r--r-- | sbin/mount/mount.conf.8 | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_mountroot.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/mount/mount.conf.8 b/sbin/mount/mount.conf.8 index 45b8257ebae9..48af514dff64 100644 --- a/sbin/mount/mount.conf.8 +++ b/sbin/mount/mount.conf.8 @@ -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 the root file system 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 kernel will panic. .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 diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index 73ed5b652b2e..aecddbda2a63 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -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"); |