Project

General

Profile

hostgroup_rootpass.patch

Chris Barbour, 05/21/2013 08:59 PM

View differences:

app/models/hostgroup.rb 2013-05-21 17:54:18.000000000 -0700
81 81
  end
82 82

  
83 83
  def diskLayout
84
    ptable.layout
84
    ptable.layout.gsub("\r","")
85 85
  end
86 86

  
87 87
  def classes
......
119 119

  
120 120
  # no need to store anything in the db if the password is our default
121 121
  def root_pass
122
    read_attribute(:root_pass) || nested_root_pw
122
    read_attribute(:root_pass) || nested_root_pw || Setting[:root_pass]
123 123
  end
124 124

  
125 125
  private