oh, why the hell not.

extra/build.conf.sample

@@ -90,6 +90,10 @@ REGUSR="${UXNAME}"
 # $6$aBcDeFgHiJ$Yh342vFH7MOjPNu9InFymD1Dd42i5cFsr1cTWdpKGNIkbRGR/ZKQDRPJ1ZeeGb7y894Tfh3iWZIJKu3phlsqQ1
 REGUSR_PASS=""
 
+# Same exact thing as REGUSR_PASS, but for the root password (i.e. if no password hash is
+# specified, password login will be disabled).
+ROOT_PASS=""
+
 # Do we have enough horsepower on the build system to jack up the resources we throw at building?
 # Enabling this will give absolute CPU preference to building the kernels and do make-time
 # enhancements/optimizations (i.e. use the maximum number of CPU cores detected).

extra/packages.both

@@ -75,7 +75,7 @@ ed
 efibootmgr
 efivar
 elfutils
-elilo-efi
+#elilo-efi
 elinks
 etc-update
 ethtool
@@ -138,14 +138,15 @@ iso-codes
 isomaster
 jasper
 jfsutils
-john-mpi
+#john-mpi
+john
 keyutils
 kismet-allplugins
 libisoburn
 lftp
 links
 localepurge
-logkeys
+#logkeys
 logkeys-keymaps
 lm_sensors
 lrzsz
@@ -177,7 +178,7 @@ mtd-utils
 mtools
 mtr
 mtree
-mtx
+#mtx
 multipath-tools
 myrescue
 nbd
@@ -217,7 +218,7 @@ php
 php-fpm
 php-gd
 php-mcrypt
-phrasendrescher
+#phrasendrescher
 pigz
 pkgfile
 pkgtools
@@ -240,7 +241,6 @@ rdiff-backup
 read-edid
 reaver
 rename
-rescan-scsi-bus
 rfkill
 rp-pppoe
 rpcbind
@@ -270,7 +270,7 @@ s-nail
 socat
 squashfs3-tools
 squashfs-tools
-star
+#star
 strace
 stress
 sucrack
@@ -318,6 +318,7 @@ whdd
 whois
 wifite
 wipe
+wireshark-cli
 wpscrack
 wput
 x11vnc

lib/mk.chroot.sh

@@ -202,8 +202,8 @@ EOF
     echo -n "Regular packages..."
     set +e
     ${CHROOTCMD} ${i}/ bash -c "yes '' | yaourt -S --needed --noconfirm ${PKGLIST}" >> "${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
     echo -n "...Creating ${REGUSR} user..."
     ${CHROOTCMD} ${i}/ useradd -m -s /bin/bash -c "Default user" ${REGUSR} >> "${LOGFILE}.${FUNCNAME}" 2>&1
     ${CHROOTCMD} ${i}/ usermod -aG users,games,video,audio ${REGUSR} >> "${LOGFILE}.${FUNCNAME}" 2>&1
@@ -212,15 +212,24 @@ EOF
     echo "${REGUSR} ALL=(ALL) ALL" >> ${i}/etc/sudoers.d/${REGUSR}
     if [ -n "${REGUSR_PASS}" ];
     then
-      ${CHROOTCMD} ${i}/ echo "${REGUSR}:${REGUSR_PASS}" | chpasswd -e 
+      ${CHROOTCMD} ${i}/ "echo ${REGUSR}:${REGUSR_PASS} | chpasswd -e" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    else
+      sed -i -e "s/^${REGUSR}::/${REGUSR}:!:/g" ${i}/etc/shadow
     fi
-    # COMMENT THIS LINE IF YOU WANT TO SET A ROOT PASSWORD
-    ${CHROOTCMD} ${i}/ usermod -L root
+    if [ -n "${ROOT_PASS}" ];
+    then
+      ${CHROOTCMD} ${i}/ "echo ${root}:${ROOT_PASS} | chpasswd -e" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+    else
+      sed -i -e 's/^root::/root:!:/g' ${i}/etc/shadow
+    fi
+    # The following is supposed to do the same as the above, but "cleaner". However, it currently fails with "execv() failed: No such file or directory"
+    ##${CHROOTCMD} ${i}/ usermod -L root >> "${LOGFILE}.${FUNCNAME}" 2>&1
     echo "Done."
  done
  
  for i in ${CHROOTDIR32} ${CHROOTDIR64};
  do
+echo "[DEBUG] ${i}: mkinitcpio" >> "${LOGFILE}.${FUNCNAME}" 2>&1
   ${CHROOTCMD} ${i}/ bash -c "mkinitcpio -p linux-${PNAME}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  done
  
@@ -229,9 +238,13 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
+echo "[DEBUG] 32-bit: installing packages" >> "${LOGFILE}.${FUNCNAME}" 2>&1
    ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
-    for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+ set +e
+ for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+echo "[DEBUG] 32-bit: pacorig move" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ set -e
  echo "Done."
  
  # 64-bit
@@ -239,9 +252,13 @@ EOF
  PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ')
  if [ -n "${PKGLIST}" ];
  then
+echo "[DEBUG] 64-bit: installing packages" >> "${LOGFILE}.${FUNCNAME}" 2>&1
    ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yaourt -S --needed --noconfirm ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1
  fi
-    for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+ set +e
+ for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done
+echo "[DEBUG] 64-bit: pacorig move" >> "${LOGFILE}.${FUNCNAME}" 2>&1
+ set -e
  echo "Done."
 
  echo "Syncing overlay..."

overlay/etc/systemd/system/multi-user.target.wants/openvpn@grainwreck

@@ -0,0 +1 @@
+/usr/lib/systemd/system/openvpn@.service