Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use /data instead of /cache #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use /data instead of /cache #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9482d93
Use /data instead of /cache
UniversalSuperBox Dec 26, 2017
5d41bf4
Accidentally changed /cache to /data/recovery in this case.
UniversalSuperBox Dec 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions halium-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ convert_android_img()
simg2img $SYSIMG $WORKDIR/system.img.raw
mkdir $TMPMOUNT
mount -t ext4 -o loop $WORKDIR/system.img.raw $TMPMOUNT
make_ext4fs -l 160M $WORKDIR/system.img $TMPMOUNT
IMAGE_SIZE=`wc -c < $SYSIMG`
make_ext4fs -l $IMAGE_SIZE $WORKDIR/system.img $TMPMOUNT
SYSIMAGE=$WORKDIR/system.img
else
SYSIMAGE=$SYSIMG
Expand All @@ -67,8 +68,8 @@ prepare_halium_system()
do_shell "rm -f /data/rootfs.img"
do_shell "dd if=/dev/zero of=/data/rootfs.img seek=500K bs=4096 count=0"
do_shell "mkfs.ext2 -F /data/rootfs.img"
do_shell "mkdir -p /cache/system"
do_shell "mount -o loop /data/rootfs.img /cache/system/"
do_shell "mkdir -p /data/recovery/system"
do_shell "mount -o loop /data/rootfs.img /data/recovery/system/"
}

cleanup()
Expand All @@ -84,8 +85,9 @@ cleanup()
cleanup_device()
{
[ -e $WORKDIR/device-clean ] && return
do_shell "umount /cache/system/ && rm -rf /cache/system"
do_shell "rm -f /recovery/$TARBALL"
do_shell "umount /data/recovery/system/ && rm -rf /data/recovery"
do_shell "rm -f /data/$TARBALL"
do_shell "sync"
[ -e $WORKDIR ] && touch $WORKDIR/device-clean 2>/dev/null || true
}

Expand Down Expand Up @@ -171,13 +173,13 @@ WORKDIR=$(mktemp -d /tmp/halium-install.XXXXX)
TMPMOUNT="$WORKDIR/tmpmount"

echo "transfering rootfs tarball ... "
adb push $TARPATH /recovery/
adb push $TARPATH /data/
echo "[done]"

if [ ! -z "$CUST_TARPATH" ]; then
CUST_TARBALL=$(basename $CUST_TARPATH)
echo -n "transferring custom tarball"
adb push $CUST_TARPATH /recovery/
adb push $CUST_TARPATH /data/
echo "[done]"
fi

Expand All @@ -186,8 +188,8 @@ prepare_halium_system
echo "[done]"

echo -n "unpacking rootfs tarball to system-image ... "
do_shell "cd /cache/system && zcat /recovery/$TARBALL | tar xf -"
do_shell "[ -e /cache/system/SWAP.swap ] && mv /cache/system/SWAP.swap /data/SWAP.img"
do_shell "cd /data/recovery/system && tar xf /data/$TARBALL"
do_shell "[ -e /data/recovery/system/SWAP.swap ] && mv /data/recovery/system/SWAP.swap /data/SWAP.img"
echo "[done]"

echo -n "adding android system image to installation ... "
Expand Down