mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
some function renaming
This commit is contained in:
parent
85c9e8ce26
commit
1edfc9f14d
2 changed files with 7 additions and 7 deletions
|
@ -73,7 +73,7 @@ pacman_conf_extra() {
|
|||
echo "Server = ${serverurl}" >> /tmp/pacman.conf
|
||||
}
|
||||
|
||||
# configures pacman and syncs for the first time on destination system
|
||||
# configures pacman and syncs db on destination system
|
||||
# params: none
|
||||
# returns: 1 on error
|
||||
prepare_pacman() {
|
||||
|
@ -107,7 +107,7 @@ chroot_umount()
|
|||
}
|
||||
|
||||
# package_installation
|
||||
installpkg() {
|
||||
install_packages() {
|
||||
if [ "$INSTMODE" = "media" ]; then
|
||||
PKGFILE=/tmp/.pkglist
|
||||
cp $PKGARG/packages.txt $PKGFILE
|
||||
|
@ -157,7 +157,7 @@ fi
|
|||
chroot_mount
|
||||
|
||||
# install packages
|
||||
installpkg
|
||||
install_packages
|
||||
if [ $? -gt 0 ]; then
|
||||
echo
|
||||
echo "Package installation FAILED."
|
||||
|
|
|
@ -1955,7 +1955,7 @@ pacman_conf_bootloader() {
|
|||
echo "Server = ${serverurl}" >> /tmp/pacman.conf
|
||||
}
|
||||
|
||||
# configures pacman and syncs for the first time on destination system
|
||||
# configures pacman and syncs db on destination system
|
||||
# params: none
|
||||
# returns: 1 on error
|
||||
prepare_pacman() {
|
||||
|
@ -2128,10 +2128,10 @@ select_packages() {
|
|||
}
|
||||
|
||||
|
||||
# installpkg()
|
||||
# install_packages()
|
||||
# performs package installation to the target system
|
||||
#
|
||||
installpkg() {
|
||||
install_packages() {
|
||||
if ! [ "$S_SRC" = "1" ]; then
|
||||
DIALOG --msgbox "Error:\nYou must select Source first." 0 0
|
||||
return 1
|
||||
|
@ -3418,7 +3418,7 @@ mainmenu() {
|
|||
"4")
|
||||
select_packages ;;
|
||||
"5")
|
||||
installpkg ;;
|
||||
install_packages ;;
|
||||
"6")
|
||||
configure_system ;;
|
||||
"7")
|
||||
|
|
Loading…
Reference in a new issue