summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-12 00:47:30 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-12 00:53:10 +0100
commit747d645b84225e0f80372d8e100ab2d1f43d118c (patch)
treeaca36cae6107f55975e789850144abcf425582eb
parentShiori require nginx if applicable. (diff)
downloadwebdav_server-747d645b84225e0f80372d8e100ab2d1f43d118c.tar.gz
webdav_server-747d645b84225e0f80372d8e100ab2d1f43d118c.tar.xz
Fix blkid fact.
-rw-r--r--modules/syslinux/lib/facter/blkid.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/syslinux/lib/facter/blkid.rb b/modules/syslinux/lib/facter/blkid.rb
index 79c6135..0940707 100644
--- a/modules/syslinux/lib/facter/blkid.rb
+++ b/modules/syslinux/lib/facter/blkid.rb
@@ -3,11 +3,12 @@ Facter.add('blkid') do
lines = Facter::Core::Execution.execute('blkid').split("\n")
out = {}
lines.each do |line|
- a = line.match(/^([^:]*): (.*)/)
+ a = line.match(/^([^:]*):(.*)/)
d = {}
- a[2].split(' ').each do |pair|
- m = pair.match(/(\w*)="(([^"]|\\")*)"/)
+ remaining = a[2]
+ while m = remaining.match(/ (\w*)="([^"]*)"/) do
d[m[1]] = m[2]
+ remaining = m.post_match
end
out[a[1]] = d
end