feat: add ability to mark MBR partition bootable

Fixes: siderolabs#3532 Machine install section now has `markMBRBootable` option. Signed-off-by: Artem Chernyshev <artem.0xD2@gmail.com>
Unix4ever · May 26, 2021 · dd73109 · dd73109
1 parent 7235976
commit dd73109
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 5 deletions.
diff --git a/cmd/installer/cmd/root.go b/cmd/installer/cmd/root.go
@@ -44,4 +44,5 @@ func init() {
 	rootCmd.PersistentFlags().BoolVar(&options.Upgrade, "upgrade", false, "Indicates that the install is being performed by an upgrade")
 	rootCmd.PersistentFlags().BoolVar(&options.Force, "force", false, "Indicates that the install should forcefully format the partition")
 	rootCmd.PersistentFlags().BoolVar(&options.Zero, "zero", false, "Indicates that the install should write zeros to the disk before installing")
+	rootCmd.PersistentFlags().BoolVar(&options.MarkMBRBootable, "mbr-bootable", false, "Indicates that the MBR should be marked as bootable")
 }
diff --git a/cmd/installer/pkg/install/install.go b/cmd/installer/pkg/install/install.go
@@ -36,6 +36,7 @@ type Options struct {
 	Upgrade         bool
 	Force           bool
 	Zero            bool
+	MarkMBRBootable bool
 }
 
 // Install installs Talos.

diff --git a/cmd/installer/pkg/install/manifest.go b/cmd/installer/pkg/install/manifest.go
@@ -31,6 +31,7 @@ type Manifest struct {
 	PartitionOptions *runtime.PartitionOptions
 	Devices          map[string]Device
 	Targets          map[string][]*Target
+	MarkMBRBootable  bool
 }
 
 // Device represents device options.
@@ -52,8 +53,9 @@ func NewManifest(label string, sequence runtime.Sequence, bootPartitionFound boo
 	}
 
 	manifest = &Manifest{
-		Devices: map[string]Device{},
-		Targets: map[string][]*Target{},
+		Devices:         map[string]Device{},
+		Targets:         map[string][]*Target{},
+		MarkMBRBootable: opts.MarkMBRBootable,
 	}
 
 	if opts.Board != constants.BoardNone {
@@ -271,7 +273,9 @@ func (m *Manifest) executeOnDevice(device Device, targets []*Target) (err error)
 
 		log.Printf("creating new partition table on %s", device.Device)
 
-		gptOpts := []gpt.Option{}
+		gptOpts := []gpt.Option{
+			gpt.WithMarkMBRBootable(m.MarkMBRBootable),
+		}
 
 		if m.PartitionOptions != nil {
 			gptOpts = append(gptOpts, gpt.WithPartitionEntriesStartLBA(m.PartitionOptions.PartitionsOffset))

diff --git a/go.mod b/go.mod
@@ -3,6 +3,8 @@ module github.com/talos-systems/talos
 go 1.16
 
 replace (
+
+	github.com/talos-systems/go-blockdevice => github.com/Unix4ever/go-blockdevice v0.1.1-0.20210526144506-0573ad3d7b15
 	github.com/talos-systems/talos/pkg/machinery => ./pkg/machinery
 
 	// forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes

diff --git a/go.sum b/go.sum
@@ -110,6 +110,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/Unix4ever/go-blockdevice v0.1.1-0.20210526144506-0573ad3d7b15 h1:NVGypa8rYLAoenbA8r6R8jI4V9mwZ99syfGvm3PjhX4=
+github.com/Unix4ever/go-blockdevice v0.1.1-0.20210526144506-0573ad3d7b15/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/a8m/tree v0.0.0-20210115125333-10a5fd5b637d/go.mod h1:FSdwKX97koS5efgm8WevNf7XS3PqtyFkKDDXrz778cg=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
@@ -1214,8 +1216,6 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/talos-systems/crypto v0.2.1-0.20210427105118-4f80b976b640 h1:dDChkGwqk1jcRO0k63VTgGzt1UrY20UiDS3yNcCLW0k=
 github.com/talos-systems/crypto v0.2.1-0.20210427105118-4f80b976b640/go.mod h1:OXCK52Q0dzm88YRG4VdTBdidkPUtqrCxCyW7bUs4DAw=
-github.com/talos-systems/go-blockdevice v0.2.1-0.20210510233948-1292574643e0 h1:EdawBvWE2v9+oiT6vFfUJB9cSTNWRPwcIamCyHEtthQ=
-github.com/talos-systems/go-blockdevice v0.2.1-0.20210510233948-1292574643e0/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
 github.com/talos-systems/go-cmd v0.0.0-20210216164758-68eb0067e0f0 h1:DI+BjK+fcrLBc70Fi50dZocQcaHosqsuWHrGHKp2NzE=
 github.com/talos-systems/go-cmd v0.0.0-20210216164758-68eb0067e0f0/go.mod h1:kf+rZzTEmlDiYQ6ulslvRONnKLQH8x83TowltGMhO+k=
 github.com/talos-systems/go-debug v0.2.1-0.20210525175311-3d0a6e1bf5e3 h1:beG97JtuU5oIL+ArSOKbJxbfsCfELOQ5VZu4RuSBJHU=

diff --git a/internal/app/machined/internal/install/install.go b/internal/app/machined/internal/install/install.go
@@ -84,6 +84,7 @@ func RunInstallerContainer(disk, platform, ref string, configBytes []byte, reg c
 	upgrade := strconv.FormatBool(options.Upgrade)
 	force := strconv.FormatBool(options.Force)
 	zero := strconv.FormatBool(options.Zero)
+	mbrBootable := strconv.FormatBool(options.MarkMBRBootable)
 
 	args := []string{
 		"/bin/installer",
@@ -94,6 +95,7 @@ func RunInstallerContainer(disk, platform, ref string, configBytes []byte, reg c
 		"--upgrade=" + upgrade,
 		"--force=" + force,
 		"--zero=" + zero,
+		"--mbr-bootable=" + mbrBootable,
 	}
 
 	if c := procfs.ProcCmdline().Get(constants.KernelParamBoard).First(); c != nil {

diff --git a/internal/app/machined/internal/install/options.go b/internal/app/machined/internal/install/options.go
@@ -13,6 +13,7 @@ type Options struct {
 	Force           bool
 	Upgrade         bool
 	Zero            bool
+	MarkMBRBootable bool
 	ExtraKernelArgs []string
 }
 
@@ -87,3 +88,12 @@ func WithExtraKernelArgs(s []string) Option {
 		return nil
 	}
 }
+
+// WithMarkMBRBootable sets MBR partition bootable.
+func WithMarkMBRBootable(b bool) Option {
+	return func(o *Options) error {
+		o.MarkMBRBootable = b
+
+		return nil
+	}
+}
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go
@@ -1630,6 +1630,7 @@ func Install(seq runtime.Sequence, data interface{}) (runtime.TaskExecutionFunc,
 				install.WithForce(true),
 				install.WithZero(r.Config().Machine().Install().Zero()),
 				install.WithExtraKernelArgs(r.Config().Machine().Install().ExtraKernelArgs()),
+				install.WithMarkMBRBootable(r.Config().Machine().Install().MarkMBRBootable()),
 			)
 			if err != nil {
 				return err

diff --git a/pkg/machinery/config/provider.go b/pkg/machinery/config/provider.go
@@ -81,6 +81,7 @@ type Install interface {
 	Disk() (string, error)
 	ExtraKernelArgs() []string
 	Zero() bool
+	MarkMBRBootable() bool
 	WithBootloader() bool
 }
 

diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_provider.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_provider.go
@@ -905,6 +905,11 @@ func (i *InstallConfig) Zero() bool {
 	return i.InstallWipe
 }
 
+// MarkMBRBootable implements the config.Provider interface.
+func (i *InstallConfig) MarkMBRBootable() bool {
+	return i.InstallMarkMBRBootable
+}
+
 // WithBootloader implements the config.Provider interface.
 func (i *InstallConfig) WithBootloader() bool {
 	return i.InstallBootloader

diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_types.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_types.go
@@ -841,6 +841,9 @@ type InstallConfig struct {
 	//     - false
 	//     - no
 	InstallWipe bool `yaml:"wipe"`
+	//   description: |
+	//     Indicates if MBR partition should be marked as bootable (active).
+	InstallMarkMBRBootable bool `yaml:"markMBRBootable,omitempty"`
 }
 
 // InstallDiskSizeMatcher disk size condition parser.