From andre.albsmeier@mchp.siemens.de  Thu Feb 11 22:22:26 1999
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA26696
          for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Feb 1999 22:22:24 -0800 (PST)
          (envelope-from andre.albsmeier@mchp.siemens.de)
Received: from salomon.siemens.de (salomon.siemens.de [139.23.33.13])
	by david.siemens.de (8.9.3/8.9.3) with ESMTP id HAA13168
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Feb 1999 07:22:10 +0100 (MET)
Received: from curry.mchp.siemens.de (curry.mchp.siemens.de [146.180.31.23])
	by salomon.siemens.de (8.9.3/8.9.3) with ESMTP id HAA13374
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Feb 1999 07:22:10 +0100 (MET)
Received: (from daemon@localhost)
	by curry.mchp.siemens.de (8.8.8/8.8.8) id HAA19630
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Feb 1999 07:22:11 +0100 (CET)
Message-Id: <199902120622.HAA01204@internal>
Date: Fri, 12 Feb 1999 07:22:07 +0100 (CET)
From: Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
To: FreeBSD-gnats-submit@freebsd.org
Subject: amd in 3.1-BETA fails on ufs (Fix included)
X-Send-Pr-Version: 3.2

>Number:         10044
>Category:       bin
>Synopsis:       amd in 3.1-BETA fails on ufs (Fix included)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    obrien
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 11 22:30:00 PST 1999
>Closed-Date:    Sat Feb 13 03:05:25 PST 1999
>Last-Modified:  Sat Feb 13 03:05:33 PST 1999
>Originator:     Andre Albsmeier
>Release:        FreeBSD 3.1-BETA i386
>Organization:
>Environment:

FreeBSD 3.1-BETA, I assume -current also


>Description:

amd on 3.1-BETA fails to mount an ufs. This is because ufs_args_t
defaults to u_int if it hasn't been redefined in config.h. However,
this definition has been forgotten. We also have to change the
location from where ufs_mount.h is included.

Below is a patch which corrects this problem. Please review it in
case I have forgotten other things since I am no amd expert :-).
 
I assume the same problem appears in -current but I haven't
looked yet.


>How-To-Repeat:

Try to mount an ufs with amd on 3.1.

>Fix:
	
--- usr.sbin/amd/include/config.h.ORI	Fri Feb 12 06:57:54 1999
+++ usr.sbin/amd/include/config.h	Fri Feb 12 07:06:05 1999
@@ -753,7 +753,7 @@
 /* #undef HAVE_FIELD_UFS_ARGS_T_FLAGS */
 
 /* does ufs_args_t have fspec field? */
-/* #undef HAVE_FIELD_UFS_ARGS_T_FSPEC */
+#define HAVE_FIELD_UFS_ARGS_T_FSPEC 1
 
 /* does efs_args_t have flags field? */
 /* #undef HAVE_FIELD_EFS_ARGS_T_FLAGS */
@@ -1038,7 +1038,7 @@
 /* #undef tmpfs_args_t */
 
 /* Define a type for the ufs_args structure */
-/* #undef ufs_args_t */
+#define ufs_args_t struct ufs_args
 
 /* Define a type for the efs_args structure */
 /* #undef efs_args_t */
@@ -1829,7 +1829,7 @@
 /* #undef HAVE_TMPFS_TMP_H */
 
 /* Define if you have the <ufs/ufs_mount.h> header file.  */
-/* #undef HAVE_UFS_UFS_MOUNT_H */
+#define HAVE_UFS_UFS_MOUNT_H 1
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
--- contrib/amd/include/am_defs.h.ORI	Sun Jan 31 11:44:50 1999
+++ contrib/amd/include/am_defs.h	Fri Feb 12 06:58:47 1999
@@ -1054,7 +1054,7 @@
  * Actions to take if <ufs/ufs_mount.h> exists.
  */
 #ifdef HAVE_UFS_UFS_MOUNT_H
-# include <ufs/ufs_mount.h>
+# include <ufs/ufs/ufsmount.h>
 #endif /* HAVE_UFS_UFS_MOUNT_H */
 
 /*
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->obrien 
Responsible-Changed-By: obrien 
Responsible-Changed-When: Fri Feb 12 15:26:25 PST 1999 
Responsible-Changed-Why:  
State-Changed-From-To: open->closed 
State-Changed-By: obrien 
State-Changed-When: Sat Feb 13 03:05:25 PST 1999 
State-Changed-Why:  
commited 
>Unformatted:
