Add a eject-cd flag for install (#156)

cmd/install.go

@@ -89,5 +89,6 @@ func init() {
 	installCmd.Flags().BoolP("force-gpt", "", false, "Forces a GPT partition table")
 	installCmd.Flags().BoolP("tty", "", false, "Add named tty to grub")
 	installCmd.Flags().BoolP("force", "", false, "Force install")
+	installCmd.Flags().BoolP("eject-cd", "", false, "Try to eject the cd on reboot, only valid if booting from iso")
 	addSharedInstallUpgradeFlags(installCmd)
 }

pkg/action/action_test.go

@@ -354,6 +354,7 @@ var _ = Describe("Actions", func() {
 	Describe("Install Action", Label("install"), func() {
 		var device, cmdFail string
 		var err error
+		var cmdline func() ([]byte, error)
 
 		BeforeEach(func() {
 			device = "/some/device"
@@ -395,6 +396,11 @@ var _ = Describe("Actions", func() {
         {"label": "COS_PERSISTENT", "type": "part", "path": "/some/device4"}
     ]
 }`), nil
+				case "cat":
+					if args[0] == "/proc/cmdline" {
+						return cmdline()
+					}
+					return []byte{}, nil
 				default:
 					return []byte{}, nil
 				}
@@ -411,6 +417,11 @@ var _ = Describe("Actions", func() {
 			Expect(err).To(BeNil())
 			_, err = fs.Create(grubCfg)
 			Expect(err).To(BeNil())
+
+			// Set default cmdline function so we dont panic :o
+			cmdline = func() ([]byte, error) {
+				return []byte{}, nil
+			}
 		})
 
 		It("Successfully installs", func() {
@@ -420,6 +431,35 @@ var _ = Describe("Actions", func() {
 			Expect(runner.IncludesCmds([][]string{{"reboot", "-f"}}))
 		})
 
+		It("Sets the executable /run/cos/ejectcd so systemd can eject the cd on restart", func() {
+			_ = utils.MkdirAll(fs, "/usr/lib/systemd/system-shutdown", constants.DirPerm)
+			_, err := fs.Stat("/usr/lib/systemd/system-shutdown/eject")
+			Expect(err).To(HaveOccurred())
+			// Override cmdline to return like we are booting from cd
+			cmdline = func() ([]byte, error) {
+				return []byte("cdroot"), nil
+			}
+			config.Target = device
+			config.EjectCD = true
+			Expect(action.InstallRun(config)).To(BeNil())
+			_, err = fs.Stat("/usr/lib/systemd/system-shutdown/eject")
+			Expect(err).ToNot(HaveOccurred())
+			file, err := fs.ReadFile("/usr/lib/systemd/system-shutdown/eject")
+			Expect(err).ToNot(HaveOccurred())
+			Expect(file).To(ContainSubstring(constants.EjectScript))
+		})
+
+		It("ejectcd does nothing if we are not booting from cd", func() {
+			_ = utils.MkdirAll(fs, "/usr/lib/systemd/system-shutdown", constants.DirPerm)
+			_, err := fs.Stat("/usr/lib/systemd/system-shutdown/eject")
+			Expect(err).To(HaveOccurred())
+			config.Target = device
+			config.EjectCD = true
+			Expect(action.InstallRun(config)).To(BeNil())
+			_, err = fs.Stat("/usr/lib/systemd/system-shutdown/eject")
+			Expect(err).To(HaveOccurred())
+		})
+
 		It("Successfully installs despite hooks failure", Label("hooks"), func() {
 			cloudInit.Error = true
 			config.Target = device

pkg/action/install.go

@@ -249,6 +249,15 @@ func InstallRun(config *v1.RunConfig) (err error) { //nolint:gocyclo
 		return err
 	}
 
+	// If we want to eject the cd, create the required executable so the cd is ejected at shutdown
+	if config.EjectCD && utils.BootedFrom(config.Runner, "cdroot") {
+		config.Logger.Infof("Writing eject script")
+		err = config.Fs.WriteFile("/usr/lib/systemd/system-shutdown/eject", []byte(cnst.EjectScript), 0744)
+		if err != nil {
+			config.Logger.Warnf("Could not write eject script, cdrom wont be ejected automatically: %s", err)
+		}
+	}
+
 	// Reboot, poweroff or nothing
 	if config.Reboot {
 		config.Logger.Infof("Rebooting in 5 seconds")

pkg/constants/constants.go

@@ -92,6 +92,9 @@ const (
 	// Default directory and file fileModes
 	DirPerm  = os.ModeDir | os.ModePerm
 	FilePerm = 0666
+
+	// Eject script
+	EjectScript = "#!/bin/sh\n/usr/bin/eject -rmF"
 )
 
 func GetCloudInitPaths() []string {

pkg/types/v1/config.go

@@ -66,6 +66,7 @@ type RunConfig struct {
 	ImgSize         uint   `yaml:"DEFAULT_IMAGE_SIZE,omitempty" mapstructure:"DEFAULT_IMAGE_SIZE"`
 	Directory       string `yaml:"directory,omitempty" mapstructure:"directory"`
 	ResetPersistent bool   `yaml:"reset-persistent,omitempty" mapstructure:"reset-persistent"`
+	EjectCD         bool   `yaml:"eject-cd,omitempty" mapstructure:"eject-cd"`
 	// Internally used to track stuff around
 	PartTable string
 	BootFlag  string