minor fixes...

extra/pre-build.d/etc/locale.nopurge

@@ -0,0 +1,56 @@
+####################################################
+# This is the configuration file for localepurge(8).
+####################################################
+# Comment this to enable localepurge.
+# NO COMMENT IT IF YOU ARE NOT SURE WHAT ARE YOU DOING
+# THIS APP DO NOT ASK FOR CONFIRMATION
+
+#NEEDSCONFIGFIRST
+
+####################################################
+# Uncommenting this string enables removal of localized
+# man pages based on the configuration information for
+# locale files defined below:
+
+MANDELETE
+
+####################################################
+# Uncommenting this string causes localepurge to simply delete
+# locales which have newly appeared on the system without
+# bothering you about it:
+
+#DONTBOTHERNEWLOCALE
+
+#####################################################
+# Commenting out this string enables faster but less
+# accurate calculation of freed disk space:
+
+#QUICKNDIRTYCALC
+
+####################################################
+# Uncommenting this string enables display of freed disk
+# space if localepurge has purged any superfluous data:
+
+SHOWFREEDSPACE
+
+#####################################################
+# Commenting out this string disables verbose output:
+
+#VERBOSE
+
+#####################################################
+# You like Colors?
+
+NOCOLOR
+
+#####################################################
+# You can use the -v -d -nc options in command line.
+
+#####################################################
+# Following locales won't be deleted from this system
+# for example:
+en
+en_GB
+en_GB.UTF-8
+en_US
+en_US.UTF-8

extra/pre-build.d/root/packages.both

@@ -20,7 +20,7 @@ bin86
 bind-tools
 binutils
 bluez-utils
-#bonnie++ ## TODO: ugh. apacman has a new "regex mode"... that you can't disable. https://github.com/oshazard/apacman/issues/79
+bonnie++ ## TODO: ugh. apacman has a new "regex mode"... that you can't disable. https://github.com/oshazard/apacman/issues/79
 boxbackup-client
 boxbackup-server
 bozocrack-git

extra/pre-build.d/root/pre-build.sh

@@ -2,9 +2,6 @@
 
 source /etc/bash.bashrc
 
-# we need this fix before anything.
-dirmngr </dev/null > /dev/null 2>&1
-
 # Import settings.
 source /root/VARS.txt
 
@@ -13,6 +10,10 @@ exec 3>&1 4>&2
 trap 'exec 2>&4 1>&3' 0 1 2 3
 exec 1>/var/log/chroot_install.log 2>&1
 
+# we need this fix before anything.
+dirmngr </dev/null > /dev/null 2>&1
+locale-gen
+
 cleanPacorigs()
 {
 	for x in $(find /etc/ -type f -iname "*.pacorig");
@@ -20,7 +21,18 @@ cleanPacorigs()
 		mv -f ${x} ${x%%.pacorig}
 	done
 }
-
+getPkgList()
+{
+	if [ -f "${1}" ];
+	then
+		pkgfile=$(cat ${1})
+		echo "${pkgfile}" | \
+		sed -r -e '/^[[:space:]]*(#|$)/d' \
+			-e 's/[[:space:]]*#.*$//g' | \
+		tr '\n' ' ' | \
+		sed -re 's/([+\_])/\\\1/g'
+	fi
+}
 # NetworkManager is a scourge upon the earth that must be purged and cleansed.
 ln -s /dev/null /etc/systemd/system/NetworkManager.service
 ln -s /dev/null /etc/systemd/system/NetworkManager-dispatcher.service
@@ -64,7 +76,8 @@ else
 	TGT_ARCH='i686'
 fi
 # Install some stuff we need for the ISO.
-PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.both | tr '\n' ' ')
+#PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.both | tr '\n' ' ')
+PKGLIST=$(getPkgList /root/iso.pkgs.both)
 if [[ -n "${PKGLIST}" ]];
 then
 	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@@ -72,7 +85,8 @@ then
 	cleanPacorigs
 fi
 # And install arch-specific packages for the ISO, if there are any.
-PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.arch | tr '\n' ' ')
+#PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/iso.pkgs.arch | tr '\n' ' ')
+PKGLIST=$(getPkgList /root/iso.pkgs.arch)
 if [[ -n "${PKGLIST}" ]];
 then
 	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@@ -89,10 +103,16 @@ mv -f /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
 cleanPacorigs
 
 # And install EXTRA functionality packages, if there are any.
-PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.both | tr '\n' ' ')
+#PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.both | tr '\n' ' ')
+PKGLIST=$(getPkgList /root/packages.both)
 if [[ -n "${PKGLIST}" ]];
 then
-	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	echo "Now installing your extra packages. This will take a while and might appear to hang."
+	#yes 1 | apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	for p in ${PKGLIST};
+	do
+		apacman --noconfirm --noedit --skipinteg -S --needed ${p}
+	done
 	apacman --gendb
 	cleanPacorigs
 fi
@@ -127,17 +147,34 @@ fi
 cleanPacorigs
 mv -f /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
 # And install arch-specific extra packages, if there are any.
-PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.arch | tr '\n' ' ')
+#PKGLIST=$(sed -re '/^[[:space:]]*(#|$)/d' /root/packages.arch | tr '\n' ' ')
+PKGLIST=$(getPkgList /root/packages.arch)
 if [[ -n "${PKGLIST}" ]];
 then
-	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	#apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	for p in ${PKGLIST};
+	do
+		apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	done
 	apacman --gendb
 	cleanPacorigs
 fi
+# Run any arch-specific tasks here.
+if [ -f '/root/pre-build.arch.sh' ];
+then
+	cnt=$(sed -re '/^[[:space:]]*(#|$)/d' /root/pre-build.arch.sh | wc -l)
+	if [[ "${cnt}" -ge 1 ]];
+	then
+		/root/pre-build.arch.sh
+	fi
+	rm -f /root/pre-build.arch.sh
+fi
 # Cleanup
 #yes | pacman -Scc # doesn't parse yes(1) output correctly, it seems.
 # TODO: look into https://wiki.archlinux.org/index.php/Pacman/Tips_and_tricks#Removing_unused_packages_.28orphans.29
 paccache -rk0
+localepurge-config
+localepurge
 rm -f /root/.bash_history
 rm -f /root/.viminfo
 rm -f /root/apacman-*.pkg.tar.xz

extra/templates/BIOS/isolinux.cfg.arch.j2

@@ -71,3 +71,4 @@ LABEL {{ bdisk['uxname'] }}_{{ bitness }}
   ENDTEXT
 
 MENU END
+

extra/templates/BIOS/isolinux.cfg.multi.j2

@@ -108,3 +108,4 @@ LABEL {{ bdisk['uxname'] }}_32
   ENDTEXT
 
 MENU END
+

extra/templates/EFI/base.conf.j2

@@ -2,3 +2,4 @@ title   {{ bdisk['pname'] }} (Media)
 linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
 initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.img
 options archisobasedir={{ bdisk['name'] }} archisolabel={{ bdisk['name'] }}
+

extra/templates/EFI/loader.conf.j2

@@ -1,2 +1,3 @@
 timeout 3
 default {{ bdisk['uxname'] }}
+

extra/templates/EFI/ram.conf.j2

@@ -2,3 +2,4 @@ title   {{ bdisk['pname'] }} (RAM)
 linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
 initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.img
 options copytoram archisobasedir={{ bdisk['name'] }} archisolabel={{ bdisk['name'] }}
+

extra/templates/EFI/uefi1.conf.j2

@@ -1,2 +1,3 @@
 title   UEFI Shell (v1)
 efi    /EFI/shellx64_v1.efi
+

extra/templates/EFI/uefi2.conf.j2

@@ -1,2 +1,3 @@
 title   UEFI Shell (v2)
 efi    /EFI/shellx64_v2.efi
+

extra/templates/VARS.txt.j2

@@ -6,3 +6,4 @@ export DISTDESC='{{ bdisk['desc'] }}'
 export REGUSR='{{ bdisk['name']|lower }}'
 export REGUSR_PASS='{{ user['password'] }}'
 export ROOT_PASS='{{ bdisk['root_password'] }}'
+

extra/templates/iPXE/EMBED.j2

@@ -6,3 +6,4 @@ dhcp
 #imgverify vmlinuz path/to/vmlinuz.sig
 #imgverify initrd path/to/initrd.sig
 chain {{ ipxe['uri'] }}
+

extra/templates/iPXE/ssl/openssl.cnf

@@ -31,3 +31,4 @@ keyUsage               = critical,cRLSign,keyCertSign
 [ codesigning ]
 keyUsage                = digitalSignature
 extendedKeyUsage        = codeSigning
+