mirror of
https://github.com/linka-cloud/d2vm.git
synced 2026-01-25 19:15:04 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2af13ef626
|
|||
|
|
0d4379946b | ||
|
|
e9f3ac9193 | ||
|
a40b7d3c07
|
@@ -32,16 +32,13 @@ Working and tested:
|
||||
- [x] Ubuntu
|
||||
- [x] Debian
|
||||
- [x] Alpine
|
||||
|
||||
Need fix:
|
||||
|
||||
- [ ] CentOS
|
||||
- [x] CentOS
|
||||
|
||||
Unsupported:
|
||||
|
||||
- [ ] RHEL
|
||||
|
||||
The program use the `/etc/os-release` file to discover the Linux distribution and install the Kernel,
|
||||
The program uses the `/etc/os-release` file to discover the Linux distribution and install the Kernel,
|
||||
if the file is missing, the build cannot succeed.
|
||||
|
||||
Obviously, **Distroless** images are not supported.
|
||||
|
||||
12
builder.go
12
builder.go
@@ -56,13 +56,13 @@ ff02::3 ip6-allhosts
|
||||
SAY Now booting the kernel from SYSLINUX...
|
||||
LABEL linux
|
||||
KERNEL /boot/vmlinuz-virt
|
||||
APPEND ro root=UUID=%s rootfstype=ext4 initrd=/boot/initramfs-virt console=ttyS0,115200
|
||||
APPEND ro root=UUID=%s rootfstype=ext4 initrd=/boot/initramfs-virt console=ttyS0,115200
|
||||
`
|
||||
syslinuxCfgCentOS = `DEFAULT linux
|
||||
SAY Now booting the kernel from SYSLINUX...
|
||||
LABEL linux
|
||||
KERNEL /boot/vmlinuz
|
||||
APPEND ro root=UUID=%s initrd=/boot/initrd.img net.ifnames=0 console=tty0 console=ttyS0,115200n8
|
||||
APPEND ro root=UUID=%s initrd=/boot/initrd.img net.ifnames=0 console=tty0 console=ttyS0,115200n8
|
||||
`
|
||||
)
|
||||
|
||||
@@ -78,6 +78,8 @@ var (
|
||||
"/usr/share/syslinux/mbr.bin",
|
||||
// centos path
|
||||
"/usr/share/syslinux/mbr.bin",
|
||||
// archlinux path
|
||||
"/usr/lib/syslinux/bios/mbr.bin",
|
||||
}
|
||||
)
|
||||
|
||||
@@ -322,7 +324,11 @@ func (b *builder) installKernel(ctx context.Context) error {
|
||||
var sysconfig string
|
||||
switch b.osRelease.ID {
|
||||
case ReleaseUbuntu:
|
||||
sysconfig = syslinuxCfgUbuntu
|
||||
if b.osRelease.VersionID < "20.04" {
|
||||
sysconfig = syslinuxCfgDebian
|
||||
} else {
|
||||
sysconfig = syslinuxCfgUbuntu
|
||||
}
|
||||
case ReleaseDebian:
|
||||
sysconfig = syslinuxCfgDebian
|
||||
case ReleaseAlpine:
|
||||
|
||||
@@ -7,7 +7,10 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
|
||||
|
||||
RUN yum update -y
|
||||
|
||||
RUN yum install -y kernel systemd sudo
|
||||
RUN yum install -y kernel systemd NetworkManager e2fsprogs sudo && \
|
||||
systemctl enable NetworkManager && \
|
||||
systemctl unmask systemd-remount-fs.service && \
|
||||
systemctl unmask getty.target
|
||||
|
||||
RUN dracut --no-hostonly --regenerate-all --force && \
|
||||
cd /boot && \
|
||||
|
||||
Reference in New Issue
Block a user