jgaunt/proxmox-backup-arm64
1
0
Fork 0
mirror of https://github.com/wofferl/proxmox-backup-arm64 synced 2025-12-11 13:53:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix duplicated timestamp in kernel version output on dashboard

Browse Source
This commit is contained in:
Wolfgang
2023-12-03 14:44:47 +00:00
parent 3e830636f1
commit 3f62ca3136
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/pbs3/proxmox-backup-dashboard_fix.patch
View File

@@ -1,19 +1,21 @@
diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js
index 72f97c7c..074bd15b 100644 index 72f97c7c..7c623ca6 100644
--- a/www/panel/NodeInfo.js --- a/www/panel/NodeInfo.js
+++ b/www/panel/NodeInfo.js +++ b/www/panel/NodeInfo.js
@@ -151,7 +151,10 @@ Ext.define('PBS.NodeInfoPanel', { @@ -151,8 +151,11 @@ Ext.define('PBS.NodeInfoPanel', {
return data.kversion; return data.kversion;
} }
let kernel = data['current-kernel']; let kernel = data['current-kernel'];
- let buildDate = kernel.version.match(/\((.+)\)\s*$/)[1] ?? 'unknown'; - let buildDate = kernel.version.match(/\((.+)\)\s*$/)[1] ?? 'unknown';
- return `${kernel.sysname} ${kernel.release} (${buildDate})`;
+ let buildDate = kernel.version.match(/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}Z|[MTWFS]+[a-z]{2}.+\d{4}\b)\s*/); + let buildDate = kernel.version.match(/(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}Z|[MTWFS]+[a-z]{2}.+\d{4}\b)\s*/);
+ if (!buildDate) { + if (!buildDate) {
+ buildDate=['unknown']; + buildDate=['unknown'];
+ } + }
return `${kernel.sysname} ${kernel.release} (${buildDate})`; + return `${kernel.sysname} ${kernel.release} (${buildDate[0]})`;
}, },
value: '', value: '',
},
diff --git a/debian/changelog b/debian/changelog diff --git a/debian/changelog b/debian/changelog
index dc4a04cb..862fd783 100644 index dc4a04cb..862fd783 100644
--- a/debian/changelog --- a/debian/changelog