From 601bb289eeb21b44c4be1eb063bf35844e39a5ff Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Mon, 11 Dec 2023 19:04:34 +0000
Subject: [PATCH] rename diskimage to mbrimage

---
 devices/turris-omnia/default.nix                |  2 +-
 modules/outputs/{diskimage.nix => mbrimage.nix} | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename modules/outputs/{diskimage.nix => mbrimage.nix} (87%)

diff --git a/devices/turris-omnia/default.nix b/devices/turris-omnia/default.nix
index cfb4139..395b400 100644
--- a/devices/turris-omnia/default.nix
+++ b/devices/turris-omnia/default.nix
@@ -15,7 +15,7 @@
           imports = [
             ../../modules/arch/arm.nix
             ../modules/outputs/tftpboot.nix
-            ../modules/outputs/diskimage.nix
+            ../modules/outputs/mbrimage.nix
             ../modules/outputs/extlinux.nix
             ../modules/outputs/ext4fs.nix
           ];
diff --git a/modules/outputs/diskimage.nix b/modules/outputs/mbrimage.nix
similarity index 87%
rename from modules/outputs/diskimage.nix
rename to modules/outputs/mbrimage.nix
index a9ee85c..6f7904f 100644
--- a/modules/outputs/diskimage.nix
+++ b/modules/outputs/mbrimage.nix
@@ -10,10 +10,10 @@ let
   phram_address = lib.toHexString (config.hardware.ram.startAddress + 256 * 1024 * 1024);
 in {
   options.system.outputs = {
-    diskimage = mkOption {
+    mbrimage = mkOption {
       type = types.package;
       description = ''
-        diskimage
+        mbrimage
         *********
 
         This creates a disk image file with a partition table containing
@@ -25,10 +25,10 @@ in {
 
   config = {
     system.outputs = {
-      diskimage =
+      mbrimage =
         let
           o = config.system.outputs;
-        in pkgs.runCommand "diskimage" {
+        in pkgs.runCommand "mbrimage" {
           depsBuildBuild = [ pkgs.pkgsBuildBuild.util-linux ];
         } ''
           # leave 4 sectors at start for partition table
@@ -39,10 +39,10 @@ in {
       vmdisk = pkgs.runCommand "vmdisk" {} ''
         mkdir $out
         cd $out
-        ln -s ${o.diskimage} ./diskimage
+        ln -s ${o.mbrimage} ./mbrimage
         cat > run.sh <<EOF
         #!${pkgs.runtimeShell}
-        ${pkgs.pkgsBuildBuild.run-liminix-vm}/bin/run-liminix-vm  --arch ${pkgs.stdenv.hostPlatform.qemuArch} --u-boot ${pkgs.ubootQemuArm}/u-boot.bin --phram-address 0x${phram_address} --disk-image ${o.diskimage} /dev/null /dev/null
+        ${pkgs.pkgsBuildBuild.run-liminix-vm}/bin/run-liminix-vm  --arch ${pkgs.stdenv.hostPlatform.qemuArch} --u-boot ${pkgs.ubootQemuArm}/u-boot.bin --phram-address 0x${phram_address} --disk-image ${o.mbrimage} /dev/null /dev/null
         EOF
         chmod +x run.sh
       '';