aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-11-07 12:58:30 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-11-07 13:02:58 +0200
commit0d30bbb7b85d758f86baf0490102a051cdc4538d (patch)
tree57e491b7174a843480218d20bef61975e43476e8
parent0b2bf3f586cce937af2e6cb0c704685071346549 (diff)
downloadalpine-conf-0d30bbb7b85d758f86baf0490102a051cdc4538d.tar.bz2
alpine-conf-0d30bbb7b85d758f86baf0490102a051cdc4538d.tar.xz
update-kernel: fix fakeroot argument handling as per fix for #3500
-rw-r--r--update-kernel.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/update-kernel.in b/update-kernel.in
index ff91dff..76107ca 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -136,10 +136,10 @@ fi
TMPDIR=$(mktemp -d /tmp/$SCRIPT.XXXXXX)
ROOT=$TMPDIR/root
BOOT=$ROOT/boot
-WRAPPER=eval
+WRAPPER=
_exec() {
- $WRAPPER "$1"
+ $WRAPPER "$@"
}
_apk() {
@@ -199,10 +199,10 @@ MODIMG=$FLAVOR.modloop.squashfs
mkdir $MODLOOP $STAGING
cp -a $ROOT/lib/modules $MODLOOP
cp -a $ROOT/lib/firmware $MODLOOP/modules
-_exec "mksquashfs $MODLOOP $STAGING/$MODIMG -comp xz"
+_exec mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz
-_exec "mkinitfs -q -b $ROOT -F '$features base squashfs' \
- -o '$STAGING/$FLAVOR.gz' '$KVER'"
+_exec mkinitfs -q -b $ROOT -F "$features base squashfs" \
+ -o "$STAGING/$FLAVOR.gz" "$KVER"
cp "$BOOT/vmlinuz$KVER_FLAVOR" "$STAGING/$FLAVOR"