commit 34725fd10d5bb27d6b67c675e31ac6e68000dfd9
parent 61fc386a8eb6090af3d3bff9ff86542d192fa955
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Mon, 4 Jan 2021 06:00:24 +0100
Force more LVM options, change all executable paths to /bin
Diffstat:
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/checksums/boot-image.lst b/checksums/boot-image.lst
@@ -740,7 +740,7 @@ boot-image/bin/zcat l777 1 ../opt/busybox/bin/zcat
boot-image/boot l777 1 .
boot-image/etc d755 3
boot-image/etc/lvm d755 3
-boot-image/etc/lvm/lvm.conf f644 1 6a79d8ea1fa61dca55c53d7481c8aac7f44839642e45a539d8897a2dc1f56f3bf98b3ae07c34ae8491366af85d43c79bf01d3a86da916820343a44086b58ff45 boot-image/etc/lvm/lvm.conf
+boot-image/etc/lvm/lvm.conf f644 1 e1068f088a6c24fc027cad73d5c82bbdd7c169f3b24f95e20423ab74fd449095fe656fe1c126087d180092d69ffda97e9ea64cfd8aea818bba5335c417f494d0 boot-image/etc/lvm/lvm.conf
boot-image/etc/lvm/lvmlocal.conf f644 1 4b3b0b425ed91b9d075a9ec16cac1547065ce7fe27401cd1ec8b3b799249926a8bd2a92c09e55ab7b76d06ab8c0d93df8fff40b32c85b75f9913384aabd2f3d4 boot-image/etc/lvm/lvmlocal.conf
boot-image/etc/lvm/profile d755 2
boot-image/etc/lvm/profile/cache-mq.profile f444 1 38155af5cf6c15d8057ae886fb9b3779e13364211125d0d707dd30a4c4cf4ce5298c59aef6281846b55747626e7f55d6e34e2452d0a06effb1ebaac4b609870d boot-image/etc/lvm/profile/cache-mq.profile
@@ -1109,7 +1109,7 @@ boot-image/opt/lvm/bin/lvconvert l777 1 lvm
boot-image/opt/lvm/bin/lvcreate l777 1 lvm
boot-image/opt/lvm/bin/lvdisplay l777 1 lvm
boot-image/opt/lvm/bin/lvextend l777 1 lvm
-boot-image/opt/lvm/bin/lvm f555 1 b5a818daae531035ddfeab509f0cf3c81161ad8dcc09986149d51b23099ef6b6e9bd43a1951d26027cafa5e337550d7be7cc76387879336cdee7520568f6e85f boot-image/opt/lvm/bin/lvm
+boot-image/opt/lvm/bin/lvm f555 1 9a4a4170134d5c2e6b092b014e8fd348b669d3c11768727c7821ecb49db01df6f23bca93372b1d2c5ecc086d06f6f69500bd8933d616748d6c17a27b85087995 boot-image/opt/lvm/bin/lvm
boot-image/opt/lvm/bin/lvm.static l777 1 lvm
boot-image/opt/lvm/bin/lvmchange l777 1 lvm
boot-image/opt/lvm/bin/lvmconf f555 1 ddddf5ebee998600f667ef88dc798d3da8f28e26af850d016c2b302ba60a801cf2366b72d01b32e75ebf7249d6c70f2b0cb6a2d3f04f16c21586353246b052b7 boot-image/opt/lvm/bin/lvmconf
@@ -1154,7 +1154,7 @@ boot-image/opt/lvm/bin/vgscan l777 1 lvm
boot-image/opt/lvm/bin/vgsplit l777 1 lvm
boot-image/opt/lvm/etc d755 3
boot-image/opt/lvm/etc/lvm d755 3
-boot-image/opt/lvm/etc/lvm/lvm.conf f644 1 6a79d8ea1fa61dca55c53d7481c8aac7f44839642e45a539d8897a2dc1f56f3bf98b3ae07c34ae8491366af85d43c79bf01d3a86da916820343a44086b58ff45 boot-image/opt/lvm/etc/lvm/lvm.conf
+boot-image/opt/lvm/etc/lvm/lvm.conf f644 1 e1068f088a6c24fc027cad73d5c82bbdd7c169f3b24f95e20423ab74fd449095fe656fe1c126087d180092d69ffda97e9ea64cfd8aea818bba5335c417f494d0 boot-image/opt/lvm/etc/lvm/lvm.conf
boot-image/opt/lvm/etc/lvm/lvmlocal.conf f644 1 4b3b0b425ed91b9d075a9ec16cac1547065ce7fe27401cd1ec8b3b799249926a8bd2a92c09e55ab7b76d06ab8c0d93df8fff40b32c85b75f9913384aabd2f3d4 boot-image/opt/lvm/etc/lvm/lvmlocal.conf
boot-image/opt/lvm/etc/lvm/profile d755 2
boot-image/opt/lvm/etc/lvm/profile/cache-mq.profile f444 1 38155af5cf6c15d8057ae886fb9b3779e13364211125d0d707dd30a4c4cf4ce5298c59aef6281846b55747626e7f55d6e34e2452d0a06effb1ebaac4b609870d boot-image/opt/lvm/etc/lvm/profile/cache-mq.profile
diff --git a/checksums/sabotage-opt.sha512 b/checksums/sabotage-opt.sha512
@@ -329,10 +329,10 @@ bc23811daac3c7eccc57e6c8efff3df80ef7afa9f39542e3ab36e10242945072a99fbdeb48639e9d
a1dd236953f870a32f7d4157ef4882d82797098964dc5d4e02c2af87f197882b794fa4f67e23eb2d4dcd53d720cb7a79c6ad80338e2d58d899d6acbf7a3a5bb2 opt/lvm/bin/blkdeactivate
2e7eadc08d395c0cba67052d2710df2eb01cde9502c6c71cd2d86e72a5fdaf588356f4a4adf30d45a8462698ee8be1fd44158b2eb6b88c9a3b15cad9d84a0f98 opt/lvm/bin/dmsetup
252c6db8d15b04619c224d92134b12c6d53c1862785ad2ef53d46adc82994528bbb5592cae759c4bf2181ee81e6164b59914db7bcca183c86c0af03e50ab3683 opt/lvm/bin/fsadm
-b5a818daae531035ddfeab509f0cf3c81161ad8dcc09986149d51b23099ef6b6e9bd43a1951d26027cafa5e337550d7be7cc76387879336cdee7520568f6e85f opt/lvm/bin/lvm
+9a4a4170134d5c2e6b092b014e8fd348b669d3c11768727c7821ecb49db01df6f23bca93372b1d2c5ecc086d06f6f69500bd8933d616748d6c17a27b85087995 opt/lvm/bin/lvm
ddddf5ebee998600f667ef88dc798d3da8f28e26af850d016c2b302ba60a801cf2366b72d01b32e75ebf7249d6c70f2b0cb6a2d3f04f16c21586353246b052b7 opt/lvm/bin/lvmconf
e8f6e7f48ed41dde976fd22713681fec0467fc2763b5ce38f215fa64e96d9317decd1da353d3bb6fb94ff9cb8f309e070f25099d49e37356032eddd4292df393 opt/lvm/bin/lvmdump
-6a79d8ea1fa61dca55c53d7481c8aac7f44839642e45a539d8897a2dc1f56f3bf98b3ae07c34ae8491366af85d43c79bf01d3a86da916820343a44086b58ff45 opt/lvm/etc/lvm/lvm.conf
+e1068f088a6c24fc027cad73d5c82bbdd7c169f3b24f95e20423ab74fd449095fe656fe1c126087d180092d69ffda97e9ea64cfd8aea818bba5335c417f494d0 opt/lvm/etc/lvm/lvm.conf
4b3b0b425ed91b9d075a9ec16cac1547065ce7fe27401cd1ec8b3b799249926a8bd2a92c09e55ab7b76d06ab8c0d93df8fff40b32c85b75f9913384aabd2f3d4 opt/lvm/etc/lvm/lvmlocal.conf
38155af5cf6c15d8057ae886fb9b3779e13364211125d0d707dd30a4c4cf4ce5298c59aef6281846b55747626e7f55d6e34e2452d0a06effb1ebaac4b609870d opt/lvm/etc/lvm/profile/cache-mq.profile
45aed6017d864f24a9a0f199b398db5284f34ed71e81f17c41ebf0093e9a8c590e92fa825bc423afafad5fea534b152a088786ae8c25cc42dda38dd9605ffd55 opt/lvm/etc/lvm/profile/cache-smq.profile
diff --git a/clean b/clean
@@ -9,6 +9,7 @@ rm -rf boot-image sabotage-image local || exit $?
) || exit $?
(
cd musl-cross-make &&
+ make clean &&
git clean -xf &&
git checkout .
) || exit $?
diff --git a/sabotage-pkg/lvm b/sabotage-pkg/lvm
@@ -28,15 +28,17 @@ done
--with-optimisation="$optcflags $optldflags" \
--disable-readline \
--with-thin=internal \
- --with-thin-check=/sbin/thin_check \
- --with-thin-dump=/sbin/thin_dump \
- --with-thin-repair=/sbin/thin_repair \
- --with-thin-restore=/sbin/thin_restore \
+ --with-thin-check=/bin/thin_check \
+ --with-thin-dump=/bin/thin_dump \
+ --with-thin-repair=/bin/thin_repair \
+ --with-thin-restore=/bin/thin_restore \
+ --disable-thin-check-needs-check \
--with-cache=internal \
- --with-cache-check=/sbin/cache_check \
- --with-cache-dump=/sbin/cache_dump \
- --with-cache-repair=/sbin/cache_reparir \
- --with-cache-restore=/sbin/cache_restore \
+ --with-cache-check=/bin/cache_check \
+ --with-cache-dump=/bin/cache_dump \
+ --with-cache-repair=/bin/cache_reparir \
+ --with-cache-restore=/bin/cache_restore \
+ --disable-cache-check-needs-check \
--with-default-locking-dir=/run/lock/lvm \
--enable-static_link
