D6621.id17052.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6621.id17052.diff
View Options

	Index: etc/rc.d/ldconfig
	===================================================================
	--- etc/rc.d/ldconfig
	+++ etc/rc.d/ldconfig
	@@ -4,7 +4,7 @@
	#

	# PROVIDE: ldconfig
	-# REQUIRE: mountcritremote FILESYSTEMS
	+# REQUIRE: FILESYSTEMS
	# BEFORE: DAEMON

	. /etc/rc.subr
	Index: etc/rc.d/mountcritremote
	===================================================================
	--- etc/rc.d/mountcritremote
	+++ etc/rc.d/mountcritremote
	@@ -35,12 +35,15 @@

	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 @@

	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 @@
	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