diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-10-24 18:50:17 +0300 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-11-03 11:40:55 +0200 |
commit | 89306b4ee7165cb3cc2cf518a983f59208d4e801 (patch) | |
tree | f554c4c3f7b5a28613de90821c2bf49d4506ab5d | |
parent | 476f698caf7159c15fbdf8ffd55f4d6e86b6819d (diff) | |
download | alpine-conf-89306b4ee7165cb3cc2cf518a983f59208d4e801.tar.bz2 alpine-conf-89306b4ee7165cb3cc2cf518a983f59208d4e801.tar.xz |
update-kernel: always use /tmp for temporary files
-rw-r--r-- | update-kernel.in | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/update-kernel.in b/update-kernel.in index 6c07ea3..4baf0da 100644 --- a/update-kernel.in +++ b/update-kernel.in @@ -108,7 +108,7 @@ clean_up() { ignore_sigs apk del -q $VIRTUAL - rm -fr "$TMPDIR" + rm -fr $TMPDIR } trap clean_up EXIT $SIGNALS @@ -125,14 +125,14 @@ if [ -z "$FLAVOR" ]; then [ "$FLAVOR" ] || FLAVOR=vanilla fi -TMPDIR=$(mktemp -dt $SCRIPT.XXXXXX) +TMPDIR=$(mktemp -d /tmp/$SCRIPT.XXXXXX) ROOT=$TMPDIR/root BOOT=$ROOT/boot _apk() { local cmd=$1 shift - apk $cmd -p "$ROOT" --keys-dir /etc/apk/keys \ + apk $cmd -p $ROOT --keys-dir /etc/apk/keys \ --repositories-file /etc/apk/repositories $* } @@ -149,9 +149,9 @@ extra_pkgs() { add_pkgs -U --initdb alpine-base $PACKAGES if [ "$BUILDDIR" ]; then - mkdir -p "$BOOT" + mkdir -p $BOOT make -C "$BUILDDIR" firmware_install install modules_install \ - INSTALL_MOD_PATH="$ROOT" INSTALL_PATH="$BOOT" + INSTALL_MOD_PATH=$ROOT INSTALL_PATH=$BOOT else add_pkgs "linux-$FLAVOR" linux-firmware if [ -z "$PACKAGES" ]; then @@ -163,20 +163,20 @@ fi KVER_FLAVOR= [ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR -KVER=$(basename $(ls -d "$ROOT"/lib/modules/*"$KVER_FLAVOR")) -depmod -b "$ROOT" "$KVER" +KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR")) +depmod -b $ROOT "$KVER" STAGING=$TMPDIR/boot MODLOOP=$TMPDIR/modloop MODIMG=$FLAVOR.modloop.squashfs -mkdir "$MODLOOP" "$STAGING" -cp -a "$ROOT/lib/modules" "$MODLOOP" -cp -a "$ROOT/lib/firmware" "$MODLOOP/modules" -mksquashfs "$MODLOOP" "$STAGING/$MODIMG" -comp xz +mkdir $MODLOOP $STAGING +cp -a $ROOT/lib/modules $MODLOOP +cp -a $ROOT/lib/firmware $MODLOOP/modules +mksquashfs $MODLOOP $STAGING/$MODIMG -comp xz -mkinitfs -q -b "$ROOT" -F "$features base squashfs" -o "$STAGING/$FLAVOR.gz" \ +mkinitfs -q -b $ROOT -F "$features base squashfs" -o "$STAGING/$FLAVOR.gz" \ "$KVER" cp "$BOOT/vmlinuz$KVER_FLAVOR" "$STAGING/$FLAVOR" @@ -187,7 +187,7 @@ if [ "$MNTDIR" ]; then remount -w fi -mv "$STAGING"/* "$DESTDIR" +mv $STAGING/* "$DESTDIR" if [ "$MNTDIR" ]; then set +e |