rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-16 22:08:26 +00:00
Code Issues Releases Wiki Activity

Need to remove the immutable bit from ldlinux.sys so root can remove it

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-03-31 12:15:15 +00:00
parent e871741ec3
commit 62d8aaa58e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/control/install.go
View File

@ -841,10 +841,22 @@ func upgradeBootloader(device, baseName, bootDir, diskType string) error {
return err return err
} }
backupSyslinuxDir := filepath.Join(baseName, bootDir+"syslinux_backup") backupSyslinuxDir := filepath.Join(baseName, bootDir+"syslinux_backup")
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 { if err := os.RemoveAll(backupSyslinuxDir); err != nil {
log.Errorf("RemoveAll (%s): %s", backupSyslinuxDir, err) log.Errorf("RemoveAll (%s): %s", backupSyslinuxDir, err)
return err return err
} }
}
if err := os.Rename(grubDir, grubBackup); err != nil { if err := os.Rename(grubDir, grubBackup); err != nil {
log.Errorf("Rename(%s): %s", grubDir, err) log.Errorf("Rename(%s): %s", grubDir, err)

3
scripts/installer/BaseDockerfile.amd64
View File

@ -8,7 +8,8 @@ ENV KERNEL_VERSION=${KERNEL_VERSION}
# not installed atm udev, grub2, kexe-tools # not installed atm udev, grub2, kexe-tools
# parted: partprobe, e2fsprogs: mkfs.ext4, syslinux: extlinux&syslinux # 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 conf /scripts/
COPY ./build/ros /bin/ COPY ./build/ros /bin/