Fixes to bootstrap phase regarding vm-sdk.
This commit is contained in:
parent
8bd0b989b8
commit
c09251517d
|
|
@ -100,6 +100,7 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ -n "$TAR_STAGE4" ]]; then
|
if [[ -n "$TAR_STAGE4" ]]; then
|
||||||
|
bootstrap_tar_pack "$bootstrap_tgz_stage3" || zerr
|
||||||
bootstrap_tar_unpack "$bootstrap_tgz_stage4" "$strapdir" || zerr
|
bootstrap_tar_unpack "$bootstrap_tgz_stage4" "$strapdir" || zerr
|
||||||
else
|
else
|
||||||
bootstrap_tar_pack "$bootstrap_tgz_stage3" || zerr
|
bootstrap_tar_pack "$bootstrap_tgz_stage3" || zerr
|
||||||
|
|
@ -166,19 +167,16 @@ bootstrap_tar_pack() {
|
||||||
bootstrap_tar_unpack() {
|
bootstrap_tar_unpack() {
|
||||||
fn bootstrap_tar_unpack $@
|
fn bootstrap_tar_unpack $@
|
||||||
local bootstrap_tgz="$1"
|
local bootstrap_tgz="$1"
|
||||||
local unpath="$2"
|
req=(strapdir bootstrap_tgz)
|
||||||
req=(unpath bootstrap_tgz)
|
|
||||||
ckreq || return 1
|
ckreq || return 1
|
||||||
|
|
||||||
# if [[ -f "${unpath}/.keep" ]]; then
|
[[ -n "$TAR_STAGE4" ]] && {
|
||||||
# act "skipping tarball unpack"
|
[[ -f "$bootstrap_tgz" ]] || bootstrap_tgz="$bootstrap_tgz_stage3"
|
||||||
# else
|
}
|
||||||
sudo rm -rf ${unpath}
|
sudo rm -rf "${strapdir}"/*
|
||||||
sudo mkdir -p ${unpath}
|
|
||||||
silly
|
silly
|
||||||
sudo tar xfp $bootstrap_tgz -C ${unpath}
|
sudo tar xfp $bootstrap_tgz -C ${strapdir}
|
||||||
sudo mkdir -p ${unpath}/{boot,dev,sys,proc}
|
sudo mkdir -p ${strapdir}/{boot,dev,sys,proc}
|
||||||
# fi
|
|
||||||
|
|
||||||
conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null
|
conf_print_sourceslist | sudo tee $strapdir/etc/apt/sources.list >/dev/null
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue