Skip to content

Commit 7250111

Browse files
committed
Update pacman spec to dract changed module dirs
Follow up change for the fix of the recommended dracut module ordering for out-of-tree modules.
1 parent 510ca97 commit 7250111

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

package/python-kiwi-pkgbuild-template

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,42 @@ package_kiwi-man-pages(){
4343
package_dracut-kiwi-lib(){
4444
depends=(cryptsetup btrfs-progs gptfdisk coreutils e2fsprogs grep lvm2 mdadm parted util-linux xfsprogs dialog curl xz device-mapper dracut pv bc)
4545
cd kiwi-${pkgver}
46-
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/99kiwi-lib
47-
cp -a dracut/modules.d/99kiwi-lib ${pkgdir}/usr/lib/dracut/modules.d/
46+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/59kiwi-lib
47+
cp -a dracut/modules.d/59kiwi-lib ${pkgdir}/usr/lib/dracut/modules.d/
4848
}
4949

5050
package_dracut-kiwi-oem-repart(){
5151
depends=(dracut-kiwi-lib=${pkgver})
5252
cd kiwi-${pkgver}
53-
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-repart
54-
cp -a dracut/modules.d/90kiwi-repart ${pkgdir}/usr/lib/dracut/modules.d/
53+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/55kiwi-repart
54+
cp -a dracut/modules.d/55kiwi-repart ${pkgdir}/usr/lib/dracut/modules.d/
5555
}
5656

5757
package_dracut-kiwi-oem-dump(){
5858
depends=(dracut-kiwi-lib=${pkgver} multipath-tools kexec-tools)
5959
cd kiwi-${pkgver}
60-
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-dump
61-
cp -a dracut/modules.d/90kiwi-dump ${pkgdir}/usr/lib/dracut/modules.d/
62-
cp -a dracut/modules.d/99kiwi-dump-reboot ${pkgdir}/usr/lib/dracut/modules.d/
60+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/55kiwi-dump
61+
cp -a dracut/modules.d/55kiwi-dump ${pkgdir}/usr/lib/dracut/modules.d/
62+
cp -a dracut/modules.d/59kiwi-dump-reboot ${pkgdir}/usr/lib/dracut/modules.d/
6363
}
6464

6565
package_dracut-kiwi-live(){
6666
depends=(dracut dialog xfsprogs e2fsprogs util-linux device-mapper libisoburn parted)
6767
cd kiwi-${pkgver}
68-
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-live
69-
cp -a dracut/modules.d/90kiwi-live ${pkgdir}/usr/lib/dracut/modules.d/
68+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/55kiwi-live
69+
cp -a dracut/modules.d/55kiwi-live ${pkgdir}/usr/lib/dracut/modules.d/
7070
}
7171

7272
package_dracut-kiwi-overlay(){
7373
depends=(dracut util-linux)
7474
cd kiwi-${pkgver}
75-
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/90kiwi-overlay
76-
cp -a dracut/modules.d/90kiwi-overlay ${pkgdir}/usr/lib/dracut/modules.d/
75+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/55kiwi-overlay
76+
cp -a dracut/modules.d/55kiwi-overlay ${pkgdir}/usr/lib/dracut/modules.d/
77+
}
78+
79+
package_dracut-kiwi-verity(){
80+
depends=(dracut util-linux)
81+
cd kiwi-${pkgver}
82+
install -d -m 755 ${pkgdir}/usr/lib/dracut/modules.d/55kiwi-verity
83+
cp -a dracut/modules.d/50kiwi-verity ${pkgdir}/usr/lib/dracut/modules.d/
7784
}

0 commit comments

Comments
 (0)