Skip to content

Commit 7e0cd76

Browse files
committed
Merge branch 'erofs_testing'
2 parents 2780685 + 72f2e7a commit 7e0cd76

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

build-tests/x86/tumbleweed/test-image-live/appliance.kiwi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</type>
3434
</preferences>
3535
<preferences profiles="EroFS">
36-
<type image="iso" flags="overlay" firmware="efi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true" mediacheck="true" filesystem="erofs">
36+
<type image="iso" flags="overlay" firmware="uefi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="xfs" hybridpersistent="true" mediacheck="true" filesystem="erofs">
3737
<bootloader name="grub2" console="serial" timeout="10"/>
3838
</type>
3939
</preferences>
@@ -67,6 +67,8 @@
6767
<package name="curl"/>
6868
<package name="bind-utils"/>
6969
<package name="patterns-openSUSE-base"/>
70+
<package name="openSUSE-repos-Tumbleweed"/>
71+
<package name="systemd-network"/>
7072
<package name="procps"/>
7173
<package name="systemd"/>
7274
<package name="plymouth-theme-breeze"/>
@@ -87,6 +89,7 @@
8789
<package name="dhcp-client"/>
8890
<package name="which"/>
8991
<package name="kernel-default"/>
92+
<package name="kernel-firmware-all"/>
9093
<package name="timezone"/>
9194
<package name="dracut-kiwi-live"/>
9295
</packages>

build-tests/x86/tumbleweed/test-image-live/config.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,15 @@ declare kiwi_iname=${kiwi_iname}
1111
echo "Configure image: [$kiwi_iname]..."
1212

1313
#======================================
14-
# Activate services
14+
# Setup services
1515
#--------------------------------------
16-
systemctl enable sshd
16+
for service in \
17+
sshd \
18+
systemd-networkd \
19+
systemd-resolved
20+
do
21+
systemctl enable "${service}"
22+
done
1723

1824
#======================================
1925
# Include erofs module

build-tests/x86/tumbleweed/test-image-live/root/etc/sysconfig/network/ifcfg-lan0

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[Match]
2+
Name=lan0
3+
4+
[Network]
5+
DHCP=yes
6+
7+
[DHCP]
8+
ClientIdentifier=mac

0 commit comments

Comments
 (0)