aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-11-04 23:10:53 +0100
committerLudovic Courtès <ludo@gnu.org>2020-11-05 00:07:45 +0100
commit341f67991da4380485676987e24a3fac01403835 (patch)
treefd511dcd658700de6ad7cb972dbbf8f2049be3cb
parentbcf83975a34ae6f45dc90d506e862abe9a7ee0a8 (diff)
downloadguix-341f67991da4380485676987e24a3fac01403835.tar.gz
guix-341f67991da4380485676987e24a3fac01403835.zip
vm: system-qemu-image: Fix type error, remove more actual file systems.
* gnu/system/vm.scm (system-qemu-image)[file-systems-to-keep]: Check whether SOURCE is a string before calling 'string-prefix?'. Remove UUIDs and file system labels as well.
-rw-r--r--gnu/system/vm.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 80a8618729..21d777a3fe 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -641,7 +641,10 @@ of the GNU system as described by OS."
(let ((target (file-system-mount-point fs))
(source (file-system-device fs)))
(or (string=? target "/")
- (string-prefix? "/dev/" source))))
+ (and (string? source)
+ (string-prefix? "/dev/" source))
+ (uuid? source)
+ (file-system-label? source))))
(operating-system-file-systems os)))
(define root-uuid
8'>content/haketilo_apis.js
@@ -48,9 +48,9 @@
async function on_CORS_bypass(event) {
const name = "haketilo_CORS_bypass";
- console.warn("delme event", event.detail);
-
- if (typeof event.detail.id !== "string" ||
+ if (typeof event.detail !== "object" ||
+ event.detail === null ||
+ typeof event.detail.id !== "string" ||
typeof event.detail.data !== "string") {
console.error(`Haketilo: Invalid detail for ${name}:`,
event.detail);