From owner-svn-src-user@freebsd.org Tue Oct 13 17:09:09 2015 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B217A12EBA for ; Tue, 13 Oct 2015 17:09:09 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C10C3177A; Tue, 13 Oct 2015 17:09:08 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9DH97tZ094124; Tue, 13 Oct 2015 17:09:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9DH97id094122; Tue, 13 Oct 2015 17:09:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510131709.t9DH97id094122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 13 Oct 2015 17:09:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289228 - in user/ngie/more-tests2: sbin/mount sys/kern X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2015 17:09:09 -0000 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");