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

Collapse All | Expand All

(-)b/libexec/rc/rc.d/dumpon (+2 lines)
Lines 42-47 dumpon_start() 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 dumpon_start() 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
(-)b/libexec/rc/rc.d/zpool (+1 lines)
Lines 22-27 zpool_start() Link Here
22 

          22
          

        

        

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

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

        

        

          24
          
		if [ -r $cachefile ]; then

          24
          
		if [ -r $cachefile ]; then

        

            

              
              
              25
              
			root_hold_wait

            

        

          25
          
			zpool import -c $cachefile -a -N && break

          26
          
			zpool import -c $cachefile -a -N && break

        

        

          26
          
		fi

          27
          
		fi

        

        

          27
          
	done

          28
          
	done

        






  

  Return to bug 242189