changed package name btrfs-tools to current btrfs-progs

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index a0e88a2e1b52b99f352edbe3a59048e22d2e206c..6282070a5f4cb19fe95687fab62988204884ee77 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-tools bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
@@ -83,7 +83,7 @@ _rootpass: ${CFGROOT}
        chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root
 
 ${rootkey}.pub:
-       ssh-keygen -N '' -f "$${rootkey}"
+       [ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
 _rootkey: ${CFGROOT} ${rootkey}.pub
        mkdir -m 700 "$${CFGROOT}/root/.ssh/"