From d0e1ef51b58b8f8d7ba7ab93d889fd00d5a7716b Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 17 Dec 2008 17:36:59 +0100 Subject: [PATCH] 'fixed various stuff, added pcspkr to environment, added usb hostcontroller sorting, added v86d to fb' --- etc/archboot/allinone-lowmem.conf | 2 +- etc/archboot/allinone.conf | 2 +- etc/archboot/default-ftp-pxelinux.conf | 2 +- etc/archboot/default-ftp.conf | 2 +- etc/archboot/default-pxelinux.conf | 2 +- etc/archboot/default.conf | 2 +- etc/archboot/lowmem.conf | 2 +- lib/initcpio/install/arch_fb | 3 +- lib/initcpio/install/arch_net | 2 +- lib/initcpio/install/arch_pacman | 2 +- lib/initcpio/install/arch_pcspkr | 16 ++++++++ usr/share/archboot/fb/etc/modprobe.d/uvesafb | 10 +++++ usr/share/archboot/installer/setup | 43 ++++++++++++-------- 13 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 lib/initcpio/install/arch_pcspkr create mode 100644 usr/share/archboot/fb/etc/modprobe.d/uvesafb diff --git a/etc/archboot/allinone-lowmem.conf b/etc/archboot/allinone-lowmem.conf index 224cbb2f1..a175f2e8c 100644 --- a/etc/archboot/allinone-lowmem.conf +++ b/etc/archboot/allinone-lowmem.conf @@ -9,7 +9,7 @@ FILES="" # # Please change the other hooks only if you know what you are doing. # hooks for lowmem image -HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_acpi arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses" +HOOKS="arch_core_install arch_installer arch_bootmessage_allinone arch_acpi arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/allinone.conf b/etc/archboot/allinone.conf index 42e47ba22..2fda5a637 100644 --- a/etc/archboot/allinone.conf +++ b/etc/archboot/allinone.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" +HOOKS="arch_ftp_install arch_installer arch_bootmessage_allinone arch_tz arch_keymap arch_acpi arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp-pxelinux.conf b/etc/archboot/default-ftp-pxelinux.conf index 0ef317a3e..1c16130ae 100644 --- a/etc/archboot/default-ftp-pxelinux.conf +++ b/etc/archboot/default-ftp-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux" +HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-ftp.conf b/etc/archboot/default-ftp.conf index fe2de4031..4ed5a9631 100644 --- a/etc/archboot/default-ftp.conf +++ b/etc/archboot/default-ftp.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" +HOOKS="arch_ftp_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default-pxelinux.conf b/etc/archboot/default-pxelinux.conf index 9d1894ab8..b7e59c652 100644 --- a/etc/archboot/default-pxelinux.conf +++ b/etc/archboot/default-pxelinux.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux" +HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons arch_pxelinux" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/default.conf b/etc/archboot/default.conf index a75800342..e8245c8ab 100644 --- a/etc/archboot/default.conf +++ b/etc/archboot/default.conf @@ -8,7 +8,7 @@ FILES="" # SETUP # # Please change the hooks only if you know what you are doing. -HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" +HOOKS="arch_core_install arch_installer arch_tz arch_keymap arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow arch_base arch_intel_wireless arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata arch_cdrom arch_pcspkr arch_net arch_isdn arch_pcmcia arch_rtc arch_sound usb usbinput arch_fw arch_floppy arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems arch_remote arch_cpufreq arch_fb arch_links arch_pacman arch_kexec arch_ppp arch_pppoe arch_lilo arch_grub arch_iptables arch_capi4k arch_pciutils arch_usbutils arch_openvpn arch_vpnc arch_pptpclient arch_licenses arch_wireless arch_linux_atm arch_tiacx_wireless arch_netcfg arch_addons" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/etc/archboot/lowmem.conf b/etc/archboot/lowmem.conf index 1ad267e29..2bf5a7bfc 100644 --- a/etc/archboot/lowmem.conf +++ b/etc/archboot/lowmem.conf @@ -9,7 +9,7 @@ FILES="" # # Please change the hooks only if you know what you are doing. # hooks for lowmem image -HOOKS="arch_core_install arch_installer arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses" +HOOKS="arch_core_install arch_installer arch_acpi arch_bootmessage arch_motd arch_memtest arch_pam arch_shadow_lowmem arch_base_lowmem arch_udev arch_hwdetect arch_udevtrigger ide pata scsi sata usb arch_cdrom arch_pcspkr usbinput arch_raid arch_dmraid arch_lvm2 arch_encrypt arch_filesystems_lowmem arch_pacman_lowmem arch_licenses" ### NETWORK SETUP # the default install media creating process, uses latest files from svn! diff --git a/lib/initcpio/install/arch_fb b/lib/initcpio/install/arch_fb index d27aaaf20..6d3901501 100644 --- a/lib/initcpio/install/arch_fb +++ b/lib/initcpio/install/arch_fb @@ -4,9 +4,10 @@ install () { MODULES=" $(checked_modules "/video/" | grep 'fb')" - BINARIES="" + BINARIES="v86d" FILES="" SCRIPT="" + add_file /usr/share/archboot/fb/etc/modprobe.d/uvesafb } help () diff --git a/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index 00379b08b..a3000c758 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -2,7 +2,7 @@ install () { - MODULES=" $(checked_modules "/drivers/net/") " + MODULES=" $(checked_modules "/drivers/net/" | grep -ve "wireless") " BINARIES="ping ping6 route nslookup telnet ssh" FILES="" diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman index 380508fd7..f5a204139 100644 --- a/lib/initcpio/install/arch_pacman +++ b/lib/initcpio/install/arch_pacman @@ -19,7 +19,7 @@ wpa_supplicant gzip rsync libarchive libdownload device-mapper cracklib nfs-util pcre cpio archboot fuse klibc libusb vi lzo2 libsasl libldap libevent gpm sdparm pptpclient licenses \ madwifi madwifi-utils rt2x00-rt61-fw rt2x00-rt71w-fw rt2500 ndiswrapper ndiswrapper-utils \ zd1211-firmware wlan-ng26-utils wlan-ng26 ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode \ -smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted atl2 tzdata ntp" +smbclient tdb tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware parted atl2 tzdata ntp v86d" for i in $DEPENDS; do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do diff --git a/lib/initcpio/install/arch_pcspkr b/lib/initcpio/install/arch_pcspkr new file mode 100644 index 000000000..99a0823f0 --- /dev/null +++ b/lib/initcpio/install/arch_pcspkr @@ -0,0 +1,16 @@ +# Created by Tobias Powalowski + +install () +{ + MODULES="pcspkr" + BINARIES="" + FILES="" + SCRIPT="" +} + +help () +{ +cat<x[-][@] scroll= ... +# +# For more details see: +# http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/fb/uvesafb.txt +# + +options uvesafb mode_option=1024x768-32 scroll=ywrap diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 66a4c36a9..9ac8c652c 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -1518,7 +1518,7 @@ auto_hwdetect() HWDETECTHOSTCONTROLLER="" HWDETECTHOOKS="" HWDETECTRC="" - DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk controllers,\nnetwork and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes" + DIALOG --yesno "PRECONFIGURATION?\n-----------------\n\nDo you want to use 'hwdetect' for:\n'/etc/rc.conf' and '/etc/mkinitcpio.conf'?\n\nThis ensures consistent ordering of your hard disk / usb controllers,\nnetwork and sound devices.\n\nIt is recommended to say 'YES' here." 18 70 && HWDETECT="yes" if [ "$HWDETECT" = "yes" ]; then if /usr/bin/vmware-detect; then HWPARAMETER="$HWPARAMETER --vmware" @@ -1537,11 +1537,9 @@ auto_hwdetect() fi DIALOG --defaultno --yesno "Do you need support for booting from lvm2 volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --lvm2" DIALOG --defaultno --yesno "Do you need support for booting from encrypted volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --encrypt" - # add always keymap - HWPARAMETER="$HWPARAMETER --keymap" HWDETECTHOSTCONTROLLER="$(hwdetect --hostcontroller $HWPARAMETER)" HWDETECTHOOKS="$(hwdetect --hooks-dir=$DESTDIR/lib/initcpio/install --hooks $HWPARAMETER)" - HWDETECTRC="$(echo $(hwdetect --net --sound $HWPARAMETER)| sed -e 's#.*) ##g')" + HWDETECTRC="$(echo $(hwdetect --usbhost --net --sound $HWPARAMETER)| sed -e 's#.*) ##g')" [ -n "$HWDETECTHOSTCONTROLLER" ] && sed -i -e "s/^MODULES=.*/$HWDETECTHOSTCONTROLLER/g" ${DESTDIR}/etc/mkinitcpio.conf [ -n "$HWDETECTHOOKS" ] && sed -i -e "s/^HOOKS=.*/$HWDETECTHOOKS/g" ${DESTDIR}/etc/mkinitcpio.conf [ -n "$HWDETECTRC" ] && sed -i -e "s/^MODULES=.*/$HWDETECTRC/g" ${DESTDIR}/etc/rc.conf @@ -1560,7 +1558,7 @@ auto_dsdt() cp $DSDT $DESTDIR/lib/initcpio/custom.dsdt HWPARAMETER="$HWPARAMETER --dsdt" else - DIALOG --msgbox "ERROR: You have entered a wrong file name, please enter again." 0 0 + DIALOG --msgbox "ERROR: You have entered a invalid file name, please enter again." 0 0 DSDT="" fi done @@ -1570,16 +1568,20 @@ auto_dsdt() auto_parameters() { if [ -s /tmp/.keymap ]; then - DIALOG --yesno "Do you want to use the keymap: $(cat /tmp/.keymap | sed -e 's/\..*//g') in rc.conf?" 0 0 && sed -i -e "s/^KEYMAP=.*/KEYMAP=\"$(cat /tmp/.keymap | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + DIALOG --infobox "Setting the keymap: $(cat /tmp/.keymap | sed -e 's/\..*//g') in rc.conf ..." 0 0 + sed -i -e "s/^KEYMAP=.*/KEYMAP=\"$(cat /tmp/.keymap | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf fi if [ -s /tmp/.font ]; then - DIALOG --yesno "Do you want to use the consolefont: $(cat /tmp/.font | sed -e 's/\..*//g') in rc.conf?" 0 0 && sed -i -e "s/^CONSOLEFONT=.*/CONSOLEFONT=\"$(cat /tmp/.font | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + DIALOG --infobox "Setting the consolefont: $(cat /tmp/.font | sed -e 's/\..*//g') in rc.conf ..." 0 0 + sed -i -e "s/^CONSOLEFONT=.*/CONSOLEFONT=\"$(cat /tmp/.font | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf fi if [ -s /tmp/.hardwareclock ]; then - DIALOG --yesno "Do you want to use the hardwareclock: $(cat /tmp/.hardwareclock | sed -e 's/\..*//g') in rc.conf?" 0 0 && sed -i -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$(cat /tmp/.hardwareclock | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf + DIALOG --infobox "Setting the hardwareclock: $(cat /tmp/.hardwareclock | sed -e 's/\..*//g') in rc.conf ..." 0 0 + sed -i -e "s/^HARDWARECLOCK=.*/HARDWARECLOCK=\"$(cat /tmp/.hardwareclock | sed -e 's/\..*//g')\"/g" ${DESTDIR}/etc/rc.conf fi if [ -s /tmp/.timezone ]; then - DIALOG --yesno "Do you want to use the timezone: $(cat /tmp/.timezone | sed -e 's/\..*//g') in rc.conf?" 0 0 && sed -i -e "s#^TIMEZONE=.*#TIMEZONE=\"$(cat /tmp/.timezone | sed -e 's/\..*//g')\"#g" ${DESTDIR}/etc/rc.conf + DIALOG --infobox "Setting the timezone: $(cat /tmp/.timezone | sed -e 's/\..*//g') in rc.conf ..." 0 0 + sed -i -e "s#^TIMEZONE=.*#TIMEZONE=\"$(cat /tmp/.timezone | sed -e 's/\..*//g')\"#g" ${DESTDIR}/etc/rc.conf fi } @@ -1596,18 +1598,23 @@ auto_timesetting() fi } +auto_ftpmirror() +{ + # /etc/pacman.d/mirrorlist + # add installer-selected mirror to the top of the mirrorlist + if [ "$MODE" = "ftp" -a "${SYNC_URL}" != "" ]; then + awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${DESTDIR}/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist + mv /tmp/inst-mirrorlist "${DESTDIR}/etc/pacman.d/mirrorlist" + fi +} + configure_system() { ## PREPROCESSING ## # only done on first invocation of configure_system if [ $S_CONFIG -eq 0 ]; then - # /etc/pacman.d/mirrorlist - # add installer-selected mirror to the top of the mirrorlist - if [ "$MODE" = "ftp" -a "${SYNC_URL}" != "" ]; then - awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${DESTDIR}/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist - mv /tmp/inst-mirrorlist "${DESTDIR}/etc/pacman.d/mirrorlist" - fi + auto_ftpmirror auto_network auto_hwdetect auto_dsdt @@ -1708,8 +1715,8 @@ mainmenu() { fi dialog $DEFAULT --backtitle "$TITLE" --title " MAIN MENU " \ --menu "Use the UP and DOWN arrows to navigate menus. Use TAB to switch between buttons and ENTER to select." 17 55 13 \ - "0" "Keyboard And Console Setting" \ - "1" "Set Clock" \ + "0" "Set Keyboard And Console Font" \ + "1" "Set Time and Date" \ "2" "Prepare Hard Drive" \ "3" "Select Source" \ "4" "Select Packages" \ @@ -1747,7 +1754,7 @@ mainmenu() { echo "" exit 0 ;; *) - DIALOG --yesno "Abort Installation?" 6 40 &&[ -e /tmp/.setup-running ] && rm /tmp/.setup-running && clear && exit 0 + DIALOG --yesno "Abort Installation?" 6 40 && [ -e /tmp/.setup-running ] && rm /tmp/.setup-running && clear && exit 0 ;; esac }