Fix incorrect usage of $@
"$@" works differently on ash and dash. `foo="$@"` assigns only the first item (according to IFS) to the variable on dash.
This commit is contained in:
parent
fb0ad9b107
commit
c50b9100a1
1 changed files with 3 additions and 3 deletions
|
@ -199,7 +199,7 @@ prepare_chroot() {
|
|||
# root of the image.
|
||||
rc_add() {
|
||||
local runlevel="$1"; shift # runlevel name
|
||||
local services="$@" # names of services
|
||||
local services="$*" # names of services
|
||||
|
||||
local svc; for svc in $services; do
|
||||
mkdir -p etc/runlevels/$runlevel
|
||||
|
@ -413,10 +413,10 @@ if [ -n "$SCRIPT" ]; then
|
|||
script_name="${SCRIPT##*/}"
|
||||
|
||||
if [ "$SCRIPT_CHROOT" = 'no' ]; then
|
||||
einfo "Executing script: $script_name $@"
|
||||
einfo "Executing script: $script_name $*"
|
||||
"$SCRIPT" "$@" || die 'Script failed'
|
||||
else
|
||||
einfo "Executing script in chroot: $script_name $@"
|
||||
einfo "Executing script in chroot: $script_name $*"
|
||||
mount --bind "${SCRIPT%/*}" mnt/
|
||||
chroot . sh -c "cd /mnt && ./$script_name \"\$@\"" -- "$@" \
|
||||
|| die 'Script failed'
|
||||
|
|
Loading…
Reference in a new issue