diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh index 2c49e45..979769b 100755 --- a/lib/01-mk.chroot.func.sh +++ b/lib/01-mk.chroot.func.sh @@ -275,8 +275,8 @@ EOF ${CHROOTCMD} ${i}/ usermod -aG users,games,video,audio ${REGUSR} >> "${LOGFILE}.${FUNCNAME}" 2>&1 ${CHROOTCMD} ${i}/ passwd -d ${REGUSR} >> "${LOGFILE}.${FUNCNAME}" 2>&1 mkdir -p ${i}/etc/sudoers.d ; chmod 750 ${i}/etc/sudoers.d - echo "${REGUSR} ALL=(ALL) ALL" >> ${i}/etc/sudoers.d/${REGUSR} - if [[ -n "${REGUSR_PASS}" && "${REGUSER_PASS}" != '{[BLANK]}' ]]; + printf "Defaults:${REGUSR} \041lecture\n${REGUSR} ALL=(ALL) ALL\n" >> ${i}/etc/sudoers.d/${REGUSR} + if [[ -n "${REGUSR_PASS}" && "${REGUSR_PASS}" != '{[BLANK]}' ]]; then #${CHROOTCMD} ${i}/ "/usr/bin/echo ${REGUSR}:${REGUSR_PASS} | chpasswd -e" >> "${LOGFILE}.${FUNCNAME}" 2>&1 sed -i -e "s|^${REGUSR}::|${REGUSR}:${REGUSR_PASS}:|g" ${i}/etc/shadow diff --git a/lib/08-will_it_blend.func.sh b/lib/08-will_it_blend.func.sh index 266d042..6fca319 100644 --- a/lib/08-will_it_blend.func.sh +++ b/lib/08-will_it_blend.func.sh @@ -84,6 +84,7 @@ function will_it_blend () { cp -af ${CHROOTDIR}/boot/initramfs-linux-${DISTNAME}.img ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.img cp -af ${CHROOTDIR}/boot/vmlinuz-linux-${DISTNAME} ${TFTPDIR}/${UXNAME}.${ARCHSUFFIX}.kern cp -af ${ARCHBOOT}/* ${HTTPDIR}/${DISTNAME}/. + cp -af ${TFTPDIR}/* ${HTTPDIR}/. chown -R ${HTTPUSR}:${HTTPGRP} ${HTTPDIR} chown ${TFTPUSR}:${TFTPGRP} ${TFTPDIR}/${UXNAME}.* } diff --git a/overlay/etc/bash.bashrc b/overlay/etc/bash.bashrc index f732f14..ed05b0c 100644 --- a/overlay/etc/bash.bashrc +++ b/overlay/etc/bash.bashrc @@ -50,9 +50,10 @@ echo "===================================" date if [ -n "${DEFROUTEIF}" ]; then + IPADDR=$(ip a s dev ${DEFROUTEIF} | egrep '^[[:space:]]*inet\ ' | awk '{print $2}' | cut -f1 -d"/") + HWADDR=$(ip l show dev ${DEFROUTEIF} | egrep '^[[:space:]]*link\ ' | awk '{print $2}') echo - echo -n "${DEFROUTEIF} is: " - ifconfig "${DEFROUTEIF}" | egrep 'inet|ether' | grep -v "inet6" | awk '{print $2}' + echo -n "${DEFROUTEIF} (${HWADDR}) is: ${IPADDR}" fi echo echo -n "tun0 is:" diff --git a/overlay/etc/systemd/scripts/livecd.fix.sh b/overlay/etc/systemd/scripts/livecd.fix.sh index f10b8d8..c76a8b7 100755 --- a/overlay/etc/systemd/scripts/livecd.fix.sh +++ b/overlay/etc/systemd/scripts/livecd.fix.sh @@ -1,11 +1,6 @@ #/bin/sh - #chmod 4755 /opt/google/chrome-beta/chrome-sandbox -mkdir -p /var/db/sudo/lectured -touch /var/db/sudo/lectured/bdisk -chmod 700 /var/db/sudo/lectured -chgrp bdisk /var/db/sudo/lectured/bdisk -chmod 600 /var/db/sudo/lectured/bdisk chmod 4755 /usr/bin/sudo function fuck_you_gimme_net() {