mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
xed package install, added nextitem switches'
This commit is contained in:
parent
e0f227d001
commit
024e689aa2
1 changed files with 25 additions and 5 deletions
|
@ -612,6 +612,7 @@ partition() {
|
|||
DIALOG --msgbox "Now you'll be put into the cfdisk program where you can partition your hard drive. You should make a swap partition and as many data partitions as you will need. NOTE: cfdisk may tell you to reboot after creating partitions. If you need to reboot, just re-enter this install program, skip this step and go on to step 2." 18 70
|
||||
cfdisk $DISC
|
||||
done
|
||||
NEXTITEM="3"
|
||||
S_PART=1
|
||||
}
|
||||
|
||||
|
@ -712,6 +713,7 @@ mountpoints() {
|
|||
done
|
||||
|
||||
DIALOG --msgbox "Partitions were successfully mounted." 0 0
|
||||
NEXTITEM="4"
|
||||
S_MKFS=1
|
||||
}
|
||||
|
||||
|
@ -725,6 +727,7 @@ getsource() {
|
|||
|
||||
if [ "$MODE" = "ftp" ]; then
|
||||
select_mirror
|
||||
NEXTITEM="2"
|
||||
fi
|
||||
S_SRC=1
|
||||
}
|
||||
|
@ -890,6 +893,7 @@ select_packages() {
|
|||
DIALOG --separate-output --checklist "Select Packages To Install." 19 60 12 $_pkglist 2>$ANSWER || return 1
|
||||
PACKAGES="$(cat $ANSWER)"
|
||||
fi
|
||||
NEXTITEM="5"
|
||||
S_SELECT=1
|
||||
}
|
||||
|
||||
|
@ -921,7 +925,7 @@ installpkg() {
|
|||
if [ "$MODE" = "media" ]; then
|
||||
PACKAGES=
|
||||
# fix pacman list!
|
||||
sed -i -e 's/-i686//g' -e 's/-x86_64//g' /tmp/.pkglist
|
||||
sed -i -e 's/-i686//g' -e 's/-x86_64//g' -e 's/"//g' /tmp/.pkglist
|
||||
for pkg in $(cat /tmp/.pkglist); do
|
||||
pkgname=${pkg%-*-*}
|
||||
PACKAGES="$PACKAGES $pkgname"
|
||||
|
@ -974,7 +978,7 @@ installpkg() {
|
|||
sync
|
||||
|
||||
S_INSTALL=1
|
||||
|
||||
NEXTITEM="6"
|
||||
# automagic time!
|
||||
# any automatic configuration should go here
|
||||
DIALOG --infobox "Writing base configuration..." 6 40
|
||||
|
@ -1117,6 +1121,7 @@ donetwork() {
|
|||
DIALOG --yesno "Do you want to use DHCP?" 0 0
|
||||
if [ $? -eq 0 ]; then
|
||||
DIALOG --infobox "Please wait. Polling for DHCP server on $INTERFACE..." 10 65
|
||||
[ -e /var/run/dhcpcd-$INTERFACE.pid ] && kill $(cat /var/run/dhcpcd-$INTERFACE.pid)
|
||||
dhcpcd $INTERFACE >$LOG 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
DIALOG --msgbox "Failed to run dhcpcd. See $LOG for details." 0 0
|
||||
|
@ -1168,6 +1173,7 @@ donetwork() {
|
|||
fi
|
||||
### Missing Proxy Configuration
|
||||
DIALOG --msgbox "The network is configured." 8 30
|
||||
NEXTITEM="1"
|
||||
S_NET=1
|
||||
}
|
||||
|
||||
|
@ -1387,10 +1393,16 @@ select_source()
|
|||
TITLE="Arch Linux CDROM, USBSTICK or OTHER SOURCE Installation"
|
||||
getsource
|
||||
else
|
||||
DEFAULT=
|
||||
TITLE="Arch Linux FTP/HTTP Installation"
|
||||
DIALOG --msgbox "If you wish to load your ethernet modules manually, please do so now in an other terminal." 12 65
|
||||
DIALOG $DEFAULT --msgbox "If you wish to load your ethernet modules manually, please do so now in an other terminal." 12 65
|
||||
while true; do
|
||||
DIALOG --menu "FTP Installation" 10 35 3 \
|
||||
if [ -n "$NEXTITEM" ]; then
|
||||
DEFAULT="--default-item $NEXTITEM"
|
||||
else
|
||||
DEFAULT=""
|
||||
fi
|
||||
DIALOG --$DEFAULT --menu "FTP Installation" 10 35 3 \
|
||||
"0" "Setup Network" \
|
||||
"1" "Choose Mirror" \
|
||||
"2" "Return to Main Menu" 2>$ANSWER
|
||||
|
@ -1405,6 +1417,7 @@ select_source()
|
|||
esac
|
||||
done
|
||||
fi
|
||||
NEXTITEM="4"
|
||||
}
|
||||
|
||||
set_clock()
|
||||
|
@ -1414,6 +1427,7 @@ set_clock()
|
|||
else
|
||||
DIALOG --msgbox "Error:\ntz script not found, aborting clock setting" 0 0
|
||||
fi
|
||||
NEXTITEM="2"
|
||||
}
|
||||
|
||||
set_keyboard()
|
||||
|
@ -1423,6 +1437,7 @@ set_keyboard()
|
|||
else
|
||||
DIALOG --msgbox "Error:\nkm script not found, aborting keyboard and console setting" 0 0
|
||||
fi
|
||||
NEXTITEM="1"
|
||||
}
|
||||
|
||||
# run_mkinitcpio()
|
||||
|
@ -1467,9 +1482,12 @@ prepare_harddrive()
|
|||
"3" "Set Filesystem Mountpoints" \
|
||||
"4" "Return to Main Menu" 2>$ANSWER
|
||||
NEXTITEM="$(cat $ANSWER)"
|
||||
[ "$S_MKFSAUTO" = "1" ] && DONE=1
|
||||
case $(cat $ANSWER) in
|
||||
"1")
|
||||
autoprepare ;;
|
||||
autoprepare
|
||||
[ "$S_MKFSAUTO" = "1" ] && DONE=1
|
||||
;;
|
||||
"2")
|
||||
partition ;;
|
||||
"3")
|
||||
|
@ -1702,6 +1720,7 @@ configure_system()
|
|||
## END POSTPROCESSING ##
|
||||
|
||||
S_CONFIG=1
|
||||
NEXTITEM="7"
|
||||
}
|
||||
|
||||
install_bootloader()
|
||||
|
@ -1714,6 +1733,7 @@ install_bootloader()
|
|||
"GRUB") dogrub ;;
|
||||
"LILO") dolilo ;;
|
||||
esac
|
||||
NEXTITEM="8"
|
||||
}
|
||||
|
||||
mainmenu() {
|
||||
|
|
Loading…
Reference in a new issue