Merge pull request #16 from kairos-io/change-default-console

Change default system console to tty1

cmd/find-matching-framework.go

@@ -1,42 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-
-	"github.com/kairos-io/enki/pkg/action"
-	"github.com/spf13/cobra"
-)
-
-// NewFindMatchingFrameworkCmd returns a new instance of the build-iso subcommand and appends it to
-// the root command.
-func NewFindMatchingFrameworkCmd() *cobra.Command {
-	c := &cobra.Command{
-		Use:   "find-matching-framework",
-		Short: "Finds the framework image that matches the current OS best",
-		Long: "Finds the framework image that matches the current OS best\n" +
-			"This is best effort and might return a framework image that doesn't work.\n" +
-			"It is expected to work with the official Kairos flavors.",
-		Args: cobra.ExactArgs(0),
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			//return CheckRoot() // TODO: Do we need this?
-			return nil
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			a := action.NewFindMatchingFrameworkAction()
-			result, err := a.Run()
-			if err != nil {
-				return err
-			}
-
-			fmt.Println(result)
-
-			return nil
-		},
-	}
-
-	return c
-}
-
-func init() {
-	rootCmd.AddCommand(NewFindMatchingFrameworkCmd())
-}

pkg/action/find-matching-framework.go

@@ -1,11 +0,0 @@
-package action
-
-type FindMatchingFrameworkAction struct{}
-
-func NewFindMatchingFrameworkAction() *FindMatchingFrameworkAction {
-	return &FindMatchingFrameworkAction{}
-}
-
-func (a *FindMatchingFrameworkAction) Run() (framework string, err error) {
-	return
-}

pkg/constants/constants.go

@@ -56,7 +56,7 @@ const (
 	fi                                                                              
 	menuentry "%s" --class os --unrestricted {                                     
 		echo Loading kernel...                                                      
-		$linux ($root)/boot/kernel cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs rd.live.overlay.overlayfs console=tty1 console=ttyS0 rd.cos.disable
+		$linux ($root)/boot/kernel cdroot root=live:CDLABEL=%s rd.live.dir=/ rd.live.squashimg=rootfs.squashfs rd.live.overlay.overlayfs console=ttyS0 console=tty1 rd.cos.disable
 		echo Loading initrd...                                                      
 		$initrd ($root)/boot/initrd                                                 
 	}