additionaly return file system type in ".run.df" agent (bnc#896176)

- 3.1.116
yast · Sep 17, 2014 · ab2f2f6 · ab2f2f6
1 parent 21f8447
commit ab2f2f6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 17 16:04:11 UTC 2014 - lslezak@suse.cz
+
+- additionaly return file system type in ".run.df" agent result,
+  (to use it in the disk usage calculation bnc#896176)
+- 3.1.116
+
 -------------------------------------------------------------------
 Thu Sep  4 12:21:25 UTC 2014 - mvidner@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.115
+Version:        3.1.116
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/scrconf/run_df.scr b/src/scrconf/run_df.scr
@@ -2,7 +2,7 @@
  * File:
  *   run_df.scr
  * Summary:
- *   SCR Agent for reading the result from /bin/df -P
+ *   SCR Agent for reading the result from /bin/df -P -T
  * Access:
  *   read-only
  * Authors:
@@ -33,25 +33,29 @@
  *       "used":"3382", 
  *       "whole":"23300"], 
  *   ])
- * 
- * $Id$
  *
  * Returns a <b>list of maps</b>. Each map (list-entry) corresponds 
  * with one mount.
- * Keys for the maps are: "spec", "whole", "used", "free", "prz", "name", 
+ * Keys for the maps are: "spec", "type", "whole", "used", "free", "prz", "name",
  * "dummy"
  */
 .run.df
 
 `ag_anyagent(
   `Description (
-      (`Run("/bin/df -P 2>/dev/null")),		// real file name
+      // TODO FIXME: remove the header from df output before processing
+      // to get rid of the strange first item in the list (see the example above)
+      // -P = portable POSIX output format
+      // -T = additionaly print the file system type
+      (`Run("/bin/df -P -T 2>/dev/null")),		// real file name
       "\n",			// Comment
       true,			// read-only
       (`List (
 	`Tuple (
 	  `spec (`String("^\t ")),
 	  `Separator ("\t "),
+	  `type (`String("^\t ")),
+	  `Separator ("\t "),
 	  `whole (`String("^\t ")),
 	  `Separator ("\t "),
 	  `used (`String("^\t ")),