From 13b2443d6b7d4e181fc6dac4b112dd43292ead4d Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 2 Aug 2016 10:07:27 +0200
Subject: [PATCH] last cleanups

---
 cdist/conf/type/__filesystem/explorer/lsblk     |  2 +-
 cdist/conf/type/__filesystem/gencode-remote     | 10 +++++-----
 cdist/conf/type/__filesystem/man.rst            | 10 +++++-----
 cdist/conf/type/__filesystem/parameter/required |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cdist/conf/type/__filesystem/explorer/lsblk b/cdist/conf/type/__filesystem/explorer/lsblk
index 87f95e90..a0a87a9d 100644
--- a/cdist/conf/type/__filesystem/explorer/lsblk
+++ b/cdist/conf/type/__filesystem/explorer/lsblk
@@ -20,7 +20,7 @@
 
 os=$("$__explorer/os")
 
-blkdev="$(cat "$__object/parameter/blkdev")"
+blkdev="$(cat "$__object/parameter/device")"
 
 case "$os" in
     centos|fedora|redhat|suse|gentoo)
diff --git a/cdist/conf/type/__filesystem/gencode-remote b/cdist/conf/type/__filesystem/gencode-remote
index feb7098d..66c25ef0 100644
--- a/cdist/conf/type/__filesystem/gencode-remote
+++ b/cdist/conf/type/__filesystem/gencode-remote
@@ -20,7 +20,7 @@
 
 
 fstype="$(cat "$__object/parameter/fstype")"
-mydev="$(cat "$__object/parameter/blkdev")"
+mydev="$(cat "$__object/parameter/device")"
 
 label="$(cat "$__object/parameter/label")"
 mkfsoptions="$(cat "$__object/parameter/mkfsoptions")"
@@ -35,10 +35,10 @@ fi
 
 
 
-blkdev_devname="$(grep -P -o2 'NAME="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_fstype="$(grep -P -o2 'FSTYPE="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_label="$(grep -P -o2 'LABEL="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_mountpoint="$(grep -P -o2 'MOUNTPOINT="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_devname="$(grep -P -o 'NAME="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_fstype="$(grep -P -o 'FSTYPE="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_label="$(grep -P -o 'LABEL="\K[^"]*' "$__object/explorer/lsblk")"
+blkdev_mountpoint="$(grep -P -o 'MOUNTPOINT="\K[^"]*' "$__object/explorer/lsblk")"
 
 if [ -z "$blkdev_devname" ]; then
     echo "Specified device $mydev not found on target system" >&2
diff --git a/cdist/conf/type/__filesystem/man.rst b/cdist/conf/type/__filesystem/man.rst
index c4787d53..25c2eeda 100644
--- a/cdist/conf/type/__filesystem/man.rst
+++ b/cdist/conf/type/__filesystem/man.rst
@@ -22,7 +22,7 @@ REQUIRED PARAMETERS
 fstype
     Filesystem type, for example 'ext3', 'btrfs' or 'xfs'
 
-blkdev
+device
     Blockdevice for filesystem,
     On linux, it can be any by lsblk accepted device notation 
     
@@ -51,7 +51,7 @@ force
 
 MESSAGES
 --------
-filesystem <fstype> on <blkdev> : <discoverd device> created
+filesystem <fstype> on <device> : <discoverd device> created
    Filesytem was created on <discoverd device>
 
 
@@ -61,11 +61,11 @@ EXAMPLES
 .. code-block:: sh
 
     # Ensures that device /dev/sdb is formated with xfs 
-    __filesystem dev_sdb --fstype xfs --blkdev /dev/sdb --label Testdisk1
+    __filesystem dev_sdb --fstype xfs --device /dev/sdb --label Testdisk1
     # The same thing with btrfs and disk spezified by pci path to disk 1:0 on vmware
-    __filesystem dev_sdb --fstype btrfs --blkdev /dev/disk/by-path/pci-0000:0b:00.0-scsi-0:0:0:0 --label Testdisk2
+    __filesystem dev_sdb --fstype btrfs --device /dev/disk/by-path/pci-0000:0b:00.0-scsi-0:0:0:0 --label Testdisk2
     # Make sure that a multipath san device has a filesystem ...
-    __filesystem dev_sdb --fstype xfs --blkdev /dev/mapper/360060e80432f560050202f22000023ff --label Testdisk3
+    __filesystem dev_sdb --fstype xfs --device /dev/mapper/360060e80432f560050202f22000023ff --label Testdisk3
 
 
 AUTHORS
diff --git a/cdist/conf/type/__filesystem/parameter/required b/cdist/conf/type/__filesystem/parameter/required
index 33a66684..480e3669 100644
--- a/cdist/conf/type/__filesystem/parameter/required
+++ b/cdist/conf/type/__filesystem/parameter/required
@@ -1,2 +1,2 @@
 fstype
-blkdev
+device