diff options
| author | ngie <ngie@FreeBSD.org> | 2016-05-30 19:59:51 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-05-30 19:59:51 +0000 |
| commit | 45405908734058e87ee76c408358bd35642b9b60 (patch) | |
| tree | 27b32e2013c28a3b620652a510f1ffbf1376baf0 /etc | |
| parent | 21668b6278a2785ace09689475f3220d02bcfc35 (diff) | |
| download | FreeBSD-src-45405908734058e87ee76c408358bd35642b9b60.zip FreeBSD-src-45405908734058e87ee76c408358bd35642b9b60.tar.gz | |
Fix circular dependency created after r287197 between ldconfig and mountcritremote
ldconfig is already required by mountcritremote indirectly, as noted by rcorder:
> rcorder: Circular dependency on provision `mountcritremote' in file `ldconfig'.
Having mountcritremote REQUIRE ldconfig breaks dependency ordering.
Making the ldconfig hints be conditionally regenerated from mountcritremote when
remote filesystems are mounted is done after this change, similar to cleanvar
being conditionally called after the change.
Differential Revision: https://reviews.freebsd.org/D6621
PR: 202726
Reviewed by: jilles
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/ldconfig | 2 | ||||
| -rwxr-xr-x | etc/rc.d/mountcritremote | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 9ecb172..a657a01 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -4,7 +4,7 @@ # # PROVIDE: ldconfig -# REQUIRE: mountcritremote FILESYSTEMS +# REQUIRE: FILESYSTEMS # BEFORE: DAEMON . /etc/rc.subr diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote index 2af48b6..dede14f 100755 --- a/etc/rc.d/mountcritremote +++ b/etc/rc.d/mountcritremote @@ -35,12 +35,15 @@ mountcritremote_precmd() mountcritremote_start() { + local mounted_remote_filesystem=false + # Mount nfs filesystems. # case "`/sbin/mount -d -a -t nfs`" in '') ;; *) + mounted_remote_filesystem=true echo -n 'Mounting NFS filesystems:' mount -a -t nfs echo '.' @@ -64,6 +67,7 @@ mountcritremote_start() case "`mount -d -a -t ${fstype}`" in *mount_${fstype}*) + mounted_remote_filesystem=true echo -n "Mounting ${fsdecr} filesystems:" mount -a -t ${fstype} echo '.' @@ -71,9 +75,15 @@ mountcritremote_start() esac done - # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar quietreload - rm -f /var/run/clean_var /var/spool/lock/clean_var + if $mounted_remote_filesystem; then + # Cleanup /var again just in case it's a network mount. + /etc/rc.d/cleanvar quietreload + rm -f /var/run/clean_var /var/spool/lock/clean_var + + # Regenerate the ldconfig hints in case there are additional + # library paths on remote file systems + /etc/rc.d/ldconfig quietstart + fi } load_rc_config $name |
