mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
move PARAMETERS to correct function
This commit is contained in:
parent
024514bb1b
commit
975c154ed1
3 changed files with 31 additions and 32 deletions
|
@ -1,4 +1,24 @@
|
|||
#!/bin/bash
|
||||
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=""
|
||||
|
||||
. /usr/lib/archboot/installer/autoconfiguration.sh
|
||||
. /usr/lib/archboot/installer/autoprepare.sh
|
||||
. /usr/lib/archboot/installer/base.sh
|
||||
|
@ -12,40 +32,8 @@
|
|||
. /usr/lib/archboot/installer/pacman.sh
|
||||
. /usr/lib/archboot/installer/partition.sh
|
||||
. /usr/lib/archboot/installer/storage.sh
|
||||
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
|
||||
EDITOR=""
|
||||
# name of the initramfs filesystem
|
||||
INITRAMFS="initramfs-${KERNELPKG}"
|
||||
# name of intel ucode initramfs image
|
||||
INTEL_UCODE="intel-ucode.img"
|
||||
# name of amd ucode initramfs image
|
||||
AMD_UCODE="amd-ucode.img"
|
||||
# downloader
|
||||
DLPROG="wget"
|
||||
# sources
|
||||
SYNC_URL=""
|
||||
MIRRORLIST="/etc/pacman.d/mirrorlist"
|
||||
# partitions
|
||||
PART_ROOT=""
|
||||
ROOTFS=""
|
||||
# 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=""
|
||||
|
||||
set_keyboard() {
|
||||
if [[ -e /usr/bin/km ]]; then
|
||||
|
|
|
@ -1,5 +1,12 @@
|
|||
#!/bin/bash
|
||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
# name of intel ucode initramfs image
|
||||
INTEL_UCODE="intel-ucode.img"
|
||||
# name of amd ucode initramfs image
|
||||
AMD_UCODE="amd-ucode.img"
|
||||
PART_ROOT=""
|
||||
ROOTFS=""
|
||||
|
||||
getrootfstype() {
|
||||
ROOTFS="$(getfstype "${PART_ROOT}")"
|
||||
}
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
#!/bin/bash
|
||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
# downloader
|
||||
DLPROG="wget"
|
||||
MIRRORLIST="/etc/pacman.d/mirrorlist"
|
||||
|
||||
getsource() {
|
||||
S_SRC=0
|
||||
PACMAN_CONF=""
|
||||
|
|
Loading…
Reference in a new issue