aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Ivanov <[email protected]>2024-05-03 22:52:56 +0300
committerMarin Ivanov <[email protected]>2024-05-03 22:52:56 +0300
commitd45a5e8d11bcb7cb6942dd73aa3801c4ee5181e6 (patch)
tree75f2dbe6451915f214fc49da2ef2a5723cfa2ad3
parenta29c553d8910d52bab662aac695ec07340ba1cba (diff)
boot: move grub.cfg into src/boot/
-rw-r--r--build.zig2
-rw-r--r--src/boot/grub.cfg (renamed from src/grub.cfg)0
2 files changed, 1 insertions, 1 deletions
diff --git a/build.zig b/build.zig
index a7a9ee2..d246e47 100644
--- a/build.zig
+++ b/build.zig
@@ -49,7 +49,7 @@ pub fn build(b: *Build) !void {
const kernel_path = try fs.path.join(b.allocator, &[_][]const u8{ b.install_path, "bin", kernel.out_filename });
const iso_path = b.fmt("{s}/disk.iso", .{b.exe_dir});
- const iso_cmd_str = &[_][]const u8{ "/bin/sh", "-c", std.mem.concat(b.allocator, u8, &[_][]const u8{ "mkdir -p ", iso_dir, "/boot/grub", " && ", "cp ", kernel_path, " ", iso_dir, "/boot", " && ", "cp src/grub.cfg ", iso_dir, "/boot/grub", " && ", "grub-mkrescue -o ", iso_path, " ", iso_dir }) catch unreachable };
+ const iso_cmd_str = &[_][]const u8{ "/bin/sh", "-c", std.mem.concat(b.allocator, u8, &[_][]const u8{ "mkdir -p ", iso_dir, "/boot/grub", " && ", "cp ", kernel_path, " ", iso_dir, "/boot", " && ", "cp src/boot/grub.cfg ", iso_dir, "/boot/grub", " && ", "grub-mkrescue -o ", iso_path, " ", iso_dir }) catch unreachable };
const iso_cmd = b.addSystemCommand(iso_cmd_str);
iso_cmd.step.dependOn(kernel_step);
diff --git a/src/grub.cfg b/src/boot/grub.cfg
index 2629c03..2629c03 100644
--- a/src/grub.cfg
+++ b/src/boot/grub.cfg