|
 |
ab36df |
From 685ec9cefc3c745ad1b342ba790d915adf99946a Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
ab36df |
Date: Tue, 26 Aug 2014 17:31:21 +0200
|
|
|
ab36df |
Subject: [PATCH] LVM: support negative numbers
|
|
|
ab36df |
|
|
|
ab36df |
Use Rx.relinteger instead of Rx.integer so negative numbers as values
|
|
|
ab36df |
can be read.
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit ae8da966f6d29fb3977e6004a98a25774928c946)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
AUTHORS
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
|
|
|
ab36df |
LVM: handle also /etc/lvm/lvm.conf
|
|
|
ab36df |
|
|
|
ab36df |
The syntax should be the same, so use the lvm lens also for the main
|
|
|
ab36df |
lvm2 configuration file.
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 6b15f76f731df1022d1ca8ceec0bced683bccf88)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
---
|
|
|
ab36df |
AUTHORS | 1 +
|
|
|
ab36df |
lenses/lvm.aug | 3 ++-
|
|
|
ab36df |
lenses/tests/test_lvm.aug | 4 ++++
|
|
|
ab36df |
3 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/AUTHORS b/AUTHORS
|
|
|
ab36df |
index 514ad45..36e045e 100644
|
|
|
ab36df |
--- a/AUTHORS
|
|
|
ab36df |
+++ b/AUTHORS
|
|
|
ab36df |
@@ -93,3 +93,4 @@ Contributions by:
|
|
|
ab36df |
Brian Harrington <bharrington@redhat.com>
|
|
|
ab36df |
Mathieu Alorent <malorent@kumy.net>
|
|
|
ab36df |
Rob Tucker <rtucker@mozilla.com>
|
|
|
ab36df |
+ Pino Toscano <ptoscano@redhat.com>
|
|
|
ab36df |
diff --git a/lenses/lvm.aug b/lenses/lvm.aug
|
|
|
ab36df |
index 1636e9e..40cdc6a 100644
|
|
|
ab36df |
--- a/lenses/lvm.aug
|
|
|
ab36df |
+++ b/lenses/lvm.aug
|
|
|
ab36df |
@@ -26,7 +26,7 @@ module LVM =
|
|
|
ab36df |
(* strings can contain backslash-escaped dquotes, but I don't know
|
|
|
ab36df |
* how to get the message across to augeas *)
|
|
|
ab36df |
let str = [label "str". Quote.do_dquote (store /([^\"]|\\\\.)*/)]
|
|
|
ab36df |
- let int = [label "int". store Rx.integer]
|
|
|
ab36df |
+ let int = [label "int". store Rx.relinteger]
|
|
|
ab36df |
(* View: flat_literal
|
|
|
ab36df |
* A literal without structure *)
|
|
|
ab36df |
let flat_literal = int|str
|
|
|
ab36df |
@@ -69,6 +69,7 @@ module LVM =
|
|
|
ab36df |
let filter =
|
|
|
ab36df |
incl "/etc/lvm/archive/*.vg"
|
|
|
ab36df |
. incl "/etc/lvm/backup/*"
|
|
|
ab36df |
+ . incl "/etc/lvm/lvm.conf"
|
|
|
ab36df |
. Util.stdexcl
|
|
|
ab36df |
|
|
|
ab36df |
let xfm = transform lns filter
|
|
|
ab36df |
diff --git a/lenses/tests/test_lvm.aug b/lenses/tests/test_lvm.aug
|
|
|
ab36df |
index 869fbfc..8ee2377 100644
|
|
|
ab36df |
--- a/lenses/tests/test_lvm.aug
|
|
|
ab36df |
+++ b/lenses/tests/test_lvm.aug
|
|
|
ab36df |
@@ -24,6 +24,7 @@ VG1 {
|
|
|
ab36df |
extent_size = 8192 # 4 Megabytes
|
|
|
ab36df |
max_lv = 0
|
|
|
ab36df |
max_pv = 0
|
|
|
ab36df |
+ process_priority = -18
|
|
|
ab36df |
|
|
|
ab36df |
physical_volumes {
|
|
|
ab36df |
pv0 {
|
|
|
ab36df |
@@ -150,6 +151,9 @@ test LVM.lns get conf =
|
|
|
ab36df |
{ "max_pv"
|
|
|
ab36df |
{ "int" = "0" }
|
|
|
ab36df |
}
|
|
|
ab36df |
+ { "process_priority"
|
|
|
ab36df |
+ { "int" = "-18" }
|
|
|
ab36df |
+ }
|
|
|
ab36df |
{}
|
|
|
ab36df |
{ "physical_volumes"
|
|
|
ab36df |
{ "dict"
|