Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/etc/rc.d Enable "/etc/zfs/exports" from "zfs share" in rc.d/...
details: https://anonhg.NetBSD.org/src/rev/5980d3de3277
branches: trunk
changeset: 952740:5980d3de3277
user: hannken <hannken%NetBSD.org@localhost>
date: Tue Feb 16 10:02:42 2021 +0000
description:
Enable "/etc/zfs/exports" from "zfs share" in rc.d/mountd and rc.d/mountall.
diffstat:
etc/rc.d/mountall | 4 +++-
etc/rc.d/mountd | 8 +++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diffs (51 lines):
diff -r ec03275ac979 -r 5980d3de3277 etc/rc.d/mountall
--- a/etc/rc.d/mountall Tue Feb 16 10:01:55 2021 +0000
+++ b/etc/rc.d/mountall Tue Feb 16 10:02:42 2021 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.13 2020/03/01 15:22:55 roy Exp $
+# $NetBSD: mountall,v 1.14 2021/02/16 10:02:42 hannken Exp $
#
# REQUIRE: mountcritremote named ypbind
@@ -20,6 +20,7 @@
# may try and null mount paths on ZFS.
if checkyesno zfs; then
zfs mount -a
+ zfs share -a
fi
# Mount file systems noted in fstab.
@@ -34,6 +35,7 @@
# Unmount ZFS file systems.
if checkyesno zfs; then
+ zfs unshare -a
zfs unmount -a
fi
}
diff -r ec03275ac979 -r 5980d3de3277 etc/rc.d/mountd
--- a/etc/rc.d/mountd Tue Feb 16 10:01:55 2021 +0000
+++ b/etc/rc.d/mountd Tue Feb 16 10:02:42 2021 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountd,v 1.13 2008/11/12 12:35:52 ad Exp $
+# $NetBSD: mountd,v 1.14 2021/02/16 10:02:42 hannken Exp $
#
# PROVIDE: mountd
@@ -19,6 +19,12 @@
{
rm -f /var/db/mountdtab
( umask 022 ; > /var/db/mountdtab )
+ if checkyesno zfs; then
+ if [ ! -r /etc/zfs/exports ]; then
+ touch /etc/zfs/exports
+ fi
+ rc_flags="${rc_flags} /etc/exports /etc/zfs/exports"
+ fi
return 0
}
Home |
Main Index |
Thread Index |
Old Index