lib/kuzushi.rb in kuzushi-0.0.26 vs lib/kuzushi.rb in kuzushi-0.0.27
- old
+ new
@@ -52,11 +52,11 @@
RestClient.get(url)
end
def load_config_stack(name)
@config_names << name
- @configs << JSON.parse(http_get("#{@base_url}/#{name}"))
+ @configs << JSON.parse(http_get("#{@base_url}/#{name}").body)
if import = @configs.last["import"]
load_config_stack(import)
else
@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
end
@@ -231,10 +231,10 @@
def handle_format(v)
return if v.format == "tmpfs"
task "formatting #{v.device}", :init => true do
label = "-L " + v.label rescue ""
- shell "mkfs.#{v.format} #{label} #{v.device}" unless v.mount && mounted?(v.mount)
+ shell "mkfs.#{v.format} -q #{label} #{v.device}" unless v.mount && mounted?(v.mount)
end
add_package "xfsprogs" if v.format == "xfs"
end
def add_package(p)