diff --git a/configs/rpi-4 b/configs/rpi-4 index 0eea0a6..02271a5 100644 --- a/configs/rpi-4 +++ b/configs/rpi-4 @@ -27,6 +27,7 @@ irqbalance ethtool netperf speedtest-netperf iperf3 nmap netdiscover arp-scan arp-scan-database +iftop iptables-mod-geoip igmpproxy msmtp @@ -34,7 +35,7 @@ msmtp -ip-tiny ip-full zoneinfo-europe procps-ng procps-ng-watch procps-ng-pgrep procps-ng-ps procps-ng-top procps-ng-free -curl wget rsync file htop lsof less mc tree usbutils bash +curl wget rsync file htop lsof less mc tree usbutils bash diffutils strace openssh-sftp-server " diff --git a/oi-build b/oi-build index 17b2713..f47bd16 100755 --- a/oi-build +++ b/oi-build @@ -233,6 +233,10 @@ Without any options, info is shown for the last image built. EOF } +# if user does not provide config name, we default to config_name +load_config common +load_config ${config_name} + actions="" dryrun="" while [ -n "$1" ]; do @@ -264,6 +268,10 @@ echo_ok "actions = ${actions}" todo_action fetch && fetch_image_builder +if [ -z "${actions}" ] && [ ! -d ${imagebuilder_dir} ]; then + die "No action supplied" +fi + echo_run_nodry "cd ${imagebuilder_dir}" todo_action build &&