From 0c7ba43adfd65f4906f9f668a947736e6f092d42 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 21 Aug 2020 00:58:21 -0500 Subject: hscript: Parted uses 'mac' for APM labels --- hscript/disk.cc | 2 +- tests/spec/simulator_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hscript/disk.cc b/hscript/disk.cc index ae8c92c..c5e1e36 100644 --- a/hscript/disk.cc +++ b/hscript/disk.cc @@ -197,7 +197,7 @@ bool DiskLabel::execute() const { std::string type_str; switch(this->type()) { case APM: - type_str = "apm"; + type_str = "mac"; break; case MBR: type_str = "msdos"; diff --git a/tests/spec/simulator_spec.rb b/tests/spec/simulator_spec.rb index bded726..10580ac 100644 --- a/tests/spec/simulator_spec.rb +++ b/tests/spec/simulator_spec.rb @@ -40,7 +40,7 @@ RSpec.describe 'HorizonScript Simulator', :type => :aruba do it "creates Apple Partition Maps correctly" do use_fixture '0122-disklabel-apm.installfile' run_simulate - expect(last_command_started.stdout).to include("parted -ms /dev/sda mklabel apm") + expect(last_command_started.stdout).to include("parted -ms /dev/sda mklabel mac") end it "creates GUID Partition Tables correctly" do use_fixture '0124-disklabel-gpt.installfile' -- cgit v1.2.3-60-g2f50