View | Details | Raw Unified | Return to bug 242189 | Differences between
and this patch

Collapse All | Expand All

(-)libexec/rc/rc.d/dumpon (+2 lines)
Lines 42-47 Link Here
42 
	[Nn][Oo] | '')
 42 
	[Nn][Oo] | '')
43 
		;;
 43 
		;;
44 
	[Aa][Uu][Tt][Oo])
 44 
	[Aa][Uu][Tt][Oo])
45 
		root_hold_wait
45 
		dev=$(/bin/kenv -q dumpdev)
 46 
		dev=$(/bin/kenv -q dumpdev)
46 
		if [ -n "${dev}" ] ; then
 47 
		if [ -n "${dev}" ] ; then
47 
			dumpon_try "${dev}"
 48 
			dumpon_try "${dev}"
Lines 56-61 Link Here
56 
		return 1
 57 
		return 1
57 
		;;
 58 
		;;
58 
	*)
 59 
	*)
60 
		root_hold_wait
59 
		dumpon_try "${dumpdev}"
 61 
		dumpon_try "${dumpdev}"
60 
		;;
 62 
		;;
61 
	esac
 63 
	esac
(-)libexec/rc/rc.d/zfs (+1 lines)
Lines 25-30 Link Here
25 

          25
          

        

        

          26
          
zfs_start_main()

          26
          
zfs_start_main()

        

        

          27
          
{

          27
          
{

        

            

              
              
              28
              
	root_hold_wait

            

        

          28
          
	zfs mount -va

          29
          
	zfs mount -va

        

        

          29
          
	zfs share -a

          30
          
	zfs share -a

        

        

          30
          
	if [ ! -r /etc/zfs/exports ]; then

          31
          
	if [ ! -r /etc/zfs/exports ]; then

        



(-)libexec/rc/rc.d/zfsbe
      (+1 lines)




  

    
      
            Lines 68-73
          
      
      
        Link Here
      
    
  

        

          68
          
	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then

          68
          
	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then

        

        

          69
          
		:

          69
          
		:

        

        

          70
          
	else

          70
          
	else

        

            

              
              
              71
              
		root_hold_wait

            

        

          71
          
		mount -p | while read _dev _mp _type _rest; do

          72
          
		mount -p | while read _dev _mp _type _rest; do

        

        

          72
          
			[ $_mp  = "/" ] || continue

          73
          
			[ $_mp  = "/" ] || continue

        

        

          73
          
			if [ $_type = "zfs" ] ; then

          74
          
			if [ $_type = "zfs" ] ; then

        



(-)libexec/rc/rc.d/zpool
      (+1 lines)




  

    
      
            Lines 18-23
          
      
      
        Link Here
      
    
  

        

          18
          

          18
          

        

        

          19
          
zpool_start()

          19
          
zpool_start()

        

        

          20
          
{

          20
          
{

        

            

              
              
              21
              
	root_hold_wait

            

        

          21
          
	local cachefile

          22
          
	local cachefile

        

        

          22
          

          23
          

        

        

          23
          
	for cachefile in /etc/zfs/zpool.cache /boot/zfs/zpool.cache; do

          24
          
	for cachefile in /etc/zfs/zpool.cache /boot/zfs/zpool.cache; do

        






  

  Return to bug 242189