@@ -157,7 +157,7 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
157157# test "24.04" != "${VER}" && apt.sh leafpad; \
158158# exit 0
159159
160-
160+ #########不装IBUS: icons不行
161161# AUD img: 546MB[239M]> 560MB
162162# INPUT img: 546MB[239M]> 658MB[252M]
163163# librime-data-wubi> rime-data-wubi
@@ -190,35 +190,41 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\
190190# test -z "$match1" && apt.sh firefox; \
191191# exit 0
192192
193- ##改后: icons反而不行
194- # # qemu,libvirt
195- # RUN apt.sh \
196- # qemu-system-x86 qemu-system-arm qemu-system-ppc qemu-utils ipxe-qemu \
197- # libvirt-daemon-system libvirt-clients virtinst \
198- # bridge-utils seabios vgabios dnsmasq \
199- # supervisor dropbear git;
200- # # ubt24-none: qemu-efi gconf2
201- # RUN \
202- # test "24.04" != "${VER}" && apt.sh gconf2 qemu-efi; \
203- # exit 0
204- # # virter-v0.24.0
205- # RUN \
206- # case ${TARGETPLATFORM} in \
207- # "linux/amd64") arch=amd64 ;; \
208- # "linux/arm64") arch=arm64 ;; \
209- # "linux/arm/v7") arch=arm ;; \
210- # "linux/ppc64le") arch=ppc64le ;; \
211- # "linux/arm/v6") arch=NONE_armel ;; \
212- # "linux/386") arch=NONE_i386 ;; \
213- # esac; \
214- # file=virter-linux-$arch; \
215- # # https://github.com/infrastlabs/fk-virter/releases/download/v24.12/virter-linux-amd64 #none: xx-upx.tar.gz (
[email protected] )
216- # test -s $file || wget -O $file https://github.com/infrastlabs/fk-virter/releases/download/v24.12/$file; \
217- # chmod +x $file; mv $file /bin/virter;
218- # RUN \
219- # sed -i 's/#user = "root"/user = "root"/' /etc/libvirt/qemu.conf; \
220- # sed -i 's/#group = "root"/group = "root"/' /etc/libvirt/qemu.conf; \
221- # exit 0;
193+ # qemu,libvirt
194+ RUN apt.sh \
195+ qemu-system-x86 qemu-system-arm qemu-system-ppc qemu-utils ipxe-qemu \
196+ libvirt-daemon-system libvirt-clients virtinst \
197+ bridge-utils seabios vgabios dnsmasq \
198+ supervisor dropbear git;
199+ # ubt24-none: qemu-efi gconf2
200+ RUN \
201+ test "24.04" != "${VER}" && apt.sh gconf2 qemu-efi; \
202+ exit 0
203+ # virter-v0.24.0
204+ RUN \
205+ case ${TARGETPLATFORM} in \
206+ "linux/amd64") arch=amd64 ;; \
207+ "linux/arm64") arch=arm64 ;; \
208+ "linux/arm/v7") arch=arm ;; \
209+ "linux/ppc64le") arch=ppc64le ;; \
210+ "linux/arm/v6") arch=NONE_armel ;; \
211+ "linux/386") arch=NONE_i386 ;; \
212+ esac; \
213+ file=virter-linux-$arch; \
214+ # https://github.com/infrastlabs/fk-virter/releases/download/v24.12/virter-linux-amd64 #none: xx-upx.tar.gz (
[email protected] )
215+ test -s $file || wget -O $file https://github.com/infrastlabs/fk-virter/releases/download/v24.12/$file; \
216+ chmod +x $file; mv $file /bin/virter;
217+ RUN \
218+ sed -i 's/#user = "root"/user = "root"/' /etc/libvirt/qemu.conf; \
219+ sed -i 's/#group = "root"/group = "root"/' /etc/libvirt/qemu.conf; \
220+ exit 0;
221+ ##virt-manager#############
222+ RUN \
223+ # gobject-introspection: for dev-run ./virt-manager
224+ apt.sh virt-manager gobject-introspection; \
225+ cd /usr/local; \
226+ git clone https://gitee.com/g-system/fk-virt-manager;
227+
222228
223229# 拆分包体与配置项两块,免频繁变动基础包
224230# HEADLESS
0 commit comments