proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 09:19:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

templates: Fix busybox template

Browse Source 
Use `busybox --list`, and exclude the `busybox` applet if necessary.

Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>
This commit is contained in:
Thomas Hipp 2018-06-20 16:21:31 +02:00
parent d2ff3f89cc
commit 8b7681f354
No known key found for this signature in database
GPG Key ID: 993408D1137B7D51
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/lxc-busybox.in
View File

@ -187,9 +187,7 @@ configure_busybox()
# but that only works right in a chroot with busybox >= 1.19.0 # but that only works right in a chroot with busybox >= 1.19.0
( (
cd "${rootfs}/bin" || return 1 cd "${rootfs}/bin" || return 1
./busybox --help | grep 'Currently defined functions:' -A300 | \ ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox
grep -v 'Currently defined functions:' | tr , '\n' | \
xargs -n1 ln -s busybox
) )
# relink /sbin/init # relink /sbin/init
@ -232,7 +230,7 @@ EOF
usr/lib \ usr/lib \
lib64 \ lib64 \
usr/lib64" usr/lib64"
for dir in ${libdirs}; do for dir in ${libdirs}; do
if [ -d "/${dir}" ] && [ -d "${rootfs}/${dir}" ]; then if [ -d "/${dir}" ] && [ -d "${rootfs}/${dir}" ]; then
echo "lxc.mount.entry = /${dir} ${dir} none ro,bind 0 0" >> "${path}/config" echo "lxc.mount.entry = /${dir} ${dir} none ro,bind 0 0" >> "${path}/config"