Date: Wed, 10 Oct 2001 16:22:03 -0400 From: The Anarcat <anarcat@anarcat.dyndns.org> To: Alexander Langer <alex@usw4.freebsd.org> Cc: libh@FreeBSD.org Subject: Re: cvs commit: libh/release/floppies Makefile.inc Message-ID: <20011010162202.D1233@shall.anarcat.dyndns.org> In-Reply-To: <200110101956.f9AJuw334989@usw4.freebsd.org> References: <200110101956.f9AJuw334989@usw4.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Hf61M2y+wYpnELGG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
This breaks floppy creation on -stable. :)
We should rather use a configurable MDCONFIG macro.
Also note that there is still a vnconfig call in there, so the
transition is not complete:
vnconfig -s labels -c ${MFS_VNODE} ${MFS_NAME}
I think we could simply s/vnconfig/${MDCONFIG}/ here too.
Here is a patch to fix the md/vn thing (OSVERSION stolen from
bsd.port.mk). This does not fix the remaining vnconfig as I cannot test
this here (no -current!).
Index: Makefile.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/libh/cvs/libh/release/floppies/Makefile.inc,v
retrieving revision 1.2
diff -u -r1.2 Makefile.inc
--- Makefile.inc 2001/10/10 19:56:58 1.2
+++ Makefile.inc 2001/10/10 20:17:59
@@ -14,6 +14,21 @@
KERN_MP =3D kmnt
BOOT_MP =3D bmnt
=20
+# Get __FreeBSD_version
+.if !defined(OSVERSION)
+.if exists(/sbin/sysctl)
+OSVERSION!=3D /sbin/sysctl -n kern.osreldate
+.else
+OSVERSION!=3D /usr/sbin/sysctl -n kern.osreldate
+.endif
+.endif
+
+.if ${OSVERSION} < 500000
+MDCONFIG ?=3D vnconfig
+.else
+MDCONFIG ?=3D mdconfig
+.endif
+
# Information about mfs parameters
# Size of mfs in kilobytes
MFS_SIZE =3D 4500
@@ -48,31 +63,31 @@
=20
vnconfig-mfs:
@cd ${.CURDIR} && ${MAKE} vnunconfig-mfs 2>/dev/null >&2
- mdconfig -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
+ ${MDCONFIG} -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
vnconfig-mfsfl:
@cd ${.CURDIR} && ${MAKE} vnunconfig-mfsfl 2>/dev/null >&2
- mdconfig -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
+ ${MDCONFIG} -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
vnconfig-kern:
@cd ${.CURDIR} && ${MAKE} vnunconfig-kern 2>/dev/null >&2
- mdconfig -a -t vnode -u ${KERN_VNODE} ${KERN_NAME}
+ ${MDCONFIG} -a -t vnode -u ${KERN_VNODE} ${KERN_NAME}
=20
vnconfig-boot:
@cd ${.CURDIR} && ${MAKE} vnunconfig-boot 2>/dev/null >&2
vnconfig -s labels -c ${MFS_VNODE} ${MFS_NAME}
- mdconfig -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
+ ${MDCONFIG} -a -t vnode -u ${MFS_VNODE} ${MFS_NAME}
=20
vnunconfig-mfs:
@cd ${.CURDIR} && ${MAKE} umount-mfs 2>/dev/null >&2
- @-mdconfig -d -u ${MFS_VNODE} 2>/dev/null
+ @-${MDCONFIG} -d -u ${MFS_VNODE} 2>/dev/null
vnunconfig-mfsfl:
@cd ${.CURDIR} && ${MAKE} umount-mfsfl 2>/dev/null >&2
- @-mdconfig -d -u ${MFSFL_VNODE} 2>/dev/null
+ @-${MDCONFIG} -d -u ${MFSFL_VNODE} 2>/dev/null
vnunconfig-kern:
@cd ${.CURDIR} && ${MAKE} umount-kern 2>/dev/null >&2
- @-mdconfig -d -u ${KERN_VNODE} 2>/dev/null
+ @-${MDCONFIG} -d -u ${KERN_VNODE} 2>/dev/null
vnunconfig-boot:
@cd ${.CURDIR} && ${MAKE} umount-boot 2>/dev/null >&2
- @-mdconfig -d -u ${BOOT_VNODE} 2>/dev/null
+ @-${MDCONFIG} -d -u ${BOOT_VNODE} 2>/dev/null
=20
mount-mfs: ${MFS_MP}
@cd ${.CURDIR} && ${MAKE} vnconfig-mfs
On Wed Oct 10, 2001 at 02:56:58PM -0500, Alexander Langer wrote:
> alex 2001/10/10 14:56:58 CDT
>=20
> Modified files:
> release/floppies Makefile.inc=20
> Log:
> Switch to use md, not vn.
--Hf61M2y+wYpnELGG
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iEYEARECAAYFAjvEreoACgkQttcWHAnWiGfG/QCfS7s1EP4XHuCAfgRX0rvPVf3e
Y9sAniRzowq6583JFml00qDHLRS+IUkZ
=hxVq
-----END PGP SIGNATURE-----
--Hf61M2y+wYpnELGG--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-libh" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011010162202.D1233>