Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / 
cryptsetup


Commits:
88758fe4 by nl6720 at 2023-11-30T15:39:01+01:00
sd-encrypt: include /usr/lib/systemd/systemd-makefs

`mkswap` is not enough for systemd-cryptsetup to create swap in early
userspace, it additionally needs `/usr/lib/systemd/systemd-makefs`.
Without it, the journal shows:

    systemd[190]: systemd-cryptsetup@swap.service: Failed to locate executable 
/usr/lib/systemd/systemd-makefs: No such file or directory
    systemd[190]: systemd-cryptsetup@swap.service: Failed at step EXEC spawning 
/usr/lib/systemd/systemd-makefs: No such file or directory
    systemd[1]: systemd-cryptsetup@swap.service: Control process exited, 
code=exited, status=203/EXEC
    systemd[1]: systemd-cryptsetup@swap.service: Failed with result 
'exit-code'.
    systemd[1]: Failed to start Cryptography Setup for swap.
    systemd[1]: Dependency failed for Local Encrypted Volumes.

Fixes 
https://gitlab.archlinux.org/archlinux/packaging/packages/cryptsetup/-/issues/3

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- install-sd-encrypt


Changes:

=====================================
.SRCINFO
=====================================
@@ -29,6 +29,6 @@ pkgbase = cryptsetup
        sha256sums = SKIP
        sha256sums = 
839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02
        sha256sums = 
2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd
-       sha256sums = 
ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8
+       sha256sums = 
90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9
 
 pkgname = cryptsetup


=====================================
PKGBUILD
=====================================
@@ -22,7 +22,7 @@ 
sha256sums=('410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693'
             'SKIP'
             '839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02'
             '2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd'
-            'ec983a55b09dd512ab5b2f329fe611cb10478e4cc1cd3bb65848cf234dcfebd8')
+            '90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}


=====================================
install-sd-encrypt
=====================================
@@ -27,6 +27,7 @@ build() {
     map add_binary \
         '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator' \
         '/usr/lib/systemd/systemd-cryptsetup' \
+        '/usr/lib/systemd/systemd-makefs' \
         '/usr/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so' \
         '/usr/lib/cryptsetup/libcryptsetup-token-systemd-pkcs11.so' \
         '/usr/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so'



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cryptsetup/-/commit/88758fe4b86f2e0706e28e6abebdc5839b8ae510

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cryptsetup/-/commit/88758fe4b86f2e0706e28e6abebdc5839b8ae510
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to