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

Collapse All | Expand All

(-)b/usr.sbin/freebsd-update/freebsd-update.8 (+23 lines)
Lines 41-47 Link Here
41 
.Op Fl r Ar newrelease
 41 
.Op Fl r Ar newrelease
42 
.Op Fl s Ar server
 42 
.Op Fl s Ar server
43 
.Op Fl t Ar address
 43 
.Op Fl t Ar address
44 
.Op Fl v Ar verbosity
45 
.Op Fl -debug
46 
.Op Fl -no-stats
44 
.Op Fl -not-running-from-cron
 47 
.Op Fl -not-running-from-cron
48 
.Op Fl -currently-running Ar release
45 
.Cm command ...
 49 
.Cm command ...
46 
.Sh DESCRIPTION
 50 
.Sh DESCRIPTION
47 
The
 51 
The
Lines 104-109 Mail output of Link Here
104 
command, if any, to
 108 
command, if any, to
105 
.Ar address .
 109 
.Ar address .
106 
(default: root, or as given in the configuration file.)
 110 
(default: root, or as given in the configuration file.)
111 
.It Fl v Ar verbosity
112 
Change the amount of output when performing a
113 
.Nm Cm fetch
114 
or a
115 
.Nm Cm upgrade .
116 
Supported levels include: debug, nostats, stats. See
117 
.Fl -debug ,
118 
and
119 
.Fl -no-stats
120 
for more information. (default: stats)
121 
.It Fl -debug
122 
Alias for
123 
.Fl v Ar debug .
124 
Shows informational and warning messages from used utilities
125 
that are normally hidden.
126 
.It Fl -no-stats
127 
Alias for
128 
.Fl v Ar nostats .
129 
Hides progress when fetching files.
107 
.It Fl -not-running-from-cron
 130 
.It Fl -not-running-from-cron
108 
Force
 131 
Force
109 
.Nm Cm fetch
 132 
.Nm Cm fetch
(-)b/usr.sbin/freebsd-update/freebsd-update.conf (+6 lines)
Lines 74-76 MergeChanges /etc/ /boot/device.hints Link Here
74 

          74
          

        

        

          75
          
# When backing up a kernel also back up debug symbol files?

          75
          
# When backing up a kernel also back up debug symbol files?

        

        

          76
          
# BackupKernelSymbolFiles no

          76
          
# BackupKernelSymbolFiles no

        

            

              
              
              77
              

            

            

              78
              
# How much information to output during "freebsd-update fetch"

            

            

              79
              
# or "freebsd-update upgrade". Can be either stats, debug or nostats.

            

            

              80
              
# "nostats" hides progress information that is normally shown by "stats"

            

            

              81
              
# "debug" shows informational messages and warnings that are normally hidden.

            

            

              82
              
# VerbosityLevel stat

            



(-)b/usr.sbin/freebsd-update/freebsd-update.sh
      (-4 / +6 lines)




  

    
      
            Lines 30-39
          
      
      
        Link Here
      
    
  

        

          30
          
# $FreeBSD$

          30
          
# $FreeBSD$

        

        

          31
          

          31
          

        

        

          32
          
#### Usage function -- called from command-line handling code.

          32
          
#### Usage function -- called from command-line handling code.

        

            

              33
              

              
              
            

            

              34
              
# Usage instructions.  Options not listed:

            

            

              35
              
# --debug	-- don't filter output from utilities

            

            

              36
              
# --no-stats	-- don't show progress statistics while fetching files

            

        

          37
          
usage () {

          33
          
usage () {

        

        

          38
          
	cat <<EOF

          34
          
	cat <<EOF

        

        

          39
          
usage: `basename $0` [options] command ... [path]

          35
          
usage: `basename $0` [options] command ... [path]

        

  

    
      
            Lines 52-57
          Options:
      
      
        Link Here
      
    
  

        

          52
          
                  (default: update.FreeBSD.org)

          48
          
                  (default: update.FreeBSD.org)

        

        

          53
          
  -t address   -- Mail output of cron command, if any, to address

          49
          
  -t address   -- Mail output of cron command, if any, to address

        

        

          54
          
                  (default: root)

          50
          
                  (default: root)

        

            

              
              
              51
              
  -v verbosity -- Change the amout of information output during

            

            

              52
              
                  fetch or upgrade commands. Can be set to either

            

            

              53
              
                  debug, nostats, or stats

            

            

              54
              
                  (default: stat)

            

            

              55
              
  --debug      -- Don't filter output from utilities

            

            

              56
              
  --no-stats   -- Don't show progress statistics while fetching files

            

        

          55
          
  --not-running-from-cron

          57
          
  --not-running-from-cron

        

        

          56
          
               -- Run without a tty, for use by automated tools

          58
          
               -- Run without a tty, for use by automated tools

        

        

          57
          
  --currently-running release

          59
          
  --currently-running release

        






  

  Return to bug 185389