rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-31 06:32:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1743 from rancher/v0.8.x

Browse Source 
fix downgrade from 0.8/0.9 to 0.7, and back again
This commit is contained in:
Sven Dowideit 2017-04-01 21:52:32 +10:00 committed by GitHub
commit 1356e609b3
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/control/install.go
View File

@ -838,9 +838,21 @@ func upgradeBootloader(device, baseName, bootDir, diskType string) error {
return err
}
backupSyslinuxDir := filepath.Join(baseName, bootDir+"syslinux_backup")
if err := os.RemoveAll(backupSyslinuxDir); err != nil {
log.Errorf("RemoveAll (%s): %s", backupSyslinuxDir, err)
return err
if _, err := os.Stat(backupSyslinuxDir); !os.IsNotExist(err) {
backupSyslinuxLdlinuxSys := filepath.Join(backupSyslinuxDir, "ldlinux.sys")
if _, err := os.Stat(backupSyslinuxLdlinuxSys); !os.IsNotExist(err) {
//need a privileged container that can chattr -i ldlinux.sys
cmd := exec.Command("chattr", "-i", backupSyslinuxLdlinuxSys)
if err := cmd.Run(); err != nil {
log.Errorf("%s", err)
return err
}
}
if err := os.RemoveAll(backupSyslinuxDir); err != nil {
log.Errorf("RemoveAll (%s): %s", backupSyslinuxDir, err)
return err
}
}
if err := os.Rename(grubDir, grubBackup); err != nil {

2
cmd/control/os.go
View File

@ -201,7 +201,7 @@ func osVersion(c *cli.Context) error {
func startUpgradeContainer(image string, stage, force, reboot, kexec bool, upgradeConsole bool, kernelArgs string) error {
command := []string{
"-t", "upgrade",
"-t", "rancher-upgrade",
"-r", config.Version,
}

3
scripts/installer/BaseDockerfile.amd64
View File

@ -8,7 +8,8 @@ ENV KERNEL_VERSION=${KERNEL_VERSION}
# not installed atm udev, grub2, kexe-tools
# parted: partprobe, e2fsprogs: mkfs.ext4, syslinux: extlinux&syslinux
RUN apk --no-cache add syslinux parted e2fsprogs util-linux
# e2fsprogs-extra: chattr
RUN apk --no-cache add syslinux parted e2fsprogs e2fsprogs-extra util-linux
COPY conf /scripts/
COPY ./build/ros /bin/