tchange namespace - 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 3c3d59f4c2b4cfb258ee9d1df13b948647f98d31
(DIR) parent 9ea7593400bafc938f7a8318b596402484281954
(HTM) Author: parazyd <parazyd@dyne.org>
Date: Wed, 8 Jun 2016 17:29:32 +0200
change namespace
Diffstat:
M doc/README-functions.md | 8 ++++----
M zlibs/debootstrap | 26 ++++++++++++++------------
2 files changed, 18 insertions(+), 16 deletions(-)
---
(DIR) diff --git a/doc/README-functions.md b/doc/README-functions.md
t@@ -9,19 +9,19 @@ Main function, goes through stages 1, 2, and 3 of debootstrap.
Other internal functions are prefixed with `config_` and `tar_`
-### config_cleanup() ###
+### bootstrap_config_cleanup() ###
Final cleanup of the rootfs.
-### config_thirdstage() ###
+### bootstrap_config_thirdstage() ###
Shell script for the system's third debootstrap stage.
-### tar_bootstrap() ###
+### bootstrap_tar_pack() ###
Make a tarball of a base working system, ready to be worked on later.
-### tar_unpack() ###
+### bootstrap_tar_unpack() ###
Unpack the tarball of a base working system to the strapdir.
(DIR) diff --git a/zlibs/debootstrap b/zlibs/debootstrap
t@@ -38,7 +38,7 @@ bootstrap() {
if [[ -f $bootstrap_tgz ]]; then
notice "Using the existing bootstrap tarball found in ::1 tmpdir::" $H/tmp
ls -lh $bootstrap_tgz
- tar_unpack ${strapdir}
+ bootstrap_tar_unpack ${strapdir}
else
# Debootstrap stage 1
escalate "root" "debootstrap --foreign --arch ${arch} ${release} ${strapdir} ${mirror}"
t@@ -56,8 +56,8 @@ bootstrap() {
conf_print_sourceslist | escalate "root" "tee ${strapdir}/etc/apt/sources.list"
# write third-stage for chroot
- config_thirdstage | escalate "root" "tee ${strapdir}/thirdstage.sh"
- config_cleanup | escalate "root" "tee ${strapdir}/cleanup.sh"
+ bootstrap_config_thirdstage | escalate "root" "tee ${strapdir}/thirdstage.sh"
+ bootstrap_config_cleanup | escalate "root" "tee ${strapdir}/cleanup.sh"
escalate "root" "chmod +x ${strapdir}/thirdstage.sh"
escalate "root" "chmod +x ${strapdir}/cleanup.sh"
t@@ -73,11 +73,11 @@ bootstrap() {
umountdevproc ${strapdir}
- tar_bootstrap
+ bootstrap_tar_pack
fi
}
-config_cleanup() {
+bootstrap_config_cleanup() {
fn config_cleanup
cat << EOF
t@@ -90,8 +90,8 @@ rm -f /etc/ssh/*.pub
EOF
}
-config_thirdstage() {
- fn config_thirdstage
+bootstrap_config_thirdstage() {
+ fn bootstrap_config_thirdstage
req=(core_packages base_packages system_packages)
ckreq || return 1
t@@ -128,8 +128,8 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
EOF
}
-tar_bootstrap() {
- fn tar_bootstrap
+bootstrap_tar_pack() {
+ fn bootstrap_tar_pack
req=(bootstrap_tgz)
ckreq || return 1
t@@ -147,15 +147,17 @@ tar_bootstrap() {
ls -lh $bootstrap_tgz
}
-tar_unpack() {
- fn tar_unpack $@
+bootstrap_tar_unpack() {
+ fn bootstrap_tar_unpack $@
local unpath="$1"
req=(unpath bootstrap_tgz)
ckreq || return 1
+ # TODO: hack, drop a real file at one point to note it's the actual thing
[[ -r ${unpath}/bin/bash ]] && {
warning "bootstrap already unpacked in ::1 dir::" $unpath
- return 1 }
+ return 1
+ }
mkdir -p ${unpath}
tar xf $bootstrap_tgz -C ${unpath}