3 Commits
1.5 ... 1.5.1

Author SHA1 Message Date
Clayton Craft
2761535e12 getInitfsFiles: fix path to kpartx
This changed in a multipath update.

Fixes #16
2022-11-03 12:00:18 -07:00
Clayton Craft
1a72589f6f getHookFiles: print path of each hook file as it is processed
This may be useful during debug later on
2022-09-17 21:31:37 -07:00
Clayton Craft
df0b5d66d7 getHookFiles: wrap errors returned by this function 2022-09-17 21:29:16 -07:00

12
main.go
View File

@@ -151,25 +151,27 @@ func exists(file string) bool {
func getHookFiles(filesdir string) (files []string, err error) { func getHookFiles(filesdir string) (files []string, err error) {
fileInfo, err := os.ReadDir(filesdir) fileInfo, err := os.ReadDir(filesdir)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: unable to read hook file dir: %w", err)
} }
for _, file := range fileInfo { for _, file := range fileInfo {
path := filepath.Join(filesdir, file.Name()) path := filepath.Join(filesdir, file.Name())
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: unable to open hook file: %w", err)
} }
defer f.Close() defer f.Close()
log.Printf("-- Including files from: %s\n", path)
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if filelist, err := getFiles([]string{s.Text()}, true); err != nil { if filelist, err := getFiles([]string{s.Text()}, true); err != nil {
return nil, fmt.Errorf("unable to find file %q required by %q", s.Text(), path) return nil, fmt.Errorf("getHookFiles: unable to find file %q required by %q", s.Text(), path)
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
} }
} }
if err := s.Err(); err != nil { if err := s.Err(); err != nil {
return nil, err return nil, fmt.Errorf("getHookFiles: uname to process hook file %q: %w", path, err)
} }
} }
return files, nil return files, nil
@@ -485,7 +487,7 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
"/bin/sh", "/bin/sh",
"/bin/busybox-extras", "/bin/busybox-extras",
"/usr/sbin/telnetd", "/usr/sbin/telnetd",
"/sbin/kpartx", "/usr/sbin/kpartx",
"/etc/deviceinfo", "/etc/deviceinfo",
"/usr/bin/unudhcpd", "/usr/bin/unudhcpd",
} }