smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cmd/mkinitfs: use misc.Exists, drop exists()

Browse Source
This commit is contained in:
Clayton Craft
2023-02-12 21:26:34 -08:00
parent e0977b4ac1
commit 94584050ee
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/mkinitfs/main.go
View File

@@ -25,7 +25,7 @@ import (
func main() { func main() {
deviceinfoFile := "/etc/deviceinfo" deviceinfoFile := "/etc/deviceinfo"
if !exists(deviceinfoFile) { if !misc.Exists(deviceinfoFile) {
log.Print("NOTE: deviceinfo (from device package) not installed yet, " + log.Print("NOTE: deviceinfo (from device package) not installed yet, " +
"not building the initramfs now (it should get built later " + "not building the initramfs now (it should get built later " +
"automatically.)") "automatically.)")
@@ -122,7 +122,7 @@ func bootDeploy(workDir string, outDir string) error {
"-d", workDir, "-d", workDir,
"-o", outDir, "-o", outDir,
"initramfs-extra") "initramfs-extra")
if !exists(cmd.Path) { if !misc.Exists(cmd.Path) {
return errors.New("boot-deploy command not found") return errors.New("boot-deploy command not found")
} }
@@ -136,13 +136,6 @@ func bootDeploy(workDir string, outDir string) error {
return nil return nil
} }
func exists(file string) bool {
if _, err := os.Stat(file); err == nil {
return true
}
return false
}
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 {
@@ -468,7 +461,7 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
} }
// Hook files & scripts // Hook files & scripts
if exists("/etc/postmarketos-mkinitfs/files-extra") { if misc.Exists("/etc/postmarketos-mkinitfs/files-extra") {
log.Println("- Including hook files") log.Println("- Including hook files")
var hookFiles []string var hookFiles []string
hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files-extra") hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files-extra")
@@ -482,7 +475,7 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
} }
} }
if exists("/etc/postmarketos-mkinitfs/hooks-extra") { if misc.Exists("/etc/postmarketos-mkinitfs/hooks-extra") {
log.Println("- Including extra hook scripts") log.Println("- Including extra hook scripts")
if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks-extra"); err != nil { if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks-extra"); err != nil {
return nil, err return nil, err
@@ -491,7 +484,7 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
} }
} }
if exists("/usr/bin/osk-sdl") { if misc.Exists("/usr/bin/osk-sdl") {
log.Println("- Including FDE support") log.Println("- Including FDE support")
if fdeFiles, err := getFdeFiles(devinfo); err != nil { if fdeFiles, err := getFdeFiles(devinfo); err != nil {
return nil, err return nil, err
@@ -518,7 +511,7 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
} }
// Hook files & scripts // Hook files & scripts
if exists("/etc/postmarketos-mkinitfs/files") { if misc.Exists("/etc/postmarketos-mkinitfs/files") {
log.Println("- Including hook files") log.Println("- Including hook files")
if hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files"); err != nil { if hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files"); err != nil {
return nil, err return nil, err
@@ -531,7 +524,7 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
} }
} }
if exists("/etc/postmarketos-mkinitfs/hooks") { if misc.Exists("/etc/postmarketos-mkinitfs/hooks") {
log.Println("- Including hook scripts") log.Println("- Including hook scripts")
if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks"); err != nil { if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks"); err != nil {
return nil, err return nil, err
@@ -554,7 +547,7 @@ func getInitfsModules(devinfo deviceinfo.DeviceInfo, kernelVer string) (files []
log.Println("- Including kernel modules") log.Println("- Including kernel modules")
modDir := filepath.Join("/lib/modules", kernelVer) modDir := filepath.Join("/lib/modules", kernelVer)
if !exists(modDir) { if !misc.Exists(modDir) {
// dir /lib/modules/<kernel> if kernel built without module support, so just print a message // dir /lib/modules/<kernel> if kernel built without module support, so just print a message
log.Printf("-- kernel module directory not found: %q, not including modules", modDir) log.Printf("-- kernel module directory not found: %q, not including modules", modDir)
return return
@@ -827,7 +820,7 @@ func getModulesInDir(modPath string) (files []string, err error) {
func getModule(modName string, modDir string) (files []string, err error) { func getModule(modName string, modDir string) (files []string, err error) {
modDep := filepath.Join(modDir, "modules.dep") modDep := filepath.Join(modDir, "modules.dep")
if !exists(modDep) { if !misc.Exists(modDep) {
return nil, fmt.Errorf("kernel module.dep not found: %s", modDir) return nil, fmt.Errorf("kernel module.dep not found: %s", modDir)
} }
@@ -844,7 +837,7 @@ func getModule(modName string, modDir string) (files []string, err error) {
for _, dep := range deps { for _, dep := range deps {
p := filepath.Join(modDir, dep) p := filepath.Join(modDir, dep)
if !exists(p) { if !misc.Exists(p) {
return nil, fmt.Errorf("tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p) return nil, fmt.Errorf("tried to include a module that doesn't exist in the modules directory (%s): %s", modDir, p)
} }
files = append(files, p) files = append(files, p)