Skip to content

Commit

Permalink
Chang inter funs name to correct meaning
Browse files Browse the repository at this point in the history
Signed-off-by: linzhinan(zen Lin) <linzhinan@huawei.com>
  • Loading branch information
zenlint committed Feb 1, 2016
1 parent 96eab8a commit 5c6d742
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions units/unit.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (unit *TestUnit) prepareBundle() {

// Create rootfs for bundle
rootfs := unit.BundleDir + "/rootfs"
if err := tarRootfs(rootfs); err != nil {
if err := untarRootfs(rootfs); err != nil {
logrus.Fatalf("tar roofts.tar.gz to %v err: %v\n", rootfs, err)
}

Expand Down Expand Up @@ -220,13 +220,13 @@ func (unit *TestUnit) generateConfigs() {
logrus.Debugln(a)
}

err := ocitoolGen(args)
err := genConfigs(args)
if err != nil {
logrus.Fatalf("generate *.json err: %v\n", err)
}
}

func tarRootfs(rootfs string) error {
func untarRootfs(rootfs string) error {
// Create rootfs folder to bundle
if err := os.Mkdir(rootfs, os.ModePerm); err != nil {
logrus.Fatalf("mkdir rootfs for bundle %v err: %v\n", rootfs, err)
Expand All @@ -245,7 +245,7 @@ func tarRootfs(rootfs string) error {
return nil
}

func ocitoolGen(args []string) error {
func genConfigs(args []string) error {
argsNew := make([]string, len(args)+1)
argsNew[0] = "generate"
for i, a := range args {
Expand Down

0 comments on commit 5c6d742

Please sign in to comment.