From 29307a3f26a1ec40bf008209ac0fdcc252596cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
Date: Sun, 29 Apr 2012 14:34:02 +0200
Subject: librebasebuilder: Avoid mkarchroot's configuration replacements,
 fixes #94.

---
 librebasebuilder | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 librebasebuilder

(limited to 'librebasebuilder')

diff --git a/librebasebuilder b/librebasebuilder
old mode 100644
new mode 100755
index 3eaadd8..8ba1315
--- a/librebasebuilder
+++ b/librebasebuilder
@@ -45,7 +45,7 @@ done
 tempdir=/home/chroot/base
 outdir=$(pwd)
 
-mkarchroot $tempdir mkinitcpio base sudo parted nano zile vi ed openssh
+mkarchroot -n $tempdir mkinitcpio base sudo parted nano zile vi ed openssh
 
 cd $tempdir
 
@@ -61,6 +61,24 @@ cat > etc/resolv.conf <<EOF
 # End of file
 EOF
 
+# From pacman-mirrorlist-libre-20120307-1.
+cat > etc/pacman.d/mirrorlist <<EOF
+# Parabola GNU/Linux - Last Updated: Wed Mar  7 17:33:36 GMT 2012
+
+# Atlanta, GA, USA
+# Responsible: belos
+Server = http://parabola.techno-geeks.org/$repo/os/$arch
+
+# Nuremberg, Germany
+# Responsible: johkra
+Server = http://parabolaweb.eu/$repo/os/$arch
+
+# UK
+# Responsible: Parabola Project
+Server = http://repo.parabolagnulinux.org/$repo/os/$arch
+
+EOF
+
 rm .arch-chroot
 
 tar cjf $outdir/parabola-mips64el-$(LC_ALL=C date -u +%Y%m%d).tar.bz2 .
-- 
cgit v1.2.3-2-g168b


From 8686618a45567fe903f1367980fb8c78f3e456b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
Date: Thu, 3 May 2012 20:48:50 +0200
Subject: Fix base mirrorlist.

---
 librebasebuilder | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'librebasebuilder')

diff --git a/librebasebuilder b/librebasebuilder
index 8ba1315..f7d3a25 100755
--- a/librebasebuilder
+++ b/librebasebuilder
@@ -61,21 +61,21 @@ cat > etc/resolv.conf <<EOF
 # End of file
 EOF
 
-# From pacman-mirrorlist-libre-20120307-1.
+# From pacman-mirrorlist-libre-20120307-1.  Remember to escape dollars.
 cat > etc/pacman.d/mirrorlist <<EOF
 # Parabola GNU/Linux - Last Updated: Wed Mar  7 17:33:36 GMT 2012
 
 # Atlanta, GA, USA
 # Responsible: belos
-Server = http://parabola.techno-geeks.org/$repo/os/$arch
+Server = http://parabola.techno-geeks.org/\$repo/os/\$arch
 
 # Nuremberg, Germany
 # Responsible: johkra
-Server = http://parabolaweb.eu/$repo/os/$arch
+Server = http://parabolaweb.eu/\$repo/os/\$arch
 
 # UK
 # Responsible: Parabola Project
-Server = http://repo.parabolagnulinux.org/$repo/os/$arch
+Server = http://repo.parabolagnulinux.org/\$repo/os/\$arch
 
 EOF
 
-- 
cgit v1.2.3-2-g168b