From 892898a6d237df96fdd693bbd1996094cc06c10d Mon Sep 17 00:00:00 2001
From: ZeTriUm <zetrium@free3deng.ru>
Date: Fri, 15 Dec 2017 19:05:28 +0400
Subject: [PATCH 1/2] Add support for Calculate Linux

---
 mbusb.d/calculate.d/desktop-generic64.cfg | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 mbusb.d/calculate.d/desktop-generic64.cfg

diff --git a/mbusb.d/calculate.d/desktop-generic64.cfg b/mbusb.d/calculate.d/desktop-generic64.cfg
new file mode 100644
index 00000000..e7c37c8e
--- /dev/null
+++ b/mbusb.d/calculate.d/desktop-generic64.cfg
@@ -0,0 +1,20 @@
+for isofile in $isopath/cld-*-x86_64.iso; do
+  if [ -e "$isofile" ]; then
+    regexp --set=isoname "$isopath/(.*)" "$isofile"
+    submenu "$isoname ->" "$isofile" {
+      iso_path="$2"
+      loopback loop "$iso_path"
+      probe --label --set=cd_label (loop)
+      menuentry "Calculate Linux Desktop Live x86_64" {
+        bootoptions="isoboot=$iso_path root=live:LABEL=$cd_label vga=current init=/linuxrc rd.live.squashimg=livecd.squashfs nodevfs quiet noresume splash=silent,theme:calculate console=tty1"
+        linux (loop)/boot/vmlinuz $bootoptions
+        initrd (loop)/boot/initrd
+      }
+      menuentry "Memory testing utility - memtest86+" {
+        bootoptions=""
+        linux16 (loop)/isolinux/memtest $bootoptions
+      }
+    }
+  fi
+done
+

From 6f55e8c7c9cce69aeefdb2761b9614c95e95671f Mon Sep 17 00:00:00 2001
From: ZeTriUm <zetrium@free3deng.ru>
Date: Fri, 15 Dec 2017 19:54:23 +0400
Subject: [PATCH 2/2] Fix iso scan

---
 mbusb.d/calculate.d/desktop-generic64.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mbusb.d/calculate.d/desktop-generic64.cfg b/mbusb.d/calculate.d/desktop-generic64.cfg
index e7c37c8e..3e02ce63 100644
--- a/mbusb.d/calculate.d/desktop-generic64.cfg
+++ b/mbusb.d/calculate.d/desktop-generic64.cfg
@@ -6,7 +6,7 @@ for isofile in $isopath/cld-*-x86_64.iso; do
       loopback loop "$iso_path"
       probe --label --set=cd_label (loop)
       menuentry "Calculate Linux Desktop Live x86_64" {
-        bootoptions="isoboot=$iso_path root=live:LABEL=$cd_label vga=current init=/linuxrc rd.live.squashimg=livecd.squashfs nodevfs quiet noresume splash=silent,theme:calculate console=tty1"
+        bootoptions="iso-scan/filename=$iso_path root=live:LABEL=$cd_label vga=current init=/linuxrc rd.live.squashimg=livecd.squashfs nodevfs quiet noresume splash=silent,theme:calculate console=tty1"
         linux (loop)/boot/vmlinuz $bootoptions
         initrd (loop)/boot/initrd
       }