TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-11 22:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

自动安装nftables时尝试使用apt-get

Browse Source
This commit is contained in:
GoEdgeLab
2024-05-03 15:51:08 +08:00
parent d839d81ea7
commit 87abee4570
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/firewalls/nftables/installer.go
View File

@@ -90,18 +90,26 @@ func (this *Installer) Install() error {
} }
var cmd *executils.Cmd var cmd *executils.Cmd
var aptCmd *executils.Cmd
// check dnf // check dnf
{
dnfExe, err := executils.LookPath("dnf") dnfExe, err := executils.LookPath("dnf")
if err == nil { if err == nil {
cmd = executils.NewCmd(dnfExe, "-y", "install", "nftables") cmd = executils.NewCmd(dnfExe, "-y", "install", "nftables")
} }
}
// check apt // check apt
if cmd == nil { if cmd == nil {
aptExe, err := executils.LookPath("apt") aptGetExe, err := executils.LookPath("apt-get")
if err == nil { if err == nil {
cmd = executils.NewCmd(aptExe, "install", "nftables") cmd = executils.NewCmd(aptGetExe, "install", "nftables")
}
aptExe, aptErr := executils.LookPath("apt")
if aptErr == nil {
aptCmd = executils.NewCmd(aptExe, "install", "nftables")
} }
} }
@@ -117,12 +125,22 @@ func (this *Installer) Install() error {
return nil return nil
} }
cmd.WithTimeout(10 * time.Minute)
cmd.WithStderr()
err := cmd.Run()
if err != nil {
// try 'apt-get' instead of 'apt'
if aptCmd != nil {
cmd = aptCmd
cmd.WithTimeout(10 * time.Minute) cmd.WithTimeout(10 * time.Minute)
cmd.WithStderr() cmd.WithStderr()
err = cmd.Run() err = cmd.Run()
}
if err != nil { if err != nil {
return fmt.Errorf("%w: %s", err, cmd.Stderr()) return fmt.Errorf("%w: %s", err, cmd.Stderr())
} }
}
remotelogs.Println("NFTABLES", "installed nftables with command '"+cmd.String()+"' successfully") remotelogs.Println("NFTABLES", "installed nftables with command '"+cmd.String()+"' successfully")