chore(core): replcae linux-utils to self-build

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

images/cdi-controller/werf.inc.yaml

@@ -14,7 +14,6 @@ imageSpec:
 {{- define "cdi-controller-deps" -}}
 binaries:
   - /usr/bin/cdi-controller
-  - /usr/sbin/blockdev
 packages:
   - tar
 {{- end -}}
@@ -25,6 +24,12 @@ image: {{ $.ImageName }}-bins
 final: false
 fromImage: base-alt-p11-binaries
 import:
+- image: tools/util-linux
+  add: /
+  to: /relocate/usr
+  after: setup
+  includePaths:
+  - sbin/blockdev
 - image: cdi-artifact-cbuilder
   add: /bins
   to: /relocate/usr/bin

images/cdi-importer/werf.inc.yaml

@@ -23,12 +23,8 @@ binaries:
   - /usr/sbin/nbdkit
   - /usr/lib/nbdkit/filters/*
   - /usr/lib/nbdkit/plugins/*
-  # Mount
-  - /usr/bin/mount /usr/bin/umount
   # Sqlite libs
   - /usr/lib64/libsqlite3.so.0
-  # Block device binaries
-  - /usr/sbin/blockdev
   # CDI binaries
   - /usr/bin/cdi-containerimage-server /usr/bin/cdi-image-size-detection /usr/bin/cdi-importer /usr/bin/cdi-source-update-poller
 {{- end -}}
@@ -39,6 +35,14 @@ image: {{ $.ImageName }}-bins
 final: false
 fromImage: base-alt-p11-binaries
 import:
+- image: tools/util-linux
+  add: /
+  to: /relocate/usr
+  after: setup
+  includePaths:
+  - sbin/blockdev
+  - bin/mount
+  - bin/umount
 - image: cdi-artifact
   add: /cdi-binaries
   to: /usr/bin

images/dvcr-artifact/werf.inc.yaml

@@ -40,8 +40,8 @@ binaries:
 - /usr/share/file/magic
 - /usr/share/file/magic.mgc
 - /etc/magic
-- /usr/bin/mount
-- /usr/bin/umount
+# - /usr/bin/mount
+# - /usr/bin/umount
 - /usr/local/bin/dvcr-uploader
 - /usr/local/bin/dvcr-cleaner
 {{- end -}}
@@ -52,6 +52,13 @@ image: {{ $.ImageName }}-bins
 final: false
 fromImage: base-alt-p11-binaries
 import:
+- image: tools/util-linux
+  add: /
+  to: /relocate/usr
+  after: setup
+  includePaths:
+  - bin/mount
+  - bin/umount
 - image: {{ $.ImageName }}-builder
   add: /out
   to: /usr/local/bin

images/virt-handler/werf.inc.yaml

@@ -55,8 +55,8 @@ packages:
 - libnftnl
 - libjansson4
 binaries:
-- /usr/bin/mount
-- /usr/bin/umount
+# - /usr/bin/mount
+# - /usr/bin/umount
 - /usr/bin/getfacl
 - /usr/bin/setfacl
 - /usr/sbin/nft
@@ -73,6 +73,13 @@ image: {{ $.ImageName }}-bins
 final: false
 fromImage: base-alt-p11-binaries
 import:
+- image: tools/util-linux
+  add: /
+  to: /relocate/usr
+  after: setup
+  includePaths:
+  - bin/mount
+  - bin/umount
 - image: packages/binaries/xorriso
   add: /xorriso
   to: /xorriso

images/virt-launcher/werf.inc.yaml

@@ -148,7 +148,7 @@ binaries:
   # Numactl
   - /usr/bin/memhog /usr/bin/migratepages /usr/bin/migspeed /usr/bin/numactl /usr/bin/numastat
   # Hwclock
-  - /usr/sbin/hwclock
+  # - /usr/sbin/hwclock
 {{- end -}}
 
 {{ $virtLauncherDependencies := include "virt-launcher-dependencies" . | fromYaml }}
@@ -254,17 +254,24 @@ import:
   after: setup
   includePaths:
   - usr/bin/openssl
+- image: tools/util-linux
+  add: /
+  to: /relocate/usr
+  after: setup
+  includePaths:
+  - sbin/hwclock
 
+# GNU utilities
 - image: tools/coreutils
   add: /
   to: /relocate
   after: setup
   includePaths:
-    # GNU utilities
   - usr/bin/cp
   - usr/bin/sleep
   - usr/bin/coreutils
 
+
 - image: {{ $.ImageName }}-cbuilder
   add: /bins
   to: /relocate/usr/bin