v1.04; minor tweaks, etc. but should be good for a while
This commit is contained in:
parent
3133e4a962
commit
1dcbe73c7b
@ -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!
|
||||
|
@ -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
|
||||
|
@ -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."
|
||||
|
||||
}
|
||||
|
@ -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."
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user