fixing bug- no modules in build after switching to stock

see https://projects.archlinux.org/archiso.git/commit/?id=a637bdb8574168ab4cddef13d5de7f458650bda5, changes to archiso/initcpio/hooks/archiso

README

@@ -6,13 +6,6 @@
 #####    Built upon my (Brent's) 'BDisk' ISO-building framework (http://bdisk.square-r00t.net)                                   #####
 ######################################################################################################################################
 
-## Why Arch? ##
-Because it's a largely easy-to-use, well-documented (https://wiki.archlinux.org/) distro. It's no-frills and incredibly
-flexible/customizable, and can be made rather slim. It's also very friendly to run as a chroot inside any other distro.
-
-All commands below should be issued in the root working directory of this git repository. (For me, this is
-/opt/dev/work/BDisk but this may be entirely different for you, depending on where you cloned the repository to.)
-
 !!!!!! WARNING !!!!!!!
 I do NOT recommend running this on a machine that is using wireless, as it will download a LOT of data.
 If you ignore this warning, be prepared to explain to anyone you share your wifi with why Facebook takes 20 seconds to load,
@@ -26,6 +19,35 @@ disabled by default).
 Till then, sorry for the inconvenience.
 !!!!!!!!!!!!!!!!!!!!!!
 
+
+## Why Arch? ##
+Because it's a largely easy-to-use, well-documented (https://wiki.archlinux.org/) distro. It's no-frills and incredibly
+flexible/customizable, and can be made rather slim. It's also very friendly to run as a chroot inside any other distro.
+
+All commands below should be issued in the root working directory of this git repository. (For me, this is
+/opt/dev/work/BDisk but this may be entirely different for you, depending on where you cloned the repository to.)
+
+## Features ##
+-Builds a hybrid ISO
+	A hybrid ISO allows one to simply dd if=/path/to/file.iso of=/dev/<USB STICK> instead of using e.g. UNetBootin while also
+	working with traditional optical media.
+-Builds a dual-architecture ISO
+	BDisk allows you to create both a 32-bit and 64-bit ISO, either separately or part of the same ISO, and customize each
+	based on architecture.
+-Supports both BIOS and UEFI booting in one ISO
+	It can be difficult finding a live distribution that offers full UEFI support, which is frustrating if you're trying to
+	install e.g. UEFI-enabled Gentoo, for instance. Not only does this ISO framework build support for both in the same ISO,
+	but it also includes some UEFI shells as well.
+-Arch install scripts
+	This live distro, assuming default packages are kept, should be 100% compatible with the Arch install guide
+	(https://wiki.archlinux.org/index.php/installation_guide).
+-Allows for non-interactive runs, is git-friendly, logs all output while keeping the runtime output relatively sane, and allows
+	the inclusion of arbitrary files in the finished filesystem.
+-TFP/HTTP/PXE support
+	It will automatically copy over some files to tftpboot/ and http/, greatly saving some time in PXE booting. It also
+	supports, by default, booting PXE with HTTP fetching for the squashed filesystems. Say goodbye to NFS.
+-Automatic versioning based on git tags
+
 ## Prerequisites ##
 -At least ~20Gb disk space free (remember, you need room for not only four chroots (one developing and one staging for i686/x86_64),
 but also disk space for working, the finished ISO(s), etc.)
@@ -47,98 +69,89 @@ squashfs-tools
 xorriso (in RPMForge repo for CentOS 7)
 xz
 
-and *probably* a few others. the scripts run with set -e for the most part, so if something's missed, you'll know.
-oh, you will know.
+and *probably* a few others. The scripts run with set -e for the most part, so if something's missed, you'll know.
+Oh, you will know.
 
 
+## Configuration ##
+See extra/build.conf.sample. Copy to <PROJECT ROOT>/build.conf if you wish to modify any of the values, otherwise the defaults
+will be used. I recommend enabling I_AM_A_RACECAR if you have the hardware for it, as it can speed things up greatly.
+The file should be well-commented.
+
+Also note the following files/paths:
+
+-bin:
+	The building/cleaning scripts.
+--/build.sh:
+	Supports several modes:
+	bin/build.sh update		Updates existing chroots (does an apacman -Syyu --devel, copies over fresh files from
+					overlays, etc.)
+	bin/build.sh chroot		Chroots you into the runtime for any interactive tasks you may wish to run.
+	bin/build.sh build		(DEFAULT) Builds the chroots, ISO, etc.
+	bin/build.sh all		Same as bin/build.sh build
+	bin/build.sh			Same as bin/build.sh build
+--/clean.sh:
+	Supports several modes:
+	bin/clean.sh all		Clears everything out to a near-pristine working state. For convenience, it DOES NOT clear
+					out build.conf.
+	bin/clean.sh chroot		Clears out only the working spaces, old ISOs, and the chroot directories. Hnady if you want to "start
+					fresh" but still want to keep logs from earlier runs.
+	bin/clean.sh squash		Clears out only the working spaces and old ISOs. Useful if you're on a slow connection and would
+					rather update the chroots instead of downloading filesystem snapshots again.
+	bin/clean.sh			Only clears workspaces and old ISOs.
+--/mirror.lst.sh:
+	Builds a fresh mirror list. Note that it is US based.
+
+-extra:
+	Supporting files for the base building system (mirrorlist, etc.).
+--/${UXNAME}.png:
+	A 640x480 8-bit RGBA colour PNG which will be used as the background for the bootsplash (if booting via BIOS and not UEFI)
+--/bootstrap/apacman-*.tar.xz:
+	An AUR-enabled package manager. Necessary for AUR support.
+--/build.conf.sample:
+	Sample/default config file. If you wish to override any settings, copy to <PROJECT ROOT>/build.conf and make your changes there.
+	First run of the script will do this for you automatically.
+--/mirrorlist:
+	A set of default mirrorlists to be used for the chroots during building and runtime. Feel free to replace with your own
+	mirrorlist (current list is speed-optimized for east coast US).
+--/packages.32:
+	A list of packages to install in the base system (32-bit runtime only).
+--/packages.64:
+	A list of packages to install in the base system (64-bit runtime only).
+--/packages.both:
+	A list of packages to install in the base system (these should be installed and are supported on both 64- AND 32-bit)
+--/pre-build.d:
+	Contains files injected into the system. Both 64-bit and 32-bit environments. Note: be sure to place them in hierarchical order
+	(e.g. if you wish to have a file at /usr/foo/bar, you will need to place it in <PROJECT ROOT>/extra/pre-build.d/usr/foo/bar)
+--/pre-build.d/32:
+	Same as above, but only for 32-bit environments.
+--/pre-build.d/64:
+	You get the picture.
+-http:
+	Files to be hosted for PXE booting the environment go here. Set this as your root/DocumentRoot in nginx/Apache (or, ideally,
+	copy over to a separate webserver). This directory is wiped out during any bin/clean.sh operation.
+-lib:
+	The "guts" of BDisk.
+-logs:
+	Here you can find full output of the runs. They are prefixed with run's PID number, and named after the function they occur in.
+-overlay:
+	These files are applied AFTER the initial setup of the chroots. Same hierarchy rules as extra/pre-build.d.
+-README:
+	This file.
+-tftpboot:
+	Files to be served via TFTP for PXE booting. This directory is wiped out during any bin/clean.sh operation.
+-TODO:
+	This is just what I'm using to track stuff I want to add.
+
+
+You may notice other files come and go; they're mostly there for extra goodies/used to determine other things.
+
 ## (Re)Building ##
-$ sudo bin/build.sh
+Building must be done as root, and on an Arch x86_64 system (future versions will allow for non-Arch distros).
+
+# bin/build.sh
 
 Yeah. It's that easy. The finished product is in iso/.
 
-Build output should look something like this:
-
-
-[root@dawid BDisk]# time nice -n "-19" bin/build.sh 
-You have not configured a build.conf OR you are not running from the project's root directory (the git repository's working directory).
- If you are indeed in the correct directory, you may copy the sample at extra/build.conf.sample,
- edit it for appropriate values, and copy to <PROJECT ROOT>/build.conf
-For now, though, I am copying over the default.
-Checking directory structure and creating lockfile at /opt/dev/work/BDisk/lockfile.lck...
-/opt/dev/work/BDisk/root.i686 does not exist - creating.
-/opt/dev/work/BDisk/root.x86_64 does not exist - creating.
-/opt/dev/work/BDisk/build32 does not exist - creating.
-/opt/dev/work/BDisk/build64 does not exist - creating.
-/opt/dev/work/BDisk/iso does not exist - creating.
-/opt/dev/work/BDisk/temp/bdisk does not exist - creating.
-/opt/dev/work/BDisk/temp/FPOS does not exist - creating.
-/opt/dev/work/BDisk/src does not exist - creating.
-/opt/dev/work/BDisk/tftpboot does not exist - creating.
-/opt/dev/work/BDisk/http/FPOS does not exist - creating.
-/opt/dev/work/BDisk/logs does not exist - creating.
-No existing chroot environment found. Creating...
-Now importing settings/variables.
-Checking/fetching snapshots...
-Extracting snapshots. This will take a while...
-Configuring snapshots...
-Initializing chroots...
-Prepping /opt/dev/work/BDisk/root.i686. This will take a while...
-...Key initializing...Done.
-...Importing keys...Done.
-...Installing base packages...Done.
-...Upgrading any outdated packages...Done. Finishing/cleaning up...
-Prepping /opt/dev/work/BDisk/root.x86_64. This will take a while...
-...Key initializing...Done.
-...Importing keys...Done.
-...Installing base packages...Done.
-...Upgrading any outdated packages...Done. Finishing/cleaning up...
-Installing common packages...
-...Packages installing to /opt/dev/work/BDisk/root.i686...Compiling kernel sources...Regular packages......Creating bdisk user...Done.
-Done.
-...Packages installing to /opt/dev/work/BDisk/root.x86_64...Compiling kernel sources...Regular packages......Creating bdisk user...Done.
-Done.
-Installing packages for 32-bit...
-Done.
-Installing packages for 64-bit...
-Done.
-Syncing overlay...
-Done.
-Chroot setup complete.
-Checking for appropriate kernel version and mksquashfs version...
-Data is not sync'd to buildroot; syncing...
-Syncing important files to /opt/dev/work/BDisk/build64 for building the squashed filesystem (this may take some time)...
-Compressing the package DB...
-cp: ‘/opt/dev/work/BDisk/build64/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/build64/etc/localtime’ are the same file
-cp: ‘/opt/dev/work/BDisk/root.x86_64/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/root.x86_64/etc/localtime’ are the same file
-Cleaning up unnecessary cruft in /opt/dev/work/BDisk/build64...
-[64-bit] Now generating the squashed image (if we need to) and hashes. This may take some time.
-[64-bit] Squashing filesystem. This can take a while depending on the size of your chroot(s).
-[64-bit] Copying files for PXE, and ISO building, please be patient.
-Data is not sync'd to buildroot; syncing...
-Syncing important files to /opt/dev/work/BDisk/build32 for building the squashed filesystem (this may take some time)...
-Compressing the package DB...
-cp: ‘/opt/dev/work/BDisk/build32/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/build32/etc/localtime’ are the same file
-cp: ‘/opt/dev/work/BDisk/root.i686/usr/share/zoneinfo/EST5EDT’ and ‘/opt/dev/work/BDisk/root.i686/etc/localtime’ are the same file
-Cleaning up unnecessary cruft in /opt/dev/work/BDisk/build32...
-[32-bit] Now generating the squashed image (if we need to) and hashes. This may take some time.
-[32-bit] Squashing filesystem. This can take a while depending on the size of your chroot(s).
-[32-bit] Copying files for PXE, and ISO building, please be patient.
-Building the actual .iso image. This may take a while.
-Setting up EFI stuff...
-Checking/fetching UEFI shells...
-Generating the EFI embedded FAT filesystem...
-EFI configuration complete...
-ISO generated; size is 1.3G.
-You can find it at /opt/dev/work/BDisk/iso/bdisk-v1.04-a8666bd-any.iso
-Cleaning up some stuff leftover from the build...
-Finished successfully!
-
-real    250m48.104s
-user    163m6.046s
-sys     8m26.573s
-
-
-
-
 
 If you want more verbosity, check out the logs/ directory.

extra/mirrorlist

@@ -1,7 +1,7 @@
-# Server list generated by rankmirrors on 2015-01-10
+# Server list generated by rankmirrors on 2015-02-26
 Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
-Server = http://mirror.yellowfiber.net/archlinux/$repo/os/$arch
-Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
-Server = http://mirror.us.leaseweb.net/archlinux/$repo/os/$arch
-Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch
 Server = http://mirror.umd.edu/archlinux/$repo/os/$arch
+Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
+Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch
+Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
+Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch

extra/packages.both

@@ -115,6 +115,7 @@ hddtemp
 hdparm
 hexcurse
 hexedit
+hfsprogs
 hfsutils
 htop
 httping
@@ -191,6 +192,7 @@ netctl
 netselect
 nettle
 networkmanager
+networkmanager-pptp
 nginx-devel
 ngrep
 nmap

extra/pre-build.d/32/etc/pacman.conf

@@ -89,6 +89,6 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[archlinuxfr]
-SigLevel = Never
-Server = http://repo.archlinux.fr/$arch
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/64/etc/pacman.conf

@@ -98,6 +98,6 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[archlinuxfr]
-SigLevel = Never
-Server = http://repo.archlinux.fr/$arch
+#[archlinuxfr]
+#SigLevel = Never
+#Server = http://repo.archlinux.fr/$arch

extra/pre-build.d/etc/customizepkg.d/linux

@@ -1,89 +0,0 @@
-#!/bin/sh
-# change some versions around
-sed -i -e 's/^\(pkgbase=linux[[:space:]]*\)/#\1/g' ${1}
-sed -i -e 's/^#\(pkgbase=linux-\)custom.*$/\1BDisk/g' ${1}
-sed -i -e '/^_kernelname/a KERNVER=$(echo ${pkgver} | sed -e "s/\\\([0-9]\\\.[0-9]*\\\).*$/\\\1/")' ${1}
-sed -i -e "s/^\(makedepends=.*\))$/\1 'rsync' 'git')/g" ${1}
-##cp linux.preset linux-BDisk.preset
-##sed -i -e 's#^[[:space:]]*install\ -D\ -m644\ "${srcdir}/linux.preset".*$#install -D -m644 "${srcdir}/linux-BDisk.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"#g' ${1}
-##sed -i -e "s/\ 'fallback'//g" \
-##-e '/^fallback/d' \
-##-e '/^$/d' \
-##-e '/^[[:space:]]*$/d' \
-##-e 's#^\(default_image="/boot/initramfs-linux\).*#\1-BDisk"/g' linux-BDisk.preset
-##-e 's/^\(ALL_kver="/boot/vmlinuz-linux\)\(.*\)/\1-BDisk\2/g' linux-BDisk.preset
-
-# add source for aufs3
-## 12.07.2014 - remove the "git checkout <SPECIFIC COMMIT HASH>" once a bug is fixed. currently fails with:
-##  LD      fs/aufs/built-in.o
-##  CC [M]  fs/aufs/module.o
-##In file included from fs/aufs/module.c:24:0:
-##fs/aufs/inode.h:307:12: error: function declaration isn't a prototype
-##[-Werror=strict-prototypes]
-## AuStubInt0(au_cpup_xattr, h_dst, h_src, ignore_flags)
-##            ^
-##fs/aufs/aufs.h:28:21: note: in definition of macro 'AuStub'
-##  static inline type name(__VA_ARGS__) { body; }
-##                     ^
-##fs/aufs/inode.h:307:1: note: in expansion of macro 'AuStubInt0'
-## AuStubInt0(au_cpup_xattr, h_dst, h_src, ignore_flags)
-## ^
-##cc1: some warnings being treated as errors
-##scripts/Makefile.build:257: recipe for target 'fs/aufs/module.o' failed
-##make[2]: *** [fs/aufs/module.o] Error 1
-##scripts/Makefile.build:404: recipe for target 'fs/aufs' failed
-##make[1]: *** [fs/aufs] Error 2
-##Makefile:929: recipe for target 'fs' failed
-##make: *** [fs] Error 2
-sed -i -e '/^prepare()\ {/a\
-\ git clone git:\/\/aufs.git.sourceforge.net\/gitroot\/aufs\/aufs3-standalone.git aufs3  > \/dev\/null 2>&1\
-\ cd aufs3\
-\ git checkout aufs${KERNVER} > \/dev\/null 2>&1\
-\ git checkout c75f6dddc1c58950c76cc1581e4b4c7ac8365bff > \/dev\/null 2>&1\
-\ cd ..\/' ${1}
-#sed -i -e 's/^\(_kernelname=\).*$/\1"-BDisk"/' ${1}
-sed -i -e '/^[[:space:]]*patch.*pkgver}"$/i rsync -a ../aufs3/Documentation/. Documentation/. ; rsync -a ../aufs3/fs/. fs/. ; cp -a ../aufs3/include/uapi/linux/aufs_type.h include/uapi/linux/. \
-\ for i in $(ls -1 ../aufs3/*.patch) ; do patch -p1 -i ../aufs3/${i} ; done' ${1}
-# and we need to be sure to build aufs3-util
-#sed -i -e '/^[[:space:]]*install\ -D\ -m644\ vmlinux.*$/a\
-#\ git clone git:\/\/git.code.sf.net\/p\/aufs\/aufs-util > \/dev\/null 2>&1\
-#\ cd aufs-util\
-#\ UTILVER=$(git branch -a | grep -v master | sort -nr | grep -v rcN | head -n1 | cut -f3 -d"\/")\
-#\ git checkout ${UTILVER} > \/dev\/null 2>&1\
-#\ make' ${1}
-
-# and configure the kernel. this gets messy.
-#-e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=m/g" \\\
-sed -i -e '/^[[:space:]]*make\ prepare.*$/i yes "" | make olddefconfig >/dev/null' ${1}
-sed -i -e '/^[[:space:]]*make\ prepare.*$/a sed -i \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BRANCH_MAX_127\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_SBILIST\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HFSNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_EXPORT\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_INO_T_64\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FHSM\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_RDU\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BDEV_LOOP\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_511\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_1023\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_32767\\\).*$/\\\1=n/g" ${srcdir}/../config{,.x86_64}' ${1}
-# yes, we have to do this twice. with a hammer.
-sed -i -e '/^[[:space:]]*make\ prepare.*$/a sed -i \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FS\\\).*$/\\\1=m/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BRANCH_MAX_127\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_SBILIST\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_HFSNOTIFY\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_EXPORT\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_INO_T_64\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_FHSM\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_RDU\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(CONFIG_AUFS_BDEV_LOOP\\\).*$/\\\1=y/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_511\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_1023\\\).*$/\\\1=n/g" \\\
--e "s/^#[[:space:]]\\\(AUFS_BRANCH_MAX_32767\\\).*$/\\\1=n/g" .config' ${1}
-sed -i -e 's/^\([[:space:]]*yes\ ""\ |\ \)make\ config/\1make olddefconfig/' ${1}
-# and we have to edit the linux.install as well.
-sed -i -e 's/^\(KERNEL_NAME=\).*$/\1-BDisk/g' linux.install*

extra/pre-build.d/etc/mkinitcpio.conf

@@ -3,7 +3,7 @@
 # run.  Advanced users may wish to specify all system modules
 # in this array.  For instance:
 #     MODULES="piix ide_disk reiserfs"
-MODULES="aufs ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
+MODULES="overlay ata_generic ata_piix loop nls_cp437 ext4 raid456 vfat netconsole"
 
 # BINARIES
 # This setting includes any additional binaries a given user may

extra/pre-build.d/etc/mkinitcpio.d/linux.preset

@@ -0,0 +1,15 @@
+# mkinitcpio preset file for the 'linux' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux"
+
+#PRESETS=('default' 'fallback')
+PRESETS=('default')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+#fallback_image="/boot/initramfs-linux-fallback.img"
+#fallback_options="-S autodetect"

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

@@ -4,24 +4,5 @@ set -e
 
 apacman --noconfirm --noedit -S --needed customizepkg-scripting
 
-echo -n "Compiling kernel sources..."
-set +e
-## Uncomment below and remove manual ABS/makepkg when https://github.com/oshazard/apacman/issues/2 is fulfulled
-#apacman --noconfirm --noedit -S --needed linux
-
-export ABSROOT=/tmp
-abs core/linux
-
-cd /tmp/core/linux
-customizepkg --modify
-
-chown -R nobody:nobody /tmp/core/linux
-sudo -u nobody makepkg
-set -e
-
-for i in $(ls -1 linux-*.pkg.tar.xz | sort);
-do
- pacman --noconfirm -U ${i}
-done
 
 echo "Done."

extra/pre-build.d/usr/lib/initcpio/hooks/archiso-custom

@@ -11,19 +11,13 @@ _mnt_fs() {
     ro_dev=$(losetup --find --show --read-only "${img}")
     echo ${ro_dev} >> /run/archiso/used_block_devices
     ro_dev_size=$(blockdev --getsz ${ro_dev})
-    if [[ "${cowfile_size}" == "100" ]]; then
-        rw_dev_size=${ro_dev_size}
-    else
-        # size calculation done in this way to avoid integer overflow when ro_dev_size is > 10.2G
-        rw_dev_size=$((ro_dev_size/100*cowfile_size))
-    fi
 
     if [[ "${cow_persistent}" == "P" ]]; then
         if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
             msg ":: Found '/run/archiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
         else
             msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
-            dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+            truncate -s "${cowfile_size}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
         fi
     else
         if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
@@ -31,13 +25,13 @@ _mnt_fs() {
             rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
         fi
         msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
-        dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+        truncate -s "${cowfile_size}" "/run/archiso/cowspace/${cow_directory}/${img_name}.cow"
     fi
 
     rw_dev=$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow")
     echo ${rw_dev} >> /run/archiso/used_block_devices
 
-    echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name}
+    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8"
 
     _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w"
     echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/archiso/used_block_devices
@@ -108,9 +102,7 @@ run_hook() {
     [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
     [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}"
     if [[ -z "${cowfile_size}" ]]; then
-        cowfile_size="100"
-    else
-        cowfile_size=${cowfile_size/%}
+        cowfile_size="256M"
     fi
 
     if [[ -n "${cow_label}" ]]; then
@@ -176,7 +168,7 @@ archiso_mount_handler() {
 
     _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs"
     #_mnt_fs "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
-    mount --bind "run/archiso/sfs/airootfs" "/new_root"
+    mount --bind "/run/archiso/sfs/airootfs" "/new_root"
 
     if [[ "${copytoram}" == "y" ]]; then
         umount /run/archiso/bootmnt

extra/pre-build.d/usr/lib/initcpio/hooks/livecd

@@ -1,15 +1,18 @@
 # vim: set ft=sh:
 
 run_cleanuphook () {
-        msg ":: Mounting aufs on / with tmpfs=rw, ${root}=ro ..."
-        modprobe aufs
+        msg ":: Mounting OverlayFS on / with tmpfs=rw, ${root}=ro ..."
+        modprobe overlay
 
-	echo "Now attempting aufs mount..."
+	echo "Now attempting overlay mount..."
 
-	mkdir /new_root.hw
-	mount --move /new_root /new_root.hw
-	mkdir /dev/shm
-	mount -t tmpfs none /dev/shm
-	mount -t aufs none /new_root -o dirs=/dev/shm=rw:/new_root.hw=ro -o noatime
+	#mkdir /new_root.hw
+	mkdir -p /run/archiso/cowspace/upperdir /run/archiso/cowspace/workdir
+	#mount --move /new_root /new_root.hw
+	#mkdir /dev/shm
+	#mount -t tmpfs none /dev/shm
+	#mount -t overlay overlay -olowerdir=/new_root.hw,upperdir=/new_root,workdir=/dev/shm -o noatime
+	umount -l /new_root > /dev/null 2>&1
+	mount -t overlay -o lowerdir=/run/archiso/sfs/airootfs,upperdir=/run/archiso/cowspace/upperdir,workdir=/run/archiso/cowspace/workdir airootfs /new_root
 	pkill -9 dropbear #kill SSH (in preparation for the live system starting ssh on port 22
 }

extra/pre-build.d/usr/lib/initcpio/install/livecd

@@ -4,7 +4,7 @@ build()
 {
 	add_module 'squashfs'
 	add_module 'loop'
-	add_module 'aufs'
+	add_module 'overlay'
 
         add_binary "sed"
         add_binary "pkill"
@@ -16,6 +16,6 @@ build()
 help() 
 {
         cat <<HELPEOF
-Mount a squashed flat-file directory with AUFS3 on /
+Mount a squashed flat-file directory with OverlayFS on /
 HELPEOF
 }

lib/05-jenny_craig.func.sh

@@ -38,7 +38,8 @@ function jenny_craig () {
   #rm -f ${BUILDDIR}/etc/localtime
   rm -f ${BUILDDIR}/root/.bashrc
   # DISABLE when no longer building custom kernel
-  find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
+  #find ${BUILDDIR}/usr/lib/modules/ -maxdepth 1 -iname "*-ARCH" -exec rm -rf '{}' \;
+  for i in $(ls -1t ${BUILDDIR}/usr/lib/modules | tail -n "+2") ; do rm -rf ${BUILDDIR}/usr/lib/modules/${i} ; done
   find ${BUILDDIR}/ -type f -name "*.pacnew" -exec rm -rf '{}' \;
   sed -i -e '/^MAKEFLAGS=.*$/d' ${BUILDDIR}/etc/makepkg.conf
   rm -rf ${BUILDDIR}/usr/share/locale/*

lib/08-stuffy.func.sh

@@ -62,7 +62,8 @@ EOF
   FTSIZE=$(du -sc ${TEMPDIR}/{boot,EFI,loader} | tail -n1 | awk '{print $1}')
   FATSIZE=$((${FTSIZE} + 64)) # let's give a little wiggle room
   ${RACECAR_CHK}truncate -s "${FATSIZE}"K ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img
-  ${RACECAR_CHK}mkfs.vfat -n ${DISTNAME}_EFI ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  ${RACECAR_CHK}mkfs.vfat -F 32 -n ${DISTNAME}_EFI ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  #${RACECAR_CHK}mkfs.vfat -F32 -s2 -n ${DISTNAME}_EFI ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img >> "${LOGFILE}.${FUNCNAME}" 2>&1
   mkdir -p ${SRCDIR}/efiboot
   mount ${TEMPDIR}/EFI/${DISTNAME}/efiboot.img ${SRCDIR}/efiboot
   mkdir -p ${SRCDIR}/efiboot/EFI/${DISTNAME}

lib/10-mentos.func.sh

@@ -37,20 +37,13 @@ function mentos {
     local MIRROR=$(egrep '^Server' ${i}/etc/pacman.d/mirrorlist | head -n1 | sed -e 's/^Server\ =\ //g  ; s#$repo.*#core/os/x86_64/#g')
     local NEWKERN=$(curl -s "${MIRROR}" | grep linux | awk '{print $3}' | cut -f2 -d\" | egrep '^linux-[0-9].*pkg.tar.xz$' | cut -f2 -d"-")
 
-    if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer ${BASEDIR}/root.x86_64/boot/vmlinuz-linux-${PNAME}) ]] || [[ "${INSTKERN}" != "${NEWKERN}" ]];
-    then
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -Syyua --devel" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    else
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -Syyua --devel --ignore linux,linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    fi
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
-    ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -S --needed  --ignore linux,linux-${PNAME} ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
-    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}"
-    if [[ -n $(find ${BASEDIR}/extra/pre-build.d/ -type f -newer root.x86_64/boot/vmlinuz-linux-${PNAME}) ]];
-    then
-     ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    fi
+    ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
     echo "Done."
  done
  
@@ -60,7 +53,7 @@ function mentos {
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
 
@@ -69,10 +62,10 @@ function mentos {
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
- #${CHROOTCMD} ${CHROOTDIR64}/ bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}"
+ #${CHROOTCMD} ${CHROOTDIR64}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}"
  echo "Syncing overlay..."
  rsync -a ${BASEDIR}/overlay/64/. ${CHROOTDIR64}/.
  echo "Done."

lib/mk.chroot.sh

@@ -74,7 +74,8 @@ function mkchroot {
  cd "${BASEDIR}"
  
  ## Set some vars.
- MIRROR='http://mirrors.kernel.org/archlinux'
+ #MIRROR='http://mirrors.kernel.org/archlinux'
+ MIRROR='http://mirror.us.leaseweb.net/archlinux'
  RLSDIR="${MIRROR}/iso/latest"
  
  CURRLS64=$(curl -s ${RLSDIR}/sha1sums.txt | grep bootstrap | awk '{print $2}' | grep 'x86_64')
@@ -167,7 +168,7 @@ EOF
     # if that doesn't work,
     ${CHROOTCMD} ${i}/ pacman -Syy >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
-    ${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed base syslinux wget rsync unzip jshon sed sudo abs xmlto bc >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed base syslinux wget rsync unzip jshon sed sudo abs xmlto bc docbook-xsl git >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     echo "Done."
     echo -n "...Upgrading any outdated packages..."
@@ -182,11 +183,12 @@ EOF
     ## https://projects.archlinux.org/pacman.git/tree/NEWS#n54
     ## https://bugs.archlinux.org/task/43302
     #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    mkdir ${i}/var/tmp/pkg
+    mkdir -p ${i}/var/tmp/pkg
     cp ${BASEDIR}/extra/bootstrap/apacman* ${i}/var/tmp/pkg/apacman.tar.xz
     #${CHROOTCMD} ${i} "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i} bash -c "pacman --noconfirm -U /var/tmp/pkg/apacman.tar.xz && mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman && chown root:aurbuild /var/tmp/apacman " >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+    ${CHROOTCMD} ${i} bash -c "apacman -S --noconfirm --noedit --skipinteg -S apacman-deps expac" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #rm -rf ${i}/var/tmp/pkg
     #${CHROOTCMD} ${i}/ pacman -S --noconfirm --needed yaourt >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
@@ -211,19 +213,21 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.both | tr '\n' ' ')
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
-    echo "Running post-build tasks (building kernel, etc.) in ${i}..."
+    echo "Running post-build tasks in ${i}..."
     ${CHROOTCMD} ${i}/ "/root/post-build.sh" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
-    #set +e
-    #${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
-    #set -e
-    #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
+    set +e
+    ${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${PNAME}
+    cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
+    set -e
+    for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     # Uncomment if you wish to use the mkpasswd binary from within the chroot...
-    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit -S --needed debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     echo -n "Regular packages..."
     set +e
-    ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     # User creation
     set -e
@@ -260,7 +264,11 @@ EOF
  
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
-  ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  set +e
+  for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+  ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+  cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${PNAME}.img
+  set -e
  done
  
  # 32-bit
@@ -268,7 +276,7 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  set +e
  for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
@@ -280,7 +288,7 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
-   ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+   ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
  set +e
  for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done

overlay/etc/bash.bashrc

@@ -43,15 +43,21 @@ PS1='[\u@\h \W]\$ '
 export HISTTIMEFORMAT="%F %T "
 export PATH="${PATH}:/sbin:/bin:/usr/sbin"
 
+DEFROUTEIF=$(ip route show | egrep '^default' | awk '{print $5}')
+
 echo
 echo "==================================="
 date
+if [ -n "${DEFROUTEIF}" ];
+then
  echo
-echo "eth0 is:"
-ifconfig eth0 | egrep 'inet|ether' | grep -v "inet6" | awk '{print $2}'
+ echo -n "${DEFROUTEIF} is: "
+ ifconfig "${DEFROUTEIF}" | egrep 'inet|ether' | grep -v "inet6" | awk '{print $2}'
+fi
 echo
-echo "tun0 is:"
+echo  -n "tun0 is:"
 ifconfig tun0 | grep inet | grep -v "inet6" | awk '{print $2}'
+echo
 echo "http://bdisk.square-r00t.net/"
 echo "==================================="
 echo