Module Name: othersrc
Committed By: pooka
Date: Thu Dec 3 15:00:38 UTC 2009
Modified Files:
othersrc/lib/libfsu_mount: Makefile fsu_mount.c
Log Message:
Make compile with new ukfs_part interfaces (doesn't use them, though).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/lib/libfsu_mount/Makefile
cvs rdiff -u -r1.12 -r1.13 othersrc/lib/libfsu_mount/fsu_mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/lib/libfsu_mount/Makefile
diff -u othersrc/lib/libfsu_mount/Makefile:1.7 othersrc/lib/libfsu_mount/Makefile:1.8
--- othersrc/lib/libfsu_mount/Makefile:1.7 Thu Nov 5 14:02:42 2009
+++ othersrc/lib/libfsu_mount/Makefile Thu Dec 3 15:00:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/11/05 14:02:42 stacktic Exp $
+# $NetBSD: Makefile,v 1.8 2009/12/03 15:00:38 pooka Exp $
#
.include "../Makefile.inc"
@@ -21,7 +21,7 @@
OSNAME!= uname -s
.if ${OSNAME} == "NetBSD"
-UKFS_DISKLABEL!= nm /usr/lib/libukfs.so | grep ukfs_partition_probe
+UKFS_DISKLABEL!= nm /usr/lib/libukfs.so | grep ukfs_part_probe
.if ${UKFS_DISKLABEL} != ""
CFLAGS+= -DHAVE_UKFS_DISKLABEL
.endif
Index: othersrc/lib/libfsu_mount/fsu_mount.c
diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.12 othersrc/lib/libfsu_mount/fsu_mount.c:1.13
--- othersrc/lib/libfsu_mount/fsu_mount.c:1.12 Fri Nov 6 11:28:31 2009
+++ othersrc/lib/libfsu_mount/fsu_mount.c Thu Dec 3 15:00:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_mount.c,v 1.12 2009/11/06 11:28:31 stacktic Exp $ */
+/* $NetBSD: fsu_mount.c,v 1.13 2009/12/03 15:00:38 pooka Exp $ */
/*
* Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved.
@@ -437,7 +437,7 @@
{
struct ukfs *ukfs;
fsu_fs_t *fs;
- int part, rv;
+ int rv;
ukfs = NULL;
fs = mntd.mntd_fs;
@@ -447,11 +447,10 @@
if (rv == 0) {
#ifdef HAVE_UKFS_DISKLABEL
if (fsu_blockfs) {
- part = UKFS_PARTITION_NONE;
- ukfs_partition_probe(mntd.mntd_canon_dev, &part);
ukfs = ukfs_mount_disk(fs->fs_name,
- mntd.mntd_canon_dev, part, mntd.mntd_canon_dir,
- mntd.mntd_flags, fs->fs_args, fs->fs_args_size);
+ mntd.mntd_canon_dev, ukfs_part_none,
+ mntd.mntd_canon_dir, mntd.mntd_flags,
+ fs->fs_args, fs->fs_args_size);
} else
#endif
ukfs = ukfs_mount(fs->fs_name,
