and more cleanup for some pkg lists etc.

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

@@ -0,0 +1,332 @@
+# You can include comments, such as this. AUR packages are allowed.
+# We need to install all X drivers.
+abs
+acpi
+#acpidump
+#afflib
+aircrack-ng
+apr
+apr-util
+arj
+asciidoc
+atop
+autopsy
+autossh
+backuppc
+#bacula ## TODO: grab all the bacula packages in here
+beep
+bin86
+bind-tools
+binutils
+bluez-utils
+bonnie++
+boxbackup-client
+boxbackup-server
+bozocrack-git
+bridge-utils
+burp-backup-git
+btrfs-progs
+cabextract
+cdrtools
+cdw
+cfv
+chapcrack-git
+chntpw
+cifs-utils
+ckermit
+clamav
+clonezilla
+cmospwd
+colordiff
+cowpatty
+cpio
+cpuburn
+cpupower
+crackpkcs12
+cryptcat
+cryptsetup
+csync2
+customizepkg-scripting
+dar
+dcfldd
+ddrescue
+dd_rescue
+dd_rhelp
+debianutils
+debootstrap
+#dialog #giving a weird dependency issue
+diffutils
+djohn
+dmidecode
+dnssec-anchors
+dnstracer
+#dnsutils #replaced by bind-tools, https://www.archlinux.org/packages/extra/x86_64/bind-tools/
+dos2unix
+dropbear
+dstat
+dump
+dumpet
+duplicity
+dvd+rw-tools
+e2fsprogs
+ecryptfs-utils
+ed
+elfutils
+#elilo-efi
+elinks
+etc-update
+ethtool
+exfat-utils
+ext3grep
+extundelete
+f2fs-tools
+fang
+fbset
+fcgi
+fcgiwrap
+fcrackzip
+fdupes
+file
+findmyhash
+findutils
+firefox
+flac
+flashrom
+foremost
+fsarchiver
+fuse
+gd
+git
+gnu-efi-libs
+gnu-netcat
+gpart
+gparted
+gperftools
+gpm
+gptfdisk
+gst-libav
+gst-plugins-ugly
+hashcat
+hashdeep
+hddtemp
+hdparm
+hexcurse
+hexedit
+hfsprogs
+hfsutils
+htop
+httping
+hwdetect
+hwinfo
+hydra
+idnkit
+ifenslave
+iftop
+inetutils
+iotop
+iozone
+ipcalc
+iperf
+iperf3
+ipsec-tools
+iptraf-ng
+irssi
+iso-codes
+isomaster
+jasper
+jfsutils
+#john-mpi
+john
+keyutils
+kismet-allplugins
+lftp
+links
+#logkeys-git # requires a /dev/input, which apparently isn't included in the chroots
+lm_sensors
+lrzsz
+lshw
+#lsiutil # giving intermittent errors when trying to fetch source
+lsof
+lsscsi
+#lxde # apacman currently doesn't like package groups, so...
+gpicview
+lxappearance
+lxappearance-obconf
+lxde-common
+lxde-icon-theme
+lxdm
+lxinput
+lxlauncher
+lxmusic
+lxpanel
+lxrandr
+lxsession
+lxtask
+lxterminal
+openbox
+pcmanfm
+# end lxde
+lynx
+#lzip
+macchanger
+#magicrescue # no longer maintained, upstream down
+mbr
+mbuffer
+mcelog
+mdadm
+mdcrack
+# superseded by storcli
+#megaraid-cli
+memtester
+mfoc
+minicom
+#mondo # mindi-busybox fails to build 09.23.2016
+mtd-utils
+mtr
+mtree
+multipath-tools
+myrescue
+nbd
+ncftp
+ncompress
+ncrack
+net-snmp
+netselect
+nettle
+networkmanager-pptp
+nginx-devel
+ngrep
+nmap
+nmon
+ntfs-3g
+ntfsfixboot
+#nwipe #broken since they moved to github(?)
+nwipe-git
+obnam
+open-iscsi
+openipmi
+ophcrack
+os-prober
+p7zip
+pack
+par2cmdline
+partclone
+partclone-utils
+parted
+partimage
+pax-utils
+pciutils
+pcmciautils
+pdfcrack
+perf
+php
+php-fpm
+php-gd
+php-mcrypt
+phrasendrescher
+pigz
+pkgfile
+pkgtools
+ppp
+pptpclient
+procinfo-ng
+procps-ng
+progsreiserfs
+psmisc
+pwgen
+pixz
+pyrit
+python2-gnuplot
+python2-pyx
+rarcrack
+rcracki_mt
+rdiff-backup
+read-edid
+reaver-wps-fork-t6x-git
+rename
+rfkill
+rp-pppoe
+rpcbind
+rpmextract
+rp-pppoe
+rsnapshot
+rygel
+safecopy
+samba
+scalpel-git
+scapy
+screen
+scrounge-ntfs
+scrub
+scsiadd
+sdparm
+setserial
+sg3_utils
+sharutils
+sipcalc
+sipcrack
+smartmontools
+smbclient
+s-nail
+socat
+#star ## do people even USE tape backups anymore?
+storcli
+strace
+stress
+sucrack
+symlinks
+sysstat
+tcpdump
+tcpslice
+tcptraceroute
+testdisk
+tftp-hpa
+thin-provisioning-tools
+thttpd
+tmon
+tmux
+tre
+truecrack-git
+truecrypt
+tor
+udftools
+#udpcast
+unace
+unison
+unrar
+unshield
+unzip
+usb_modeswitch
+usbip
+usbutils
+vim-a
+vim-bufexplorer
+vim-indent-object
+vim-minibufexpl
+vim-nerdtree
+vim-syntastic
+vim-workspace
+vlc
+vncrack
+vnstat
+vpnc
+weplab
+#whdd #currently depends on dialog, which is broke as shit
+whois
+wifite-mod-pixiewps-git
+wipe
+wireshark-cli
+wpscrack
+wput
+x11vnc
+xfburn
+xfsdump
+xfsprogs
+xmlto
+xorg
+xorg-drivers
+xorg-xinit
+xterm
+zerofree
+zip
+zsh

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

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-apacman --noconfirm --noedit -S --needed customizepkg-scripting
-ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so
-
-echo "Done."

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

@@ -71,7 +71,7 @@ else
 	TGT_ARCH='i686'
 fi
 # Install some stuff we need for the ISO.
-PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/prereqs/iso.pkgs.both | tr '\n' ' ')
+PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/iso.pkgs.both | tr '\n' ' ')
 if [[ -n "${PKGLIST}" ]];
 then
 	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
@@ -79,13 +79,23 @@ then
 	cleanPacorigs
 fi
 # And install arch-specific packages for the ISO, if there are any.
-PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/prereqs/iso.pkgs.${TGT_ARCH} | tr '\n' ' ')
+PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/iso.pkgs.arch | tr '\n' ' ')
 if [[ -n "${PKGLIST}" ]];
 then
 	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
 	apacman --gendb
 	cleanPacorigs
 fi
+# Do some post tasks before continuing
+apacman --noconfirm --noedit -S --needed customizepkg-scripting
+ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so
+cleanPacorigs
+apacman --noconfirm --noedit --skipinteg -S --needed linux
+apacman --gendb
+cp -a /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
+cp -af /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
+cleanPacorigs
+
 # And install EXTRA functionality packages, if there are any.
 PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.both | tr '\n' ' ')
 if [[ -n "${PKGLIST}" ]];
@@ -94,3 +104,41 @@ then
 	apacman --gendb
 	cleanPacorigs
 fi
+# Add the regular user
+useradd -m -s /bin/bash -c "Default user" ${REGUSR}
+usermod -aG users,games,video,audio ${REGUSR}
+passwd -d ${REGUSR}
+# Add them to sudoers
+mkdir -p /etc/sudoers.d
+chmod 750 /etc/sudoers.d
+printf "Defaults:${REGUSR} \041lecture\n${REGUSR} ALL=(ALL) ALL\n" >> /etc/sudoers.d/${REGUSR}
+# Set the password, if we need to.
+if [[ -n "${REGUSR_PASS}" && "${REGUSR_PASS}" != 'BLANK' ]];
+    then
+      sed -i -e "s|^${REGUSR}::|${REGUSR}:${REGUSR_PASS}:|g" /etc/shadow
+elif [[ "${REGUSR_PASS}" == '{[BLANK]}' ]];
+then
+	passwd -d ${REGUSR}
+else
+	usermod -L ${REGUSR}
+fi
+# Set the root password, if we need to.
+if [[ -n "${ROOT_PASS}" && "${ROOT_PASS}" != 'BLANK' ]];
+then
+	sed -i -e "s|^root::|root:${ROOT_PASS}:|g" /etc/shadow
+elif [[ "${ROOT_PASS}" == 'BLANK' ]];
+then
+	passwd -d root
+else
+	usermod -L root
+fi
+cleanPacorigs
+cp -af /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
+# And install arch-specific extra packages, if there are any.
+PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.arch | tr '\n' ' ')
+if [[ -n "${PKGLIST}" ]];
+then
+	apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}
+	apacman --gendb
+	cleanPacorigs
+fi