andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update bootstrap.cfg immediately after interactive prompts 

This improves the readablility of the scripts. It also helps avoid
cases where a variable could be set twice in bootstrap.cfg, such as
the DISK variable.
This commit is contained in:
Dor Askayo 2022-03-06 14:07:03 +02:00
parent 6bf53927de
commit fde1bbc571
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysa/run.sh
View File

@ -71,6 +71,8 @@ if [ -z "${CHROOT}" ]; then
echo "or not. Is it? (yes/no answer)" echo "or not. Is it? (yes/no answer)"
ask_chroot ask_chroot
echo echo
echo "export CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg"
fi fi
ask_timestamps() { ask_timestamps() {
@ -91,15 +93,13 @@ if [ -z "${FORCE_TIMESTAMPS}" ]; then
echo "fully reproducible disk image. (yes/no answer)" echo "fully reproducible disk image. (yes/no answer)"
ask_timestamps ask_timestamps
echo echo
echo "export FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg"
fi fi
echo "Thank you! All done." echo "Thank you! All done."
# Write to bootstrap.cfg echo "export ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg"
rm "${SOURCES}/bootstrap.cfg"
for var in CHROOT FORCE_TIMESTAMPS DISK ARCH UPDATE_CHECKSUMS; do
echo "export ${var}=${!var}" >> "${SOURCES}/bootstrap.cfg"
done
mkdir -p "${DESTDIR}" "${REPO}" /dev mkdir -p "${DESTDIR}" "${REPO}" /dev

4
sysb/run.sh
View File

@ -53,14 +53,14 @@ ask_disk() {
if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then
echo "You did not provide a valid disk in the configuration file." echo "You did not provide a valid disk in the configuration file."
ask_disk ask_disk
echo "export DISK=${DISK}" >> /usr/src/bootstrap.cfg
fi fi
PREFIX=/usr PREFIX=/usr
SOURCES="${PREFIX}/src" SOURCES="${PREFIX}/src"
SYSC=/sysc SYSC=/sysc
echo "export DISK=${DISK}" >> /usr/src/bootstrap.cfg
# Otherwise, add stuff from sysa to sysb # Otherwise, add stuff from sysa to sysb
echo "Mounting sysc" echo "Mounting sysc"
mkdir /sysc mkdir /sysc