Date: Tue, 13 Oct 2015 17:09:07 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289228 - in user/ngie/more-tests2: sbin/mount sys/kern Message-ID: <201510131709.t9DH97id094122@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Oct 13 17:09:07 2015 New Revision: 289228 URL: https://svnweb.freebsd.org/changeset/base/289228 Log: Replace /dev/acd0 with /dev/cd1 as atapicd(4) has been removed since r249083. Update mount.conf(8) to reflect the change in behavior Modified: user/ngie/more-tests2/sbin/mount/mount.conf.8 user/ngie/more-tests2/sys/kern/vfs_mountroot.c Modified: user/ngie/more-tests2/sbin/mount/mount.conf.8 ============================================================================== --- user/ngie/more-tests2/sbin/mount/mount.conf.8 Tue Oct 13 17:06:41 2015 (r289227) +++ user/ngie/more-tests2/sbin/mount/mount.conf.8 Tue Oct 13 17:09:07 2015 (r289228) @@ -26,7 +26,7 @@ .\" $FreeBSD$ .\" .\" -.Dd July 7, 2013 +.Dd October 13, 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: user/ngie/more-tests2/sys/kern/vfs_mountroot.c ============================================================================== --- user/ngie/more-tests2/sys/kern/vfs_mountroot.c Tue Oct 13 17:06:41 2015 (r289227) +++ user/ngie/more-tests2/sys/kern/vfs_mountroot.c Tue Oct 13 17:09:07 2015 (r289228) @@ -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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510131709.t9DH97id094122>