From 1dcbe73c7b703a04a6622e1b7c29176f29ed1592 Mon Sep 17 00:00:00 2001
From: r00t <bts@square-r00t.net>
Date: Mon, 12 Jan 2015 20:27:41 -0500
Subject: [PATCH] v1.04; minor tweaks, etc. but should be good for a while

---
 extra/build.conf.sample    | 2 +-
 lib/05-jenny_craig.func.sh | 3 +++
 lib/10-mentos.func.sh      | 2 ++
 lib/mk.chroot.sh           | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extra/build.conf.sample b/extra/build.conf.sample
index 1169b3d..17686e8 100644
--- a/extra/build.conf.sample
+++ b/extra/build.conf.sample
@@ -71,7 +71,7 @@ RSYNC_DEST="${BASEDIR}"
 # Note that the code appends, rather than replaces, logs- hence the timestamp in EPOCH time format.
 LOGFILE="${BASEDIR}/logs/$(date +%s)"
 
-# What should the regular username be? (Automatically logged in on boot)
+# What should the regular username be? (Can be automatically logged in on boot; see below)
 REGUSR="${UXNAME}"
 
 # Should the REGUSR have a password? IF THIS IS NOT SET, PASSWORD LOGIN WILL BE DISABLED!
diff --git a/lib/05-jenny_craig.func.sh b/lib/05-jenny_craig.func.sh
index d8b4fd6..7bd3883 100644
--- a/lib/05-jenny_craig.func.sh
+++ b/lib/05-jenny_craig.func.sh
@@ -45,6 +45,7 @@ function jenny_craig () {
   mv -f ${BUILDDIR}/tmp/locale.alias ${BUILDDIR}/usr/share/locale/.
   rm -rf ${BUILDDIR}/var/cache/pacman/*
   rm -rf ${BUILDDIR}/var/cache/pkgfile/*
+  rm -rf ${BUILDDIR}/var/cache/apacman/pkg/*
   rm -rf ${BUILDDIR}/var/lib/pacman/*
   mkdir -p ${BUILDDIR}/var/lib/pacman/local
   rm -rf ${BUILDDIR}/var/abs/local/yaourtbuild/*
@@ -54,6 +55,8 @@ function jenny_craig () {
   rm -rf ${BUILDDIR}/var/abs/*
   rm -rf ${BUILDDIR}/run/*
   rm -rf ${BUILDDIR}/boot/*
+  #rm -rf ${BUILDDIR}/root/*
+  rm -rf ${BUILDDIR}/root/post-build.sh
   rm -rf ${BUILDDIR}/usr/src/*
   rm -rf ${BUILDDIR}/var/log/*
   rm -rf ${BUILDDIR}/.git
diff --git a/lib/10-mentos.func.sh b/lib/10-mentos.func.sh
index 7c6f082..2ae369a 100644
--- a/lib/10-mentos.func.sh
+++ b/lib/10-mentos.func.sh
@@ -99,6 +99,8 @@ function mentos {
  find ${CHROOTDIR64}/root/ -type f -exec chmod 600 '{}' \;
  find ${CHROOTDIR32}/root/ -type d -exec chmod 700 '{}' \;
  find ${CHROOTDIR32}/root/ -type f -exec chmod 600 '{}' \;
+ chmod 600 ${CHROOTDIR64}/etc/ssh/*
+ chmod 600 ${CHROOTDIR32}/etc/ssh/*
  echo "Done."
  
 }
diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh
index 8d4c8d9..5507cf6 100755
--- a/lib/mk.chroot.sh
+++ b/lib/mk.chroot.sh
@@ -251,7 +251,7 @@ EOF
     then
       ${CHROOTCMD} ${i}/ passwd -d root >> "${LOGFILE}.${FUNCNAME}" 2>&1
     else
-      ${CHROOTCMD} ${i}/ usermod -L ${REGUSR} >> "${LOGFILE}.${FUNCNAME}" 2>&1
+      ${CHROOTCMD} ${i}/ usermod -L root >> "${LOGFILE}.${FUNCNAME}" 2>&1
     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
@@ -307,6 +307,8 @@ EOF
  find ${CHROOTDIR64}/root/ -type f -exec chmod 600 '{}' \;
  find ${CHROOTDIR32}/root/ -type d -exec chmod 700 '{}' \;
  find ${CHROOTDIR32}/root/ -type f -exec chmod 600 '{}' \;
+ chmod 600 ${CHROOTDIR64}/etc/ssh/*
+ chmod 600 ${CHROOTDIR32}/etc/ssh/*
  echo "Done."