Skip to content

Commit d1645a7

Browse files
committed
Revert "Install usrmerge for Debian integration test"
This reverts commit 95ac861. Solution needs to be provided in code
1 parent 95ac861 commit d1645a7

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

build-tests/x86/debian/test-image-live-disk/appliance.kiwi

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,15 @@
8282
<package name="isc-dhcp-client"/>
8383
<package name="netbase"/>
8484
<package name="bsdmainutils"/>
85+
<package name="usrmerge"/>
86+
<package name="usr-is-merged"/>
8587
<package name="netplan.io"/>
8688
<package name="networkd-dispatcher"/>
8789
<package name="net-tools"/>
8890
<package name="dbus"/>
8991
<package name="netbase"/>
9092
<package name="locales-all"/>
9193
<package name="tzdata"/>
92-
<package name="usr-is-merged"/>
9394
</packages>
9495
<packages type="image" profiles="Virtual">
9596
<package name="shim-signed"/>
@@ -102,7 +103,5 @@
102103
<package name="dracut-kiwi-oem-repart"/>
103104
<package name="dracut-kiwi-oem-dump"/>
104105
</packages>
105-
<packages type="bootstrap">
106-
<package name="usrmerge"/>
107-
</packages>
106+
<packages type="bootstrap"/>
108107
</image>

0 commit comments

Comments
 (0)