From owner-freebsd-stable Thu Feb 11 22:44:22 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA28219 for freebsd-stable-outgoing; Thu, 11 Feb 1999 22:44:22 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) 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 WAA28206 for ; Thu, 11 Feb 1999 22:44:15 -0800 (PST) (envelope-from andre.albsmeier@mchp.siemens.de) X-Envelope-Sender-Is: andre.albsmeier@mchp.siemens.de (at relayer david.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 HAA18412 for ; Fri, 12 Feb 1999 07:44:02 +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 HAA18028 for ; Fri, 12 Feb 1999 07:44:02 +0100 (MET) Received: (from daemon@localhost) by curry.mchp.siemens.de (8.8.8/8.8.8) id HAA19691 for ; Fri, 12 Feb 1999 07:44:03 +0100 (CET) Date: Fri, 12 Feb 1999 07:44:01 +0100 From: Andre Albsmeier To: freebsd-stable@FreeBSD.ORG Subject: amd in 3.1-BETA fails on ufs (Fix included) Message-ID: <19990212074401.A1842@internal> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.95.1i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. The problem has been filed as PR#10044. -Andre --- 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 header file. */ -/* #undef HAVE_UFS_UFS_MOUNT_H */ +#define HAVE_UFS_UFS_MOUNT_H 1 /* Define if you have the 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 exists. */ #ifdef HAVE_UFS_UFS_MOUNT_H -# include +# include #endif /* HAVE_UFS_UFS_MOUNT_H */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message