From n-kogane@syd.odn.ne.jp  Fri Apr 28 13:43:58 2006
Return-Path: <n-kogane@syd.odn.ne.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D4EF816A405
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 13:43:58 +0000 (UTC)
	(envelope-from n-kogane@syd.odn.ne.jp)
Received: from t-mta1.odn.ne.jp (mfep1.odn.ne.jp [143.90.131.179])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0A1DC43D66
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Apr 2006 13:43:53 +0000 (GMT)
	(envelope-from n-kogane@syd.odn.ne.jp)
Received: from kcesx30.koganemaru.co.jp ([61.201.153.79])
          by t-mta1.odn.ne.jp with ESMTP
          id <20060428134352346.EMUF.3509.t-mta1.odn.ne.jp@mta1.odn.ne.jp>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Fri, 28 Apr 2006 22:43:52 +0900
Received: by kcesx30.koganemaru.co.jp (Postfix, from userid 100)
	id 3BA142841A; Fri, 28 Apr 2006 22:41:35 +0900 (JST)
Message-Id: <20060428134135.3BA142841A@kcesx30.koganemaru.co.jp>
Date: Fri, 28 Apr 2006 22:41:35 +0900 (JST)
From: n-kogane@syd.odn.ne.jp
Reply-To: n-kogane@syd.odn.ne.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: There is no acpi.ko.gz file in boot.flp.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         96466
>Category:       misc
>Synopsis:       There is no acpi.ko.gz file in boot.flp.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 28 13:50:14 GMT 2006
>Closed-Date:    Sat Apr 29 15:25:49 GMT 2006
>Last-Modified:  Sat Apr 29 15:25:49 GMT 2006
>Originator:     Nobuyuki Koganemaru
>Release:        FreeBSD 6.1-RC1 i386
>Organization:
KOGANEMARU Computer Engineering Service Corporation.
>Environment:
System: FreeBSD kcesx21.koganemaru.co.jp 6.1-RC1 FreeBSD 6.1-RC1 #0: Mon Apr 10 16:52:30 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	With the FreeBSD/i386 6.1-RC1 installer of the floppy disk,
	there is no acpi.ko.gz file in boot.flp.

	6.0-RELEASE:
	    # mount /dev/fd0 /mnt
	    # ls -l /mnt
	    total 1178
	    drwxrwxr-x  2 root  operator      512 11  3 18:49 .snap
	    -rw-r--r--  1 root  wheel      145569 11  3 18:49 acpi.ko.gz
	    drwxr-xr-x  3 root  wheel         512 11  3 18:49 boot
	    -rw-r--r--  1 root  wheel       16384 11  3 18:49 kernel.gz.boot
	    -rw-r--r--  1 root  wheel          91 11  3 18:49 kernel.gz.split
	    -rw-r--r--  1 root  wheel     1028798 11  3 18:49 mfsroot.gz

	6.1-RC1:
	    # mount /dev/fd0 /mnt
	    # ls -l /mnt
	    total 1026
	    drwxrwxr-x  2 root  operator      512  4 11 02:16 .snap
	    drwxr-xr-x  3 root  wheel         512  4 11 02:16 boot
	    -rw-r--r--  1 root  wheel       16384  4 11 02:16 kernel.gz.boot
	    -rw-r--r--  1 root  wheel          91  4 11 02:16 kernel.gz.split
	    -rw-r--r--  1 root  wheel     1027269  4 11 02:16 mfsroot.gz

>How-To-Repeat:
	# mount boot.flp 
	mount /dev/fd0 /mnt
	ls -lR /mnt
>Fix:

	I not tested, but perhaps ok.

--- release/Makefile.orig	Sun Apr  9 13:28:24 2006
+++ release/Makefile	Fri Apr 28 07:06:24 2006
@@ -1223,7 +1223,7 @@
 IMAGEDIR=	${RD}/image.${FSIMAGE}
 BOOTDIR=	${RD}/trees/base/boot
 HINTSFILE=	${BOOTDIR}/device.hints
-ACPI_KO=	${BOOTDIR}/kernel/acpi.ko
+ACPI_KO=	${RD}/kernels/GENERIC/acpi.ko
 IMAGEFILE=	${RD}/floppies/${FSIMAGE}.flp
 .if defined(FDSIZE) && ${FDSIZE} == "SMALL"
 FLPSIZE=	${SMALLFLOPPYSIZE}


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: nyan 
State-Changed-When: Sat Apr 29 15:24:26 UTC 2006 
State-Changed-Why:  
Committed to HEAD, RELENG_6 and RELENG_6_1.  Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=96466 
>Unformatted:
