diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 148927a4b..f9394907b 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-base -pkgver=7 +pkgver=8 pkgrel=0 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" @@ -59,7 +59,6 @@ _source644=" " _source755=" etc/init.d/deferred-initcalls - etc/init.d/devmappings etc/init.d/swapfile etc/polkit-1/rules.d/50-org.freedesktop.NetworkManager.rules sbin/swapfile @@ -144,7 +143,6 @@ fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc53737 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d rootfs-etc-udev-rules.d-50-firmware.rules 75451751862a084415212bf2f90fdb4dac6a75bb063a411e15c9060f8c7f0b0b8c994dd6ba964d00a249eb80f5a0665d9cfdf75923af6de47f9723b10e61e9a7 rootfs-etc-os-release 5fd6dd7f9941e975a6ce559924eb252606943276dc09455bbeb05ff718ecd28f20a08eee8e04ca580e5af71d4c944c256ec04f07b07286394f5dfedfa59273e7 rootfs-etc-init.d-deferred-initcalls -dadd251229eb5759e3cba77c39a4afc6f28bcbe0f272cd3ab41b7ff4fe6a3d2b9ee765e1a0b8f9241274e757ed3b2ce035ee5abe91843e55fb4188a3c401ca78 rootfs-etc-init.d-devmappings f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 rootfs-etc-init.d-swapfile 7b34e861bc4ec57d970d2a7aacca36e3c3742a63ff995af1336f80b666e4a38c1035b35e129322e0d62dc75011bfaf495eb2bcae5392f2bf39f1d7b1400afcce rootfs-etc-polkit-1-rules.d-50-org.freedesktop.NetworkManager.rules 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 rootfs-sbin-swapfile diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install index efa151dbf..e0d434414 100644 --- a/main/postmarketos-base/postmarketos-base.post-install +++ b/main/postmarketos-base/postmarketos-base.post-install @@ -5,7 +5,7 @@ setup-udev -n # Enable other OpenRC services -for service in devfs dmesg devmappings; do +for service in devfs dmesg; do rc-update -q add $service sysinit done for service in hwclock modules sysctl hostname bootmisc syslog; do diff --git a/main/postmarketos-base/rootfs-etc-init.d-devmappings b/main/postmarketos-base/rootfs-etc-init.d-devmappings deleted file mode 100644 index f529dfe83..000000000 --- a/main/postmarketos-base/rootfs-etc-init.d-devmappings +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run - -description="Add partition devmappings" - -depend() -{ - before root -} - -start() -{ - partitions="$(grep -v "loop\|ram" < /proc/diskstats |\ - sed 's/\(\s\+[0-9]\+\)\+\s\+//;s/ .*//;s/^/\/dev\//')" - echo "$partitions" | while read -r partition; do - case "$(kpartx -l "$partition" 2>/dev/null | wc -l)" in - 2) - einfo "Mount subpartitions of $partition" - # On some devices (e. g. htc vision) this kpartx command can fail - # with a non-zero exit code on some unrelated partitions, which would - # normally cause the loop to abort. But we still need to find the - # root partition, hence the "|| continue" - kpartx -afs "$partition" || continue - # Ensure that this was the *correct* subpartition - # Some devices have mmc partitions that appear to have - # subpartitions, but aren't our subpartition. - if blkid | grep -q "pmOS_boot"; then - break - fi - kpartx -d "$partition" - continue - ;; - *) - continue - ;; - esac - done -}