diff --git a/extra/bdisk.png b/extra/bdisk.png index 2db6aca..e69de29 100644 Binary files a/extra/bdisk.png and b/extra/bdisk.png differ diff --git a/extra/packages.both.AUDITME.broken b/extra/packages.both.AUDITME.broken index 1a0e4a8..4b986ff 100644 --- a/extra/packages.both.AUDITME.broken +++ b/extra/packages.both.AUDITME.broken @@ -4,19 +4,14 @@ burp-backup-git chapcrack-git debianutils djohn -fang -hexcurse httping iozone kismet-allplugins -lxde mbr -mbuffer mdcrack memtester mondo pack -pkgtools rcracki_mt scrounge-ntfs sipcrack @@ -25,5 +20,3 @@ truecrack-svn weplab wifite-mod-pixiewps-git wpscrack -xorg -xorg-drivers diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh index 979769b..dade06e 100755 --- a/lib/01-mk.chroot.func.sh +++ b/lib/01-mk.chroot.func.sh @@ -265,7 +265,7 @@ EOF #${CHROOTCMD} ${i}/ bash -c "apacman --noconfirm --noedit --skipinteg -S --needed debian-whois-mkpasswd" >> "${LOGFILE}.${FUNCNAME}" 2>&1 #for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done echo -n "Regular packages..." - ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --legacy --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${i}/ bash -c "yes '' | apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 set +e for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done set -e @@ -315,7 +315,7 @@ EOF PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.32 | tr '\n' ' ') if [ -n "${PKGLIST}" ]; then - ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --legacy --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${CHROOTDIR32}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 fi set +e for x in $(find ${CHROOTDIR32}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done @@ -327,7 +327,7 @@ EOF PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' ${BASEDIR}/extra/packages.64 | tr '\n' ' ') if [ -n "${PKGLIST}" ]; then - ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --legacy --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 + ${CHROOTCMD} ${CHROOTDIR64}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed ${PKGLIST}" >> "${LOGFILE}.${FUNCNAME}" 2>&1 fi set +e for x in $(find ${CHROOTDIR64}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%.pacorig} ; done diff --git a/src/ipxe b/src/ipxe index 4e03af8..ba36953 160000 --- a/src/ipxe +++ b/src/ipxe @@ -1 +1 @@ -Subproject commit 4e03af8ec2d497e725566a91fd5c19dd604c18a6 +Subproject commit ba3695353add020b686547699ba5e259c339bfa6