include e2fsprogs in default installation, bugfix in raspberry initramfs

diff --git a/modules/default.mk b/modules/default.mk
index 9d830663415103e47c777596d8ec6fadbabcba57..1c6fb2a6a7345f8eaff997d48f92233d8d74cd26 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -2,7 +2,7 @@ ifdef imagesize
   ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
 endif
 
-PACKAGES += btrfs-progs bzip2 ca-certificates cron dnsutils fdisk file firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make ncat net-tools nmap ntpsec-ntpdate openssh-client pciutils psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES += btrfs-progs bzip2 ca-certificates cron dnsutils e2fsprogs fdisk file firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make ncat net-tools nmap ntpsec-ntpdate openssh-client pciutils psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
@@ -50,7 +50,7 @@ _raspberry_config: ${CFGROOT}
 
 _raspberry_initrd: ${CFGROOT}
        printf '${fstype}\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
-       k="$$(printf '%s\n' "$${CFGROOT}"/lib/modules/* |sed 's;^.*/;;; /-/d')"; \
+       k="$$(printf '%s\n' "$${CFGROOT}"/lib/modules/* |sed 's;^.*/;;;')"; \
        [ "${kernel}" ] && k="${kernel}"; \
        chroot $${CFGROOT} update-initramfs -c -k "$${k##*/}"; \
        printf 'initramfs initrd.img-%s\n' "$${k##*/}" >>"$${CFGROOT}/boot/config.txt"