Merge pull request #152 from praveenkumar/fix_150

Fix #150 Extract kernel options from the syslinux.conf file if exist

Author: zchee

.gitignore

@@ -91,3 +91,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Intellij geneatered directory
+.idea

xhyve/xhyve.go

@@ -3,6 +3,7 @@ package xhyve
 import (
 	"archive/tar"
 	"bytes"
+	"bufio"
 	"errors"
 	"fmt"
 	"io"
@@ -37,7 +38,7 @@ const (
 	defaultBootKernel     = ""
 	defaultBootInitrd     = ""
 	defaultBoot2DockerURL = ""
-	defaultBootCmd        = "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 base host=boot2docker"
+	defaultBootCmd        = ""
 	defaultCPU            = 1
 	defaultCaCertPath     = ""
 	defaultDiskSize       = 20000
@@ -84,6 +85,7 @@ var (
 	ErrMachineNotExist = errors.New("machine does not exist")
 	diskRegexp         = regexp.MustCompile("^/dev/disk([0-9]+)")
 	kernelRegexp       = regexp.MustCompile(`(vmlinu[xz]|bzImage)[\d]*`)
+	kernelOptionRegexp = regexp.MustCompile(`(\t|\s{2})append`)
 )
 
 // NewDriver creates a new VirtualBox driver with default settings.
@@ -610,6 +612,46 @@ func (d *Driver) publicSSHKeyPath() string {
 	return d.GetSSHKeyPath() + ".pub"
 }
 
+func readLine(path string) string {
+	line := ""
+	inFile, err := os.Open(path)
+	if err != nil {
+		log.Debugf("Not able to open %s", path)
+	}
+	defer inFile.Close()
+	scanner := bufio.NewScanner(inFile)
+	scanner.Split(bufio.ScanLines)
+	for scanner.Scan() {
+		line = scanner.Text()
+		if kernelOptionRegexp.MatchString(line) {
+			break
+		}
+	}
+	return line
+}
+
+func (d *Driver) extractKernelOptions() error {
+	log.Debugf("Extracting Kernel Options...")
+	volumeRootDir := d.ResolveStorePath(isoMountPath)
+	if d.BootCmd == "" {
+		err := filepath.Walk(volumeRootDir, func(path string, f os.FileInfo, err error) error {
+			if strings.Contains(path, "isolinux.cfg") {
+				d.BootCmd = readLine(path)
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+		if d.BootCmd == "" {
+			err = errors.New("Not able to parse isolinux.cfg, Please use --xhyve-boot-cmd option")
+			return err
+		}
+	}
+	log.Debugf("Extracted Options %s", d.BootCmd)
+	return nil
+}
+
 func (d *Driver) extractKernelImages() error {
 	log.Debugf("Mounting %s", isoFilename)
 
@@ -619,6 +661,10 @@ func (d *Driver) extractKernelImages() error {
 		return err
 	}
 
+	if err := d.extractKernelOptions(); err != nil {
+		return err
+	}
+
 	defer func() error {
 		log.Debugf("Unmounting %s", isoFilename)
 		return hdiutil("detach", volumeRootDir)