|
 |
764bf3 |
From 1553540346701a501f77e73ba45b24e586013584 Mon Sep 17 00:00:00 2001
|
|
|
764bf3 |
From: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
|
|
764bf3 |
Date: Thu, 13 Jul 2017 14:18:08 +0530
|
|
|
764bf3 |
Subject: [PATCH] Do not show modified time with -notime option
|
|
|
764bf3 |
|
|
|
764bf3 |
Exclude volatile attributes (timestamps) from lshw -notime output.
|
|
|
764bf3 |
|
|
|
764bf3 |
Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
|
|
|
764bf3 |
[Updated description and fixed detect_hfsx() - Vasant]
|
|
|
764bf3 |
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
764bf3 |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
764bf3 |
---
|
|
|
764bf3 |
src/core/volumes.cc | 6 ++++--
|
|
|
764bf3 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
764bf3 |
|
|
|
764bf3 |
diff --git a/src/core/volumes.cc b/src/core/volumes.cc
|
|
|
764bf3 |
index 07a253bddbf1..456809a37ae2 100644
|
|
|
764bf3 |
--- a/src/core/volumes.cc
|
|
|
764bf3 |
+++ b/src/core/volumes.cc
|
|
|
764bf3 |
@@ -651,8 +651,10 @@ static bool detect_hfsx(hwNode & n, source & s)
|
|
|
764bf3 |
wtime = (time_t)(be_long(&vol->modifyDate) - HFSTIMEOFFSET);
|
|
|
764bf3 |
n.setConfig("created", datetime(mkfstime, false)); // creation time uses local time
|
|
|
764bf3 |
if (enabled("output:time"))
|
|
|
764bf3 |
+ {
|
|
|
764bf3 |
n.setConfig("checked", datetime(fscktime));
|
|
|
764bf3 |
- n.setConfig("modified", datetime(wtime));
|
|
|
764bf3 |
+ n.setConfig("modified", datetime(wtime));
|
|
|
764bf3 |
+ }
|
|
|
764bf3 |
|
|
|
764bf3 |
return true;
|
|
|
764bf3 |
}
|
|
|
764bf3 |
@@ -742,7 +744,7 @@ static bool detect_hfs(hwNode & n, source & s)
|
|
|
764bf3 |
n.setConfig("created", datetime(mkfstime - HFSTIMEOFFSET, false)); // all dates use local time
|
|
|
764bf3 |
if(dumptime)
|
|
|
764bf3 |
n.setConfig("backup", datetime(dumptime - HFSTIMEOFFSET, false));
|
|
|
764bf3 |
- if(wtime)
|
|
|
764bf3 |
+ if(wtime && enabled("output:time"))
|
|
|
764bf3 |
n.setConfig("modified", datetime(wtime - HFSTIMEOFFSET, false));
|
|
|
764bf3 |
|
|
|
764bf3 |
return true;
|
|
|
764bf3 |
--
|
|
|
764bf3 |
2.17.1
|
|
|
764bf3 |
|