Skip to content

Commit 6ed458a

Browse files
committed
Fix for select_distro
1 parent cb23d2f commit 6ed458a

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

choose_distro/select_distro.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin
7878

7979
tcd_start="$(date +%s)"
8080

81-
. "$d_aok_base"/tools/utils.sh
81+
hide_run_as_root=1 . /opt/AOK/tools/run_as_root.sh
82+
[ -z "$d_aok_base_etc" ] && . /opt/AOK/tools/utils.sh
8283

8384
manual_runbg
8485

choose_distro/select_distro_prepare.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ if [ ! -d "/opt/AOK" ]; then
1717
exit 1
1818
fi
1919

20-
. /opt/AOK/tools/utils.sh
20+
hide_run_as_root=1 . /opt/AOK/tools/run_as_root.sh
21+
[ -z "$d_aok_base_etc" ] && . /opt/AOK/tools/utils.sh
2122

2223
msg_script_title "select_distro_prepare.sh Prep for distro select"
2324

@@ -27,8 +28,8 @@ msg_script_title "select_distro_prepare.sh Prep for distro select"
2728
msg_2 "apk update & upgrade"
2829
apk update && apk upgrade
2930

30-
msg_3 "Installing wget (needed for Debian download)"
31-
apk add wget
31+
msg_3 "Installing wget (needed for Debian download) & pigz (multicore untar)"
32+
apk add wget pigz
3233

3334
set_new_etc_profile "$setup_select_distro"
3435

tools/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ create_fs() {
154154
case "$src_tarball" in
155155
*alpine*) _cf_time_estimate="A minirootfs should not take that long" ;;
156156
*)
157-
_cf_time_estimate="will take a while (iPad 5th:16 iPad 7th:7 minutes)"
157+
_cf_time_estimate="will take a while (iPad 5th:8, iPad 7th:4 minutes)"
158158
;;
159159
esac
160160
msg_3 " $_cf_time_estimate"

0 commit comments

Comments
 (0)