root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'fixed various stuff, added pcspkr to environment, added usb

Browse source 
hostcontroller sorting, added v86d to fb'
This commit is contained in:
Tobias Powalowski 2008-12-17 17:36:59 +01:00
parent 4e0e843cbe
commit d0e1ef51b5
13 changed files with 62 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/archboot/allinone-lowmem.conf
View file

@ -9,7 +9,7 @@ FILES=""
# #
# Please change the other hooks only if you know what you are doing. # Please change the other hooks only if you know what you are doing.
# hooks for lowmem image # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/allinone.conf
View file

@ -8,7 +8,7 @@ FILES=""
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/default-ftp-pxelinux.conf
View file

@ -8,7 +8,7 @@ FILES=""
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/default-ftp.conf
View file

@ -8,7 +8,7 @@ FILES=""
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/default-pxelinux.conf
View file

@ -8,7 +8,7 @@ FILES=""
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/default.conf
View file

@ -8,7 +8,7 @@ FILES=""
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

2
etc/archboot/lowmem.conf
View file

@ -9,7 +9,7 @@ FILES=""
# #
# Please change the hooks only if you know what you are doing. # Please change the hooks only if you know what you are doing.
# hooks for lowmem image # 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 ### NETWORK SETUP
# the default install media creating process, uses latest files from svn! # the default install media creating process, uses latest files from svn!

3
lib/initcpio/install/arch_fb
View file

@ -4,9 +4,10 @@ install ()
{ {
MODULES=" $(checked_modules "/video/" | grep 'fb')" MODULES=" $(checked_modules "/video/" | grep 'fb')"
BINARIES="" BINARIES="v86d"
FILES="" FILES=""
SCRIPT="" SCRIPT=""
add_file /usr/share/archboot/fb/etc/modprobe.d/uvesafb
} }
help () help ()

2
lib/initcpio/install/arch_net
View file

@ -2,7 +2,7 @@
install () install ()
{ {
MODULES=" $(checked_modules "/drivers/net/") " MODULES=" $(checked_modules "/drivers/net/" | grep -ve "wireless") "
BINARIES="ping ping6 route nslookup telnet ssh" BINARIES="ping ping6 route nslookup telnet ssh"
FILES="" FILES=""

2
lib/initcpio/install/arch_pacman
View file

@ -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 \ 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 \ 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 \ 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 i in $DEPENDS; do
for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do for k in $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do

16
lib/initcpio/install/arch_pcspkr Normal file
View file

@ -0,0 +1,16 @@
# Created by Tobias Powalowski <tpowa@archlinux.org>
install ()
{
MODULES="pcspkr"
BINARIES=""
FILES=""
SCRIPT=""
}
help ()
{
cat<<HELPEOF
This hook includes the pcspkr on an arch boot image.
HELPEOF
}

10
usr/share/archboot/fb/etc/modprobe.d/uvesafb Normal file
View file

@ -0,0 +1,10 @@
#
# This file sets the parameters for uvesafb module.
# The following format should be used:
# options uvesafb mode=<xres>x<yres>[-<bpp>][@<refresh>] scroll=<ywrap|ypan|redraw> ...
#
# 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

43
usr/share/archboot/installer/setup
View file

@ -1518,7 +1518,7 @@ auto_hwdetect()
HWDETECTHOSTCONTROLLER="" HWDETECTHOSTCONTROLLER=""
HWDETECTHOOKS="" HWDETECTHOOKS=""
HWDETECTRC="" 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 [ "$HWDETECT" = "yes" ]; then
if /usr/bin/vmware-detect; then if /usr/bin/vmware-detect; then
HWPARAMETER="$HWPARAMETER --vmware" HWPARAMETER="$HWPARAMETER --vmware"
@ -1537,11 +1537,9 @@ auto_hwdetect()
fi 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 lvm2 volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --lvm2"
DIALOG --defaultno --yesno "Do you need support for booting from encrypted volumes?" 0 0 && HWPARAMETER="$HWPARAMETER --encrypt" 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)" HWDETECTHOSTCONTROLLER="$(hwdetect --hostcontroller $HWPARAMETER)"
HWDETECTHOOKS="$(hwdetect --hooks-dir=$DESTDIR/lib/initcpio/install --hooks $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 "$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 "$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 [ -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 cp $DSDT $DESTDIR/lib/initcpio/custom.dsdt
HWPARAMETER="$HWPARAMETER --dsdt" HWPARAMETER="$HWPARAMETER --dsdt"
else 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="" DSDT=""
fi fi
done done
@ -1570,16 +1568,20 @@ auto_dsdt()
auto_parameters() auto_parameters()
{ {
if [ -s /tmp/.keymap ]; then 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 fi
if [ -s /tmp/.font ]; then 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 fi
if [ -s /tmp/.hardwareclock ]; then 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 fi
if [ -s /tmp/.timezone ]; then 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 fi
} }
@ -1596,18 +1598,23 @@ auto_timesetting()
fi 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() configure_system()
{ {
## PREPROCESSING ## ## PREPROCESSING ##
# only done on first invocation of configure_system # only done on first invocation of configure_system
if [ $S_CONFIG -eq 0 ]; then if [ $S_CONFIG -eq 0 ]; then
# /etc/pacman.d/mirrorlist auto_ftpmirror
# 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_network auto_network
auto_hwdetect auto_hwdetect
auto_dsdt auto_dsdt
@ -1708,8 +1715,8 @@ mainmenu() {
fi fi
dialog $DEFAULT --backtitle "$TITLE" --title " MAIN MENU " \ 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 \ --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" \ "0" "Set Keyboard And Console Font" \
"1" "Set Clock" \ "1" "Set Time and Date" \
"2" "Prepare Hard Drive" \ "2" "Prepare Hard Drive" \
"3" "Select Source" \ "3" "Select Source" \
"4" "Select Packages" \ "4" "Select Packages" \
@ -1747,7 +1754,7 @@ mainmenu() {
echo "" echo ""
exit 0 ;; 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 esac
} }