From 56806ba88069ec00cb1befe2f6bd04cd6e1fbf70 Mon Sep 17 00:00:00 2001 From: r00t Date: Wed, 20 May 2015 23:55:54 -0400 Subject: [PATCH] yeah, fuck NetworkManager, use --purgebuild --- lib/10-mentos.func.sh | 6 +++--- lib/mk.chroot.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/10-mentos.func.sh b/lib/10-mentos.func.sh index 6cf0728..95e7a32 100644 --- a/lib/10-mentos.func.sh +++ b/lib/10-mentos.func.sh @@ -38,7 +38,7 @@ function mentos { local NEWKERN=$(curl -s "${MIRROR}" | grep linux | awk '{print $3}' | cut -f2 -d\" | egrep '^linux-[0-9].*pkg.tar.xz$' | cut -f2 -d"-") for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done - ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${i}/ bash -c "${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild --ignore linux ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done ${CHROOTCMD} ${i}/ /usr/bin/bash -c "mkinitcpio -p linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" @@ -53,7 +53,7 @@ function mentos { PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ') if [ -n "${PKGLIST}" ]; then - ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${CHROOTDIR32}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 fi for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done @@ -62,7 +62,7 @@ function mentos { PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ') if [ -n "${PKGLIST}" ]; then - ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${CHROOTDIR64}/ bash -c "yes '' | ${RACECAR_CHK}apacman --noconfirm --noedit --skipinteg -S --needed --purgebuild ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 fi for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done #${CHROOTCMD} ${CHROOTDIR64}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh index 154eaf2..5ffa786 100755 --- a/lib/mk.chroot.sh +++ b/lib/mk.chroot.sh @@ -154,6 +154,9 @@ EOF for i in ${CHROOTDIR32} ${CHROOTDIR64}; do + # Disable NetworkManager. Fuck that shit. + ln -s /dev/null ${i}/etc/systemd/system/NetworkManager.service + ln -s /dev/null ${i}/etc/systemd/system/NetworkManager-dispatcher.service # Prep pacman echo "Prepping ${i}. This will take a while..." echo -n "...Key initializing..."