diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-08-15 15:22:20 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-08-15 15:22:20 +1000 |
| commit | bc00292cfe913392081ee6fa5cc0dd9f7501fd2c (patch) | |
| tree | 344d588a4606558b2ca02fd4aa0f29972c7b88b6 | |
| parent | 2c5f1d7cccdd45f80b6fd110673d41e1408b2f27 (diff) | |
| parent | 19713362006c21b719dd8dc01120f3141ad9b578 (diff) | |
| download | samba-bc00292cfe913392081ee6fa5cc0dd9f7501fd2c.tar.gz samba-bc00292cfe913392081ee6fa5cc0dd9f7501fd2c.tar.xz samba-bc00292cfe913392081ee6fa5cc0dd9f7501fd2c.zip | |
Merge remote branch 'martins/60_nfs_regression'
(This used to be ctdb commit 845fb0ba24cf9118470c58fae7103ab8322ce079)
| -rwxr-xr-x | ctdb/config/events.d/60.nfs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs index 2b4c158d68..19a9ea81a1 100755 --- a/ctdb/config/events.d/60.nfs +++ b/ctdb/config/events.d/60.nfs @@ -61,9 +61,9 @@ case "$1" in monitor) # Check that directories for shares actually exist. [ "$CTDB_NFS_SKIP_SHARE_CHECK" = "yes" ] || { - exportfs | grep -v '^#' | grep '^/' | - sed -e 's/[[:space:]]\+[^[:space:]]*$//' | - ctdb_check_directories + exportfs -v | grep '^/' | + sed -r -e 's@[[:space:]]+[^[:space:]()]+\([^[:space:]()]+\)$@@' | + ctdb_check_directories } || exit $? update_tickles 2049 |