From 1edfc9f14d498ab85adf4fe58241a0d479ee2d2a Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 22 Feb 2010 07:40:53 +0100 Subject: [PATCH] some function renaming --- usr/share/archboot/installer/quickinst | 6 +++--- usr/share/archboot/installer/setup | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr/share/archboot/installer/quickinst b/usr/share/archboot/installer/quickinst index 80c09ca7f..9ce90cd3f 100755 --- a/usr/share/archboot/installer/quickinst +++ b/usr/share/archboot/installer/quickinst @@ -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." diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 33b05369a..536555172 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -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")