rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-09-07 01:30:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint and new uki steps (#274)

Browse Source 
* Fix lint and add new uki step

Make it simpler by dividing the actual base mounts and pivot into new
sysroot into two different steps

Signed-off-by: Itxaka <itxaka@kairos.io>

* Fix constant name and gosec issues

Signed-off-by: Itxaka <itxaka@kairos.io>

---------

Signed-off-by: Itxaka <itxaka@kairos.io>
This commit is contained in:
Itxaka
2024-04-09 08:40:47 +00:00
committed by GitHub
parent b9fe50bf84
commit ade21d4663
4 changed files with 169 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/utils/common.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/avast/retry-go"
"github.com/joho/godotenv"
"github.com/kairos-io/immucore/internal/constants"
"github.com/kairos-io/kairos-sdk/state"
)
@@ -219,15 +220,15 @@ func CommandWithPath(c string) (string, error) {
func PrepareCommandWithPath(c string) *exec.Cmd {
cmd := exec.Command("/bin/sh", "-c", c)
cmd.Env = os.Environ()
pathAppend := "/usr/bin:/usr/sbin:/bin:/sbin"
pathAppend := constants.PathAppend
// try to extract any existing path from the environment
for _, env := range cmd.Env {
splitted := strings.Split(env, "=")
if splitted[0] == "PATH" {
if splitted[0] == constants.PATH {
pathAppend = fmt.Sprintf("%s:%s", pathAppend, splitted[1])
}
}
cmd.Env = append(cmd.Env, fmt.Sprintf("PATH=%s", pathAppend))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", constants.PATH, pathAppend))
return cmd
}
@@ -243,15 +244,15 @@ func GetHostProcCmdline() string {
func DropToEmergencyShell() {
env := os.Environ()
pathAppend := "/usr/bin:/usr/sbin:/bin:/sbin"
// try to extract any existing path from the environment
pathAppend := constants.PathAppend
for _, e := range env {
splitted := strings.Split(e, "=")
if splitted[0] == "PATH" {
if splitted[0] == constants.PATH {
pathAppend = fmt.Sprintf("%s:%s", pathAppend, splitted[1])
}
}
env = append(env, fmt.Sprintf("PATH=%s", pathAppend))
env = append(env, fmt.Sprintf("%s=%s", constants.PATH, pathAppend))
if err := syscall.Exec("/bin/bash", []string{"/bin/bash"}, env); err != nil {
if err := syscall.Exec("/bin/sh", []string{"/bin/sh"}, env); err != nil {
if err := syscall.Exec("/sysroot/bin/bash", []string{"/sysroot/bin/bash"}, env); err != nil {