Module Name: src
Committed By: pooka
Date: Tue Jan 12 18:43:38 UTC 2010
Modified Files:
src/usr.sbin/puffs/mount_psshfs: psshfs.c
src/usr.sbin/puffs/rump_ext2fs: rump_ext2fs.c
src/usr.sbin/puffs/rump_ffs: rump_ffs.c
src/usr.sbin/puffs/rump_lfs: rump_lfs.c
src/usr.sbin/puffs/rump_msdos: rump_msdos.c
src/usr.sbin/puffs/rump_nfs: rump_nfs.c
src/usr.sbin/puffs/rump_smbfs: rump_smbfs.c
src/usr.sbin/puffs/rump_sysvbfs: rump_sysvbfs.c
src/usr.sbin/puffs/rump_udf: rump_udf.c
Log Message:
Make r/w servers unmount themselves cleanly upon receiving SIGINT/TERM.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/puffs/mount_psshfs/psshfs.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/rump_ffs/rump_ffs.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/puffs/rump_lfs/rump_lfs.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_msdos/rump_msdos.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/puffs/rump_nfs/rump_nfs.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/puffs/rump_udf/rump_udf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/mount_psshfs/psshfs.c
diff -u src/usr.sbin/puffs/mount_psshfs/psshfs.c:1.58 src/usr.sbin/puffs/mount_psshfs/psshfs.c:1.59
--- src/usr.sbin/puffs/mount_psshfs/psshfs.c:1.58 Thu Jan 7 21:26:49 2010
+++ src/usr.sbin/puffs/mount_psshfs/psshfs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: psshfs.c,v 1.58 2010/01/07 21:26:49 pooka Exp $ */
+/* $NetBSD: psshfs.c,v 1.59 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2006-2009 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: psshfs.c,v 1.58 2010/01/07 21:26:49 pooka Exp $");
+__RCSID("$NetBSD: psshfs.c,v 1.59 2010/01/12 18:43:37 pooka Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -121,6 +121,8 @@
int nargs;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
if (argc < 3)
usage();
Index: src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c
diff -u src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c:1.8 src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c:1.9
--- src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c:1.8 Sun Dec 13 21:16:54 2009
+++ src/usr.sbin/puffs/rump_ext2fs/rump_ext2fs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_ext2fs.c,v 1.8 2009/12/13 21:16:54 pooka Exp $ */
+/* $NetBSD: rump_ext2fs.c,v 1.9 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -50,6 +50,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
mount_ext2fs_parseargs(argc, argv, &args, &mntflags,
Index: src/usr.sbin/puffs/rump_ffs/rump_ffs.c
diff -u src/usr.sbin/puffs/rump_ffs/rump_ffs.c:1.6 src/usr.sbin/puffs/rump_ffs/rump_ffs.c:1.7
--- src/usr.sbin/puffs/rump_ffs/rump_ffs.c:1.6 Sun Dec 13 21:16:54 2009
+++ src/usr.sbin/puffs/rump_ffs/rump_ffs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_ffs.c,v 1.6 2009/12/13 21:16:54 pooka Exp $ */
+/* $NetBSD: rump_ffs.c,v 1.7 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -50,6 +50,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
mount_ffs_parseargs(argc, argv, &args, &mntflags, canon_dev, canon_dir);
Index: src/usr.sbin/puffs/rump_lfs/rump_lfs.c
diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.14 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.15
--- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.14 Sun Dec 13 21:16:54 2009
+++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_lfs.c,v 1.14 2009/12/13 21:16:54 pooka Exp $ */
+/* $NetBSD: rump_lfs.c,v 1.15 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -32,6 +32,7 @@
#include <err.h>
#include <pthread.h>
+#include <puffs.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -69,6 +70,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
if (part != ukfs_part_none) {
Index: src/usr.sbin/puffs/rump_msdos/rump_msdos.c
diff -u src/usr.sbin/puffs/rump_msdos/rump_msdos.c:1.7 src/usr.sbin/puffs/rump_msdos/rump_msdos.c:1.8
--- src/usr.sbin/puffs/rump_msdos/rump_msdos.c:1.7 Sun Dec 13 21:16:55 2009
+++ src/usr.sbin/puffs/rump_msdos/rump_msdos.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_msdos.c,v 1.7 2009/12/13 21:16:55 pooka Exp $ */
+/* $NetBSD: rump_msdos.c,v 1.8 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -50,6 +50,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
mount_msdos_parseargs(argc, argv, &args, &mntflags,
Index: src/usr.sbin/puffs/rump_nfs/rump_nfs.c
diff -u src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.9 src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.10
--- src/usr.sbin/puffs/rump_nfs/rump_nfs.c:1.9 Sun Oct 18 16:02:15 2009
+++ src/usr.sbin/puffs/rump_nfs/rump_nfs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_nfs.c,v 1.9 2009/10/18 16:02:15 pooka Exp $ */
+/* $NetBSD: rump_nfs.c,v 1.10 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -48,6 +48,9 @@
int rv, mntflags;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
+
mount_nfs_parseargs(argc, argv, &args, &mntflags, canon_dev, canon_dir);
rv = p2k_run_fs(MOUNT_NFS, canon_dev, canon_dir, mntflags, &args,
Index: src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c
diff -u src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.5 src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.6
--- src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c:1.5 Tue Oct 20 02:14:12 2009
+++ src/usr.sbin/puffs/rump_smbfs/rump_smbfs.c Tue Jan 12 18:43:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_smbfs.c,v 1.5 2009/10/20 02:14:12 pooka Exp $ */
+/* $NetBSD: rump_smbfs.c,v 1.6 2010/01/12 18:43:37 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -59,6 +59,8 @@
int mntflags;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
p2m = p2k_init(PUFFS_KFLAG_WTCACHE);
atexit(pcancel);
Index: src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c
diff -u src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c:1.4 src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c:1.5
--- src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c:1.4 Sun Dec 13 21:16:55 2009
+++ src/usr.sbin/puffs/rump_sysvbfs/rump_sysvbfs.c Tue Jan 12 18:43:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_sysvbfs.c,v 1.4 2009/12/13 21:16:55 pooka Exp $ */
+/* $NetBSD: rump_sysvbfs.c,v 1.5 2010/01/12 18:43:38 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -32,6 +32,7 @@
#include <rump/ukfs.h>
#include <err.h>
+#include <puffs.h>
#include <stdlib.h>
#include <string.h>
@@ -47,6 +48,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
mount_sysvbfs_parseargs(argc, argv, &args, &mntflags,
Index: src/usr.sbin/puffs/rump_udf/rump_udf.c
diff -u src/usr.sbin/puffs/rump_udf/rump_udf.c:1.6 src/usr.sbin/puffs/rump_udf/rump_udf.c:1.7
--- src/usr.sbin/puffs/rump_udf/rump_udf.c:1.6 Sun Dec 13 21:16:55 2009
+++ src/usr.sbin/puffs/rump_udf/rump_udf.c Tue Jan 12 18:43:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_udf.c,v 1.6 2009/12/13 21:16:55 pooka Exp $ */
+/* $NetBSD: rump_udf.c,v 1.7 2010/01/12 18:43:38 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -50,6 +50,8 @@
int rv;
setprogname(argv[0]);
+ puffs_unmountonsignal(SIGINT, true);
+ puffs_unmountonsignal(SIGTERM, true);
UKFS_DEVICE_ARGVPROBE(&part);
mount_udf_parseargs(argc, argv, &args, &mntflags, canon_dev, canon_dir);
