mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-10 01:17:44 +03:00
test: on openSUSE the static linked version of busybox is named "busybox-static"
This commit is contained in:
parent
6c8ba239d5
commit
5231ec50e9
@ -11,7 +11,10 @@ TEST_NO_NSPAWN=1
|
||||
test_append_files() {
|
||||
(
|
||||
local workspace="${1:?}"
|
||||
dracut_install busybox
|
||||
|
||||
# On openSUSE the static linked version of busybox is named "busybox-static".
|
||||
busybox="$(type -P busybox-static || type -P busybox)"
|
||||
inst_simple "$busybox" "$(dirname $busybox)/busybox"
|
||||
|
||||
if selinuxenabled >/dev/null; then
|
||||
dracut_install selinuxenabled
|
||||
|
@ -7,7 +7,10 @@ set -o pipefail
|
||||
root="${1:?Usage $0 container-root}"
|
||||
mkdir -p "$root"
|
||||
mkdir "$root/bin"
|
||||
cp $(type -P busybox) "$root/bin"
|
||||
|
||||
# On openSUSE the static linked version of busybox is named "busybox-static".
|
||||
busybox="$(type -P busybox-static || type -P busybox)"
|
||||
cp "$busybox" "$root/bin/busybox"
|
||||
|
||||
os_release=$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release)
|
||||
ID_LIKE=$(awk -F= '$1=="ID_LIKE" { print $2 ;}' $os_release)
|
||||
|
Loading…
Reference in New Issue
Block a user