[Glibc-bsd-commits] r1357 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2006-03-18 16:32:57 +0000 (Sat, 18 Mar 2006)
New Revision: 1357

Added:
   trunk/freebsd-utils/debian/links
   trunk/freebsd-utils/debian/patches/012_mount_std.diff
Modified:
   trunk/freebsd-utils/debian/install
Log:
Patch mount_std and setup its links/install entries.

Modified: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install	2006-03-18 16:32:06 UTC (rev 1356)
+++ trunk/freebsd-utils/debian/install	2006-03-18 16:32:57 UTC (rev 1357)
@@ -3,6 +3,9 @@
 build-tree/src/sbin/umount/umount	/lib/freebsd
 build-tree/src/sbin/swapon/swapon	/lib/freebsd
 build-tree/src/sbin/sysctl/sysctl	/lib/freebsd
+
+build-tree/src/sbin/mount_std/mount_std		/sbin
+
 scripts/bin/dmesg			/bin
 scripts/bin/mount			/bin
 scripts/bin/sysctl			/bin

Added: trunk/freebsd-utils/debian/links
===================================================================
--- trunk/freebsd-utils/debian/links	2006-03-18 16:32:06 UTC (rev 1356)
+++ trunk/freebsd-utils/debian/links	2006-03-18 16:32:57 UTC (rev 1357)
@@ -0,0 +1,4 @@
+/sbin/mount_std		/sbin/mount_devfs
+/sbin/mount_std		/sbin/mount_fdescfs
+/sbin/mount_std		/sbin/mount_linprocfs
+/sbin/mount_std		/sbin/mount_procfs

Added: trunk/freebsd-utils/debian/patches/012_mount_std.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_mount_std.diff	2006-03-18 16:32:06 UTC (rev 1356)
+++ trunk/freebsd-utils/debian/patches/012_mount_std.diff	2006-03-18 16:32:57 UTC (rev 1357)
@@ -0,0 +1,29 @@
+--- src/sbin/mount_std/mount_std.c~	2006-03-18 17:20:33.000000000 +0100
++++ src/sbin/mount_std/mount_std.c	2006-03-18 17:21:52.000000000 +0100
+@@ -55,6 +55,8 @@
+ #include <sysexits.h>
+ #include <unistd.h>
+ 
++#include <sys/syscall.h>
++
+ #include "mntopts.h"
+ 
+ static struct mntopt mopts[] = {
+@@ -136,7 +138,7 @@
+ 	 * FreeBSD-5.0.
+ 	 */
+ 	signal(SIGSYS, catchsig);
+-	error = nmount(iov, 4, mntflags);
++	error = syscall (SYS_nmount, iov, 4, mntflags);
+ 	signal(SIGSYS, SIG_DFL);
+ 
+ 	/*
+@@ -145,7 +147,7 @@
+ 	 * or the user didn't recompile his kernel.
+ 	 */
+ 	if (error && (errno == EOPNOTSUPP || errno == ENOSYS || caughtsig))
+-		error = mount(fsname, mntpath, mntflags, NULL);
++		error = syscall (SYS_mount, fsname, mntpath, mntflags, NULL);
+ 
+ 	if (error)
+ 		err(EX_OSERR, NULL);