Merge pull request #17 from sgopinath1/prerm

Added prerm debian script

Author: sgopinath1

build/debian/DEBIAN/prerm

@@ -0,0 +1,2 @@
+#!/bin/bash
+amd-ctk runtime configure --remove

cmd/amd-ctk/cdi/generate/generate.go

@@ -18,6 +18,7 @@ package generate
 
 import (
 	"fmt"
+	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -61,6 +62,11 @@ func AddNewCommand() *cli.Command {
 }
 
 func validateGenOptions(c *cli.Context, genOptions *generateOptions) error {
+	curUser, err := user.Current()
+	if err != nil || curUser.Uid != "0" {
+		return fmt.Errorf("Permission denied: Not running as root")
+	}
+
 	out, err := filepath.Abs(genOptions.output)
 	if err != nil {
 		return fmt.Errorf("incorrect output file, Err: %v", err)

cmd/amd-ctk/cdi/list/list.go

@@ -18,6 +18,7 @@ package list
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/ROCm/container-toolkit/internal/amdgpu"
 	"github.com/urfave/cli/v2"
@@ -53,8 +54,9 @@ func performAction(c *cli.Context) error {
 		}
 		fmt.Printf("amd.com/gpu=%v\n", cnt)
 		for _, dd := range dev {
-			fmt.Printf("  %s\n", dd)
-
+			if !strings.HasPrefix(dd, "/dev/dri/card") {
+				fmt.Printf("  %s\n", dd)
+			}
 		}
 	}
 	return nil

cmd/amd-ctk/runtime/configure/configure.go

@@ -18,6 +18,7 @@ package configure
 
 import (
 	"fmt"
+	"os/user"
 
 	"github.com/ROCm/container-toolkit/cmd/amd-ctk/runtime/engine"
 	"github.com/ROCm/container-toolkit/cmd/amd-ctk/runtime/engine/docker"
@@ -91,6 +92,10 @@ func AddNewCommand() *cli.Command {
 
 func validateConfigOptions(c *cli.Context, cfgOptions *configOptions) error {
 
+	curUser, err := user.Current()
+	if err != nil || curUser.Uid != "0" {
+		return fmt.Errorf("Permission denied: Not running as root")
+	}
 	if cfgOptions.runtime != "docker" {
 		return fmt.Errorf("unsupported runtime engine: %v", cfgOptions.runtime)
 	}

internal/cdi/cdi.go

@@ -182,7 +182,7 @@ func New(sp string) (Interface, error) {
 	}
 
 	if _, err := os.Stat(sp); os.IsNotExist(err) {
-		err := os.Mkdir(sp, os.ModeDir)
+		err := os.Mkdir(sp, 0755)
 		if err != nil {
 			logger.Log.Printf("Failed to create %v, Err: %v", sp, err)
 			return nil, err

internal/runtime/runtime.go

@@ -76,20 +76,6 @@ func New(args []string) (Interface, error) {
 func (rt *runtm) Run() error {
 	var err error
 
-	// Generate CDI spec
-	err = rt.cdi.GenerateSpec()
-	if err != nil {
-		logger.Log.Printf("Failed to generate CDI spec, Error: %v", err)
-		return err
-	}
-
-	// Write updated CDI spec
-	err = rt.cdi.WriteSpec()
-	if err != nil {
-		logger.Log.Printf("Failed to write generated runtime CDI spec, Error: %v", err)
-		return err
-	}
-
 	if rt.oci.HasHelpOption() {
 		fmt.Printf("\nAMD Container Runtime is a wrapper over runc. Below is the help for runc.\n\n")
 	}