Minor improvements and fixes all over the place

master
BodgeMaster 2023-07-14 20:50:12 +02:00
parent 3fe2535213
commit 4dcd7d131f
3 changed files with 7 additions and 4 deletions

View File

@ -47,6 +47,7 @@ There are a couple manual steps to get started before the installer scripts can
- Be aware that Void uses a US keymap until you change it. If your keyboard is different, you might need to look up an image of a US keyboard to find the right keys. - Be aware that Void uses a US keymap until you change it. If your keyboard is different, you might need to look up an image of a US keyboard to find the right keys.
- If booting off the USB stick you want to install to, use (RAM) option - If booting off the USB stick you want to install to, use (RAM) option
- Log in as `root`, password `voidlinux` - Log in as `root`, password `voidlinux`
- It wont display anything while you type in the password but it will accept it.
- If you need to use WiFi, run `void-installer` - If you need to use WiFi, run `void-installer`
- Set your keyboard layout (optional) - Set your keyboard layout (optional)
- Connect to your network - Connect to your network

View File

@ -51,7 +51,7 @@ if [ ! "$(id -u)" -eq 0 ]; then
exit 1 exit 1
fi fi
if ping -c4 repo-default.voidlinux.org >> $LOGFILE 2>&1; then if ping -c2 repo-default.voidlinux.org >> $LOGFILE 2>&1; then
: :
else else
echo "An internet connection is required to run this script." echo "An internet connection is required to run this script."
@ -240,7 +240,7 @@ echo "Adding mirror configuration."
echo "repository=$TARGET_MIRROR" > /mnt/target/etc/xbps.d/00-repository-main.conf echo "repository=$TARGET_MIRROR" > /mnt/target/etc/xbps.d/00-repository-main.conf
echo "Adding sudo configuration." echo "Adding sudo configuration."
echo "%wheel ALL=(ALL:ALL) ALL" > /mnt/target/etc/sudoers.d/wheel_as_sudo_group.conf echo "%wheel ALL=(ALL:ALL) ALL" > /mnt/target/etc/sudoers.d/wheel_as_sudo_group
echo "Disabling root password." echo "Disabling root password."
run_in_target passwd --lock root run_in_target passwd --lock root
@ -432,7 +432,7 @@ echo 'if [ -x /sbin/agetty -o -x /bin/agetty ]; then
fi' > /mnt/target/etc/sv/agetty-tty1/conf fi' > /mnt/target/etc/sv/agetty-tty1/conf
[ -f /mnt/target/root/.profile ] && mv /mnt/target/root/.profile /mnt/target/root/.profile.bak >> $LOGFILE 2>&1 [ -f /mnt/target/root/.profile ] && mv /mnt/target/root/.profile /mnt/target/root/.profile.bak >> $LOGFILE 2>&1
echo "if ps aux | grep 'installer-stage2.sh' > /dev/null 2>&1; then echo "if ps aux | grep 'installer-stage2.sh' | grep -v 'grep' > /dev/null 2>&1; then
true true
else else
/opt/void-usb/installer/install-stage2.sh /opt/void-usb/installer/install-stage2.sh

View File

@ -93,15 +93,17 @@ for I in ${!SECTIONS[@]}; do
else else
clear clear
cat "/opt/void-usb/installer/package_selections/${SECTIONS[$I]}/description.txt" cat "/opt/void-usb/installer/package_selections/${SECTIONS[$I]}/description.txt"
echo ""
for J in ${!AVAILABLE_OPTIONS[@]}; do for J in ${!AVAILABLE_OPTIONS[@]}; do
source "/opt/void-usb/installer/package_selections/${SECTIONS[$I]}/${AVAILABLE_OPTIONS[$J]}" source "/opt/void-usb/installer/package_selections/${SECTIONS[$I]}/${AVAILABLE_OPTIONS[$J]}"
echo "$J: $DESCRIPTION" echo "$J: $DESCRIPTION"
done done
CHOICE="" CHOICE=""
while [ -z "$CHOICE" ]; do while [ -z "$CHOICE" ]; do
echo ""
echo "Select by entering the corresponding number." echo "Select by entering the corresponding number."
read -p "> " CHOICE_NUMBER read -p "> " CHOICE_NUMBER
CHOICE="${AVAILABLE_OPTIONS[$CHOICE_NUMBER]}" grep "^[0-9]*$" <<< "$CHOICE_NUMBER" && CHOICE="${AVAILABLE_OPTIONS[$CHOICE_NUMBER]}"
done done
fi fi