diff --git a/extra/packages.both b/extra/packages.both index e0a5a6e..f3d9e2b 100644 --- a/extra/packages.both +++ b/extra/packages.both @@ -75,7 +75,7 @@ ed efibootmgr efivar elfutils -elilo-efi +#elilo-efi elinks etc-update ethtool @@ -146,7 +146,7 @@ libisoburn lftp links localepurge -logkeys +#logkeys logkeys-keymaps lm_sensors lrzsz @@ -178,7 +178,7 @@ mtd-utils mtools mtr mtree -mtx +#mtx multipath-tools myrescue nbd @@ -318,6 +318,7 @@ whdd whois wifite wipe +wireshark-cli wpscrack wput x11vnc diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh index 1070b16..9e40117 100755 --- a/lib/mk.chroot.sh +++ b/lib/mk.chroot.sh @@ -231,7 +231,9 @@ EOF then ${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 + set -e echo "Done." # 64-bit @@ -241,7 +243,9 @@ EOF then ${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 + set -e echo "Done." echo "Syncing overlay..."