🚀 go-pugleaf

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 <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 */

 /*

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message