move more to basic function

This commit is contained in:
Tobias Powalowski 2022-03-22 08:26:51 +01:00
parent 612c3963fd
commit a761baf506
2 changed files with 25 additions and 23 deletions

View file

@ -1,29 +1,9 @@
#!/bin/bash #!/bin/bash
ANSWER="/tmp/.setup" # source base first, contains basic parameters
# use the first VT not dedicated to a running console . /usr/lib/archboot/installer/base.sh
# don't use DESTDIR=/mnt because it's intended to mount other things there! # source all other functions
# check first if bootet in archboot
if grep -qw archboot /etc/hostname; then
DESTDIR="/install"
LOG="/dev/tty7"
else
DESTDIR="/"
LOG="/dev/tty8"
fi
# install stages
S_SRC=0 # choose mirror
S_NET=0 # network configuration
S_MKFS=0 # formatting
S_MKFSAUTO=0 # auto fs part/formatting
S_CONFIG=0 # configuration editing
# menu item tracker- autoselect the next item
NEXTITEM=""
# To allow choice in script set EDITOR=""
EDITOR=""
. /usr/lib/archboot/installer/autoconfiguration.sh . /usr/lib/archboot/installer/autoconfiguration.sh
. /usr/lib/archboot/installer/autoprepare.sh . /usr/lib/archboot/installer/autoprepare.sh
. /usr/lib/archboot/installer/base.sh
. /usr/lib/archboot/installer/blockdevices.sh . /usr/lib/archboot/installer/blockdevices.sh
. /usr/lib/archboot/installer/bootloader.sh . /usr/lib/archboot/installer/bootloader.sh
. /usr/lib/archboot/installer/btrfs.sh . /usr/lib/archboot/installer/btrfs.sh

View file

@ -1,5 +1,27 @@
#!/bin/bash #!/bin/bash
# created by Tobias Powalowski <tpowa@archlinux.org> # created by Tobias Powalowski <tpowa@archlinux.org>
ANSWER="/tmp/.setup"
# use the first VT not dedicated to a running console
# don't use DESTDIR=/mnt because it's intended to mount other things there!
# check first if bootet in archboot
if grep -qw archboot /etc/hostname; then
DESTDIR="/install"
LOG="/dev/tty7"
else
DESTDIR="/"
LOG="/dev/tty8"
fi
# install stages
S_SRC=0 # choose mirror
S_NET=0 # network configuration
S_MKFS=0 # formatting
S_MKFSAUTO=0 # auto fs part/formatting
S_CONFIG=0 # configuration editing
# menu item tracker- autoselect the next item
NEXTITEM=""
# To allow choice in script set EDITOR=""
EDITOR=""
set_title() { set_title() {
if [[ -e "${LOCAL_DB}" ]]; then if [[ -e "${LOCAL_DB}" ]]; then
TITLE="Arch Linux Installation (Local mode) --> wiki.archlinux.org/title/Archboot" TITLE="Arch Linux Installation (Local mode) --> wiki.archlinux.org/title/Archboot"