Skip to content

Commit dca93a6

Browse files
committed
building: update guest image to fedora:40
Signed-off-by: Zhang Tianyang <[email protected]>
1 parent af8c8d8 commit dca93a6

File tree

4 files changed

+13
-22
lines changed

4 files changed

+13
-22
lines changed

vmm/scripts/image/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
exit_flag=0
1717
export GUESTOS_IMAGE=${2:-"centos"}
18-
export IMAGE_NAME=${IMAGE_NAME:-"centos:7"}
18+
export IMAGE_NAME=${IMAGE_NAME:-"registry.fedoraproject.org/fedora:40"}
1919
export ROOTFS_DIR=${ROOTFS_DIR:-"/tmp/kuasar-rootfs"}
2020
export CONTAINER_RUNTIME=${RUNTIME:-"containerd"}
2121
CONTAINERD_NS=${CONTAINERD_NS:-"default"}

vmm/scripts/image/centos/binaries.list

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
/usr/bin/quota* /bin
2626
/usr/bin/quotasync /bin
2727
# cni
28-
/usr/sbin/arping /sbin
28+
/usr/bin/arping /sbin
2929
/usr/bin/ping /sbin
3030
/usr/bin/echo /bin
3131
# iptables
32-
/usr/sbin/iptables /sbin
33-
/usr/sbin/iptables-restore /sbin
34-
/usr/sbin/iptables-save /sbin
32+
/etc/alternatives/iptables /etc/alternatives
33+
/etc/alternatives/iptables-restore /etc/alternatives
34+
/etc/alternatives/iptables-save /etc/alternatives
3535
# debug
3636
/usr/bin/ls /bin
3737
/usr/bin/cat /bin
@@ -40,7 +40,6 @@
4040
/usr/bin/rm /bin
4141
/usr/bin/mkdir /bin
4242
/usr/bin/find /bin
43-
/usr/bin/awk /bin
4443
/usr/bin/grep /bin
4544
/usr/bin/chmod /bin
4645
/usr/bin/chown /bin
@@ -50,4 +49,6 @@
5049
/usr/sbin/ethtool /sbin
5150
/usr/bin/netstat /bin
5251
/usr/sbin/ip /sbin
52+
/usr/sbin/busybox /bin
53+
/usr/bin/ldd /bin
5354
# End of file, do not delete

vmm/scripts/image/centos/build_rootfs.sh

+1-15
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,7 @@ ARCH=$(uname -m)
2424
make_vmm_task() {
2525
local repo_dir="$1"
2626

27-
# install cmake3 because some rust modules depends on it
28-
# centos 7 install cmake 2.8 by default, has to add epel repo to install cmake3
29-
. /etc/os-release
30-
if [ ${VERSION_ID} -le 7 ]; then
31-
yum install -y epel-release
32-
yum install -y cmake3 make gcc gcc-c++ wget
33-
rm -f /usr/bin/cmake
34-
ln -s /usr/bin/cmake3 /usr/bin/cmake
35-
else
36-
# CentOS Linux 8 had reached the End Of Life (EOL) on December 31st, 2021. It means that CentOS 8 will no longer receive development resources from the official CentOS project. After Dec 31st, 2021, if you need to update your CentOS, you need to change the mirrors to vault.centos.org where they will be archived permanently. Alternatively, you may want to upgrade to CentOS Stream.
37-
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
38-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
39-
yum clean all
40-
yum install cmake make gcc-c++ wget
41-
fi
27+
yum install -y cmake make gcc-c++ wget
4228

4329
# update cert file under internal proxy scenario
4430
if [ -f "${cert_file_path}" ]; then

vmm/scripts/image/centos/rpm.list

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
nfs-utils
22
tcp_wrappers-libs
33
rpcbind
4-
libverto-tevent
54
libtirpc
65
libtevent
76
libtalloc
@@ -17,11 +16,16 @@ keyutils
1716
gssproxy
1817
e2fsprogs-libs
1918
libpcap
19+
iptables-libs
2020
iptables
2121
ipvsadm
2222
conntrack-tools
2323
curl
2424
ethtool
2525
net-tools
2626
iproute
27+
busybox
28+
psmisc
29+
procps-ng
30+
iputils
2731
# End of file, do not delete

0 commit comments

Comments
 (0)