tFixes to bootstrap phase regarding vm-sdk. - libdevuansdk - common library for devuan's simple distro kits (HTM) git clone https://git.parazyd.org/libdevuansdk (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules (DIR) README (DIR) LICENSE --- (DIR) commit c09251517deaef4fad1fd694a50ee3b611073a45 (DIR) parent 8bd0b989b8ed1d955dce889037b78fdd89651863 (HTM) Author: parazyd <parazyd@dyne.org> Date: Sat, 16 Dec 2017 19:04:23 +0100 Fixes to bootstrap phase regarding vm-sdk. Diffstat: M zlibs/bootstrap | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) --- (DIR) diff --git a/zlibs/bootstrap b/zlibs/bootstrap t@@ -100,6 +100,7 @@ EOF } if [[ -n "$TAR_STAGE4" ]]; then + bootstrap_tar_pack "$bootstrap_tgz_stage3" || zerr bootstrap_tar_unpack "$bootstrap_tgz_stage4" "$strapdir" || zerr else bootstrap_tar_pack "$bootstrap_tgz_stage3" || zerr t@@ -166,19 +167,16 @@ bootstrap_tar_pack() { bootstrap_tar_unpack() { fn bootstrap_tar_unpack $@ local bootstrap_tgz="$1" - local unpath="$2" - req=(unpath bootstrap_tgz) + req=(strapdir bootstrap_tgz) ckreq || return 1 - # if [[ -f "${unpath}/.keep" ]]; then - # act "skipping tarball unpack" - # else - sudo rm -rf ${unpath} - sudo mkdir -p ${unpath} + [[ -n "$TAR_STAGE4" ]] && { + [[ -f "$bootstrap_tgz" ]] || bootstrap_tgz="$bootstrap_tgz_stage3" + } + sudo rm -rf "${strapdir}"/* silly - sudo tar xfp $bootstrap_tgz -C ${unpath} - sudo mkdir -p ${unpath}/{boot,dev,sys,proc} - # fi + sudo tar xfp $bootstrap_tgz -C ${strapdir} + sudo mkdir -p ${strapdir}/{boot,dev,sys,proc} conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null