From 8004a9faf888a86aa5756b3b54bbc3e03e438836 Mon Sep 17 00:00:00 2001 From: Nathaniel Maia Date: Mon, 5 Aug 2019 16:26:31 +0000 Subject: [PATCH] Clean up some comments, fix a typo, and some rearranging --- archlabs-installer | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/archlabs-installer b/archlabs-installer index fc0f32c..905de66 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -12,17 +12,17 @@ ANS="/tmp/ans" # dialog answer file # ------------------------------------------------------ # -# if you manually mount your partitions then you -# need to set these values to avoid using the mount menu. +# When manually mounting your partitions, you need +# to set these values to avoid using the mount menu. # ------------------------------------------------------ # -# root partition, eg/ /dev/sda2 +# root partition, eg. /dev/sda2 ROOT_PART='' # boot partition, required on UEFI eg. /dev/sda1 BOOT_PART='' -# device used for some bootloader install process, eg. /dev/sda +# boot device, used for some bootloaders eg. /dev/sda BOOT_DEV='' # bootloader to use, can be: @@ -38,23 +38,30 @@ BOOTDIR='boot' # bulk default values { +# these values will be selected during the install, it is not recommended +# to edit them here unless you know what you're doing. + +UCODE='' # cpu microcode (if any), can be: amd-ucode, intel-ucode +KERNEL='' # linux kernel, can be: linux, linux-lts, linux-zen, or linux-hardened +MYSHELL='' # full path for the shell, eg. /usr/bin/zsh + +SWAP_PART='' # swap partition or file path +SWAP_SIZE='' # swap size, only used when creating a swapfile + EXMNT='' # holder for additional partitions while mounting EXMNTS='' # when an extra partition is mounted append it's info FONT="ter-i16n" # font used for the linux console HOOKS="shutdown" # list of additional HOOKS to add in /etc/mkinitcpio.conf -LOGINRC='' # login shell rc file, eg. .zprofile, .bash_profile, .profile -LOGIN_WM='' # default login session to be placed in ~/.xinitrc LOGIN_TYPE='' # login manager can be: lightdm, xinit +LOGIN_WM='' # default login session to be placed in ~/.xinitrc +LOGINRC='' # login shell rc file, eg. .zprofile, .bash_profile, .profile + INSTALL_WMS='' # space separated list of chosen wm/de -UCODE='' # cpu microcode (if any), eg. amd-ucode, intel-ucode -KERNEL='' # can be linux, linux-lts, linux-zen, or linux-hardened -MYSHELL='' # full path for the shell, eg. /usr/bin/zsh - -WM_PKGS='' # full list of packages added during wm/de choice -PACKAGES='' # list of all packages to install including WM_PKGS +WM_PKGS='' # full list of packages added during wm/de choice (not user edited) +PACKAGES='' # list of all packages to install including WM_PKGS (not user edited) USER_PKGS='' # packages selected by the user during install NEWUSER='' # username for the new user @@ -82,9 +89,6 @@ FORMATTED='' # partitions we formatted and should allow skipping AUTO_ROOT_PART='' # root value from auto partition AUTO_BOOT_PART='' # boot value from auto partition -SWAP_PART='' # swap partition or file path -SWAP_SIZE='' # swap size, only used when creating a swapfile - # iso base, pacstrap when running the installer from a stock arch iso ISO_BASE="b43-firmware b43-fwcutter broadcom-wl clonezilla dhclient dhcpcd ethtool wpa_supplicant " ISO_BASE+="exfat-utils f2fs-tools gptfdisk vim hdparm ipw2100-fw ipw2200-fw nfs-utils nilfs-utils ntfs-3g "