Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
d62180f9d6 | ||
|
b7f02ff970 |
@@ -31,7 +31,7 @@ gofmt linting:
|
||||
- apk -q update --repository http://dl-4.alpinelinux.org/alpine/edge/testing
|
||||
- apk -q add --repository http://dl-4.alpinelinux.org/alpine/edge/testing go staticcheck
|
||||
script:
|
||||
- .ci/check_linting.sh
|
||||
- .gitlab-ci/check_linting.sh
|
||||
|
||||
build:
|
||||
stage: build
|
||||
|
18
main.go
18
main.go
@@ -86,29 +86,18 @@ func bootDeploy(workDir string, outDir string) error {
|
||||
if len(kernels) == 0 {
|
||||
return errors.New("Unable to find any kernels at " + filepath.Join(outDir, "vmlinuz*"))
|
||||
}
|
||||
|
||||
// Pick a kernel that does not have suffixes added by boot-deploy
|
||||
var kernFile string
|
||||
for _, f := range kernels {
|
||||
if strings.HasSuffix(f, "-dtb") || strings.HasSuffix(f, "-mtk") {
|
||||
continue
|
||||
}
|
||||
kernFile = f
|
||||
break
|
||||
}
|
||||
|
||||
kernFd, err := os.Open(kernFile)
|
||||
kernFile, err := os.Open(kernels[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer kernFd.Close()
|
||||
defer kernFile.Close()
|
||||
|
||||
kernFileCopy, err := os.Create(filepath.Join(workDir, "vmlinuz"))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if _, err = io.Copy(kernFileCopy, kernFd); err != nil {
|
||||
if _, err = io.Copy(kernFileCopy, kernFile); err != nil {
|
||||
return err
|
||||
}
|
||||
kernFileCopy.Close()
|
||||
@@ -414,7 +403,6 @@ func getInitfsFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
||||
"/usr/sbin/telnetd": false,
|
||||
"/sbin/kpartx": false,
|
||||
"/etc/deviceinfo": false,
|
||||
"/usr/bin/unudhcpd": false,
|
||||
}
|
||||
|
||||
// Hook files & scripts
|
||||
|
Reference in New Issue
Block a user