linka-cloud/d2vm
2
0
Fork 0
mirror of https://github.com/linka-cloud/d2vm.git synced 2025-02-19 23:15:49 +00:00
Code Issues Releases Activity

restore initctl, setup ttyS0, mkfs.ext4 -O

Browse Source 
Signed-off-by: LEI WANG <ssst0n3@gmail.com>
This commit is contained in:
LEI WANG 2024-08-27 18:37:10 +08:00
parent c67d361843
commit a784b433ca
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder.go
View File

@ -284,7 +284,7 @@ func (b *builder) mountImg(ctx context.Context) error {
r := ctx.Value("release").(OSRelease) r := ctx.Value("release").(OSRelease)
if r.ID == ReleaseUbuntu { if r.ID == ReleaseUbuntu {
if strings.HasPrefix(r.VersionID, "12.") { if strings.HasPrefix(r.VersionID, "12.") {
mkfsExt4Opts = append(mkfsExt4Opts, "-O", "^has_journal") mkfsExt4Opts = append(mkfsExt4Opts, "-O", "^has_journal,^metadata_csum")
} }
} }
logrus.Infof("mounting raw image") logrus.Infof("mounting raw image")

6
templates/ubuntu12.Dockerfile
View File

@ -2,6 +2,12 @@ FROM {{ .Image }}
USER root USER root
# restore initctl
RUN rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl
# setup ttyS0
RUN cp /etc/init/tty1.conf /etc/init/ttyS0.conf && sed -i s/tty1/ttyS0/g /etc/init/ttyS0.conf
RUN ARCH="$([ "$(uname -m)" = "x86_64" ] && echo amd64 || echo arm64)"; \ RUN ARCH="$([ "$(uname -m)" = "x86_64" ] && echo amd64 || echo arm64)"; \
apt-get update && \ apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \