lordwelch/gokrazy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reboot: use cmdline from boot/cmdline.txt

Browse Source 
For bootonly updates, switching to the inactive root partition is incorrect.
This commit is contained in:
Michael Stapelberg 2018-07-15 10:40:19 +02:00
parent 9770d4408f
commit fc8dd9e2f2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reboot_amd64.go
View File

@ -33,14 +33,13 @@ func kexecReboot() error {
return err return err
} }
defer kernel.Close() defer kernel.Close()
cmdline, err := ioutil.ReadFile("/proc/cmdline") cmdline, err := ioutil.ReadFile(filepath.Join(tmpdir, "cmdline.txt"))
if err != nil { if err != nil {
return err return err
} }
rep := rootRe.ReplaceAllLiteral(cmdline, []byte("root="+rootdev.MustFind()+inactiveRootPartition))
// NUL-terminate cmdline // NUL-terminate cmdline
cmdlinebuf := make([]byte, len(rep)+1) cmdlinebuf := make([]byte, len(cmdline)+1)
copy(cmdlinebuf, rep) copy(cmdlinebuf, cmdline)
_, _, errno := unix.Syscall6( _, _, errno := unix.Syscall6(
unix.SYS_KEXEC_FILE_LOAD, unix.SYS_KEXEC_FILE_LOAD,
uintptr(kernel.Fd()), // kernel_fd uintptr(kernel.Fd()), // kernel_fd