oi-build: fixes for lazy user (providing no arguments)
This commit is contained in:
@@ -27,6 +27,7 @@ irqbalance
|
|||||||
ethtool
|
ethtool
|
||||||
netperf speedtest-netperf iperf3
|
netperf speedtest-netperf iperf3
|
||||||
nmap netdiscover arp-scan arp-scan-database
|
nmap netdiscover arp-scan arp-scan-database
|
||||||
|
iftop
|
||||||
iptables-mod-geoip
|
iptables-mod-geoip
|
||||||
igmpproxy
|
igmpproxy
|
||||||
msmtp
|
msmtp
|
||||||
@@ -34,7 +35,7 @@ msmtp
|
|||||||
-ip-tiny ip-full
|
-ip-tiny ip-full
|
||||||
zoneinfo-europe
|
zoneinfo-europe
|
||||||
procps-ng procps-ng-watch procps-ng-pgrep procps-ng-ps procps-ng-top procps-ng-free
|
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
|
strace
|
||||||
openssh-sftp-server
|
openssh-sftp-server
|
||||||
"
|
"
|
||||||
|
|||||||
8
oi-build
8
oi-build
@@ -233,6 +233,10 @@ Without any options, info is shown for the last image built.
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# if user does not provide config name, we default to config_name
|
||||||
|
load_config common
|
||||||
|
load_config ${config_name}
|
||||||
|
|
||||||
actions=""
|
actions=""
|
||||||
dryrun=""
|
dryrun=""
|
||||||
while [ -n "$1" ]; do
|
while [ -n "$1" ]; do
|
||||||
@@ -264,6 +268,10 @@ echo_ok "actions = ${actions}"
|
|||||||
todo_action fetch &&
|
todo_action fetch &&
|
||||||
fetch_image_builder
|
fetch_image_builder
|
||||||
|
|
||||||
|
if [ -z "${actions}" ] && [ ! -d ${imagebuilder_dir} ]; then
|
||||||
|
die "No action supplied"
|
||||||
|
fi
|
||||||
|
|
||||||
echo_run_nodry "cd ${imagebuilder_dir}"
|
echo_run_nodry "cd ${imagebuilder_dir}"
|
||||||
|
|
||||||
todo_action build &&
|
todo_action build &&
|
||||||
|
|||||||
Reference in New Issue
Block a user