From 71f12032d11fd560d2b712c6ffd8bde4d0a00193 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Tue, 6 Feb 2018 20:35:54 +0100
Subject: [PATCH] increased swap space, now using parabola release tarball by
 default

---
 README          | 14 ++++++--------
 create.sh       |  4 ++--
 make_tarball.sh |  1 -
 src/stage1.sh   |  4 ++--
 src/stage2.sh   |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 4981168..86afc4e 100644
--- a/README
+++ b/README
@@ -13,16 +13,14 @@ tarballs.
 to create a new virtual machine image, run
   $> sudo ./create.sh
 
-by default, the creation script will perform a full bootstrap, installing an
-archlinuxarm release tarball and migrating the installed system to parabola
-in-place. This behaviour can be changed by setting the environment variable
-NOBOOTSTRAP to 1:
+by default, the creation script will use a ParabolaArm release tarball to
+create the virtual machine.  Alternatively, to install an archlinuxarm tarball
+and migrating the installed system to parabola in-place, set the environment
+variable ARCHBOOTSTRAP to 1:
 
-  $> sudo NOBOOTSTRAP=1 ./create.sh
+  $> sudo ARCHBOOTSTRAP=1 ./create.sh
 
-In this case, a parabola arm release tarball is used instead.
-
-optionally, to create a new virtual machine with a packaging environment, set
+Optionally, to create a new virtual machine with a packaging environment, set
 the environment variable DEVSETUP to 1:
 
   $> sudo DEVSETUP=1 ./create.sh
diff --git a/create.sh b/create.sh
index ebb4cfb..f3e4e6d 100755
--- a/create.sh
+++ b/create.sh
@@ -30,7 +30,7 @@ die() { echo "$*" 1>&2 ; exit 1; }
 export OUTFILE="${OUTFILE:-armv7h.img}"
 export SIZE="${SIZE:-64G}"
 export ARCHTARBALL="${ARCHTARBALL:-ArchLinuxARM-armv7-latest.tar.gz}"
-export PARABOLATARBALL="${PARABOLATARBALL:-ParabolaARM-armv7-latest.tar.gz}"
+export PARABOLATARBALL="${PARABOLATARBALL:-ParabolaARM-armv7-LATEST.tar.gz}"
 
 export _builddir=build
 mkdir -p "$_builddir"
@@ -41,7 +41,7 @@ export _outfile="$_builddir/$(basename "$OUTFILE")"
 # prepare the empty image
 ./src/stage0.sh
 
-if [ -z "${NOBOOTSTRAP:-}" ]; then
+if [ -n "${ARCHBOOTSTRAP:-}" ]; then
   # install a clean archlinux-arm system in the empty image
   wget -nc http://os.archlinuxarm.org/os/$ARCHTARBALL
   TARBALL="$ARCHTARBALL" ./src/stage1.sh
diff --git a/make_tarball.sh b/make_tarball.sh
index fb65d46..56f56f4 100755
--- a/make_tarball.sh
+++ b/make_tarball.sh
@@ -52,7 +52,6 @@ sudo mount ${_loopdev}p1 "$_rootdir"/boot
 rm -fvr \
   "$_rootdir"/root/.ssh \
   "$_rootdir"/etc/ssh/ssh_host_* \
-  "$_rootdir"/etc/pacman.d/gnupg \
   "$_rootdir"/var/log/* \
   "$_rootdir"/var/cache/* \
   "$_rootdir"/lost+found
diff --git a/src/stage1.sh b/src/stage1.sh
index d2380f6..595ec5a 100755
--- a/src/stage1.sh
+++ b/src/stage1.sh
@@ -46,8 +46,8 @@ parted -s $_loopdev \
   mklabel gpt \
   mkpart ESP fat32 1MiB 513MiB \
   set 1 boot on \
-  mkpart primary linux-swap 513MiB 1537MiB \
-  mkpart primary ext4 1537MiB 100%
+  mkpart primary linux-swap 513MiB 4609MiB \
+  mkpart primary ext4 4609MiB 100%
 
 # create filesystems
 mkfs.vfat -F 32 ${_loopdev}p1
diff --git a/src/stage2.sh b/src/stage2.sh
index c46b281..ec8a721 100755
--- a/src/stage2.sh
+++ b/src/stage2.sh
@@ -78,7 +78,7 @@ sed -i 's/^Architecture.*/Architecture = armv7h/' /etc/pacman.conf
 pacman --noconfirm -Syy
 pacman --noconfirm -S pacman
 mv /etc/pacman.conf{.pacnew,}
-pacman --noconfirm -Syuu
+pacman --noconfirm -Syyuu
 pacman --noconfirm -S your-freedom
 yes | pacman -S linux-libre