From 6d9f24ee28544a585c400bae949182be4fb6d94e Mon Sep 17 00:00:00 2001
From: r00t <bts@square-r00t.net>
Date: Mon, 26 Sep 2016 05:06:04 -0400
Subject: [PATCH] updating package list, minor tweak to mk chroot

---
 extra/packages.both      | 12 ++++++------
 lib/01-mk.chroot.func.sh |  4 ++--
 src/ipxe                 |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extra/packages.both b/extra/packages.both
index 908e1d2..a8344bf 100644
--- a/extra/packages.both
+++ b/extra/packages.both
@@ -145,7 +145,7 @@ links
 lm_sensors
 lrzsz
 lshw
-#lsiutil # 404'ing on source url at the moment
+#lsiutil # giving intermittent errors when trying to fetch source
 lsof
 lsscsi
 #lxde # apacman currently doesn't like package groups, so...
@@ -169,8 +169,8 @@ pcmanfm
 lynx
 #lzip
 macchanger
-magicrescue
-#mbr # doesn't seem to build anymore
+#magicrescue # no longer maintained, upstream down
+mbr
 mbuffer
 mcelog
 mdadm
@@ -180,11 +180,10 @@ mdcrack
 memtester
 mfoc
 minicom
-#mondo
+#mondo # mindi-busybox fails to build 09.23.2016
 mtd-utils
 mtr
 mtree
-#mtx
 multipath-tools
 myrescue
 nbd
@@ -224,7 +223,7 @@ php
 php-fpm
 php-gd
 php-mcrypt
-#phrasendrescher
+phrasendrescher
 pigz
 pkgfile
 pkgtools
@@ -254,6 +253,7 @@ rsnapshot
 rygel
 safecopy
 samba
+scalpel-git
 scapy
 screen
 scrounge-ntfs
diff --git a/lib/01-mk.chroot.func.sh b/lib/01-mk.chroot.func.sh
index 4ba8eeb..ab3a889 100755
--- a/lib/01-mk.chroot.func.sh
+++ b/lib/01-mk.chroot.func.sh
@@ -261,7 +261,7 @@ EOF
     set +e
     ${CHROOTCMD} ${i}/ /usr/bin/bash -c "apacman --noconfirm --noedit --skipinteg -S --needed linux" >> "${LOGFILE}.${FUNCNAME}" 2>&1
     cp -a ${i}/boot/vmlinuz-linux ${i}/boot/vmlinuz-linux-${DISTNAME}
-    #cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
+    cp -af ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
     set -e
     for x in $(find ${i}/etc/ -type f -iname "*.pacorig");do mv -f ${x} ${x%%.pacorig} ; done
     # Uncomment if you wish to use the mkpasswd binary from within the chroot...
@@ -309,7 +309,7 @@ EOF
   set +e
   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
-  cp -a ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
+  cp -af ${i}/boot/initramfs-linux.img ${i}/boot/initramfs-linux-${DISTNAME}.img
   set -e
  done
  
diff --git a/src/ipxe b/src/ipxe
index 3bb61c3..827dd1b 160000
--- a/src/ipxe
+++ b/src/ipxe
@@ -1 +1 @@
-Subproject commit 3bb61c33c2d77ac9a1a512d809576f3444b6b1ed
+Subproject commit 827dd1bfee67daa683935ce65316f7e0f057fe1c