From 432d670a1409a20069d748d7163d509473029c91 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 12 Dec 2009 09:15:54 +0100 Subject: [PATCH] change install guide to new name archboot.txt --- lib/initcpio/install/arch_addons | 6 ------ lib/initcpio/install/arch_installer | 6 +++--- lib/initcpio/install/arch_intel_wireless | 4 ---- lib/initcpio/install/arch_motd | 2 +- lib/initcpio/install/arch_tiacx_wireless | 5 ----- usr/share/archboot/bootloader/messages/allinone | 12 ++++++------ .../archboot/bootloader/messages/append-options | 9 ++++++--- .../{arch-install-guide.txt => archboot.txt} | 0 8 files changed, 16 insertions(+), 28 deletions(-) rename usr/share/archboot/installer/{arch-install-guide.txt => archboot.txt} (100%) diff --git a/lib/initcpio/install/arch_addons b/lib/initcpio/install/arch_addons index 292d3faff..9d218b4f6 100644 --- a/lib/initcpio/install/arch_addons +++ b/lib/initcpio/install/arch_addons @@ -6,12 +6,6 @@ install () BINARIES="" FILES="" SCRIPT="arch_addons" - echo "- ARCH_ADDONS USAGE:" >> ${OPTIONSBOOTMESSAGE} - echo " In order to load external addon packages or configs" >> ${OPTIONSBOOTMESSAGE} - echo " into the install environment, please append arch-addons to boot prompt." >> ${OPTIONSBOOTMESSAGE} - echo " Place external addon packages in /packages directory." >> ${OPTIONSBOOTMESSAGE} - echo " Place external configs in /config directory." >> ${OPTIONSBOOTMESSAGE} - echo "" >> ${OPTIONSBOOTMESSAGE} ! [ -d ${TEMPDIR}/packages ] && mkdir ${TEMPDIR}/packages ! [ -d ${TEMPDIR}/config ] && mkdir ${TEMPDIR}/config cp -r /etc/archboot/packages/* ${TEMPDIR}/packages diff --git a/lib/initcpio/install/arch_installer b/lib/initcpio/install/arch_installer index 1d88a3bf8..48dbcf549 100644 --- a/lib/initcpio/install/arch_installer +++ b/lib/initcpio/install/arch_installer @@ -10,11 +10,11 @@ install () add_file "/usr/share/archboot/installer/setup" "/arch/setup" add_file "/usr/share/archboot/installer/quickinst" "/arch/quickinst" DOCS=$(mktemp /tmp/docs.XXXX) - cp -f /usr/share/archboot/installer/arch-install-guide.txt ${DOCS} + cp -f /usr/share/archboot/installer/archboot.txt ${DOCS} gzip -9 ${DOCS} - add_file "${DOCS}.gz" "/arch/archdoc.txt.gz" + add_file "${DOCS}.gz" "/arch/archboot.txt.gz" add_dir "/src" - cp /usr/share/archboot/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt + cp /usr/share/archboot/installer/archboot.txt ${TEMPDIR}/arch/archboot.txt } help () diff --git a/lib/initcpio/install/arch_intel_wireless b/lib/initcpio/install/arch_intel_wireless index 55ae2ed42..25e1ce8d5 100644 --- a/lib/initcpio/install/arch_intel_wireless +++ b/lib/initcpio/install/arch_intel_wireless @@ -31,10 +31,6 @@ install () add_file "/usr/share/licenses/iwlwifi-5150-ucode/LICENSE" add_file "/lib/firmware/iwlwifi-6000-4.ucode" add_file "/usr/share/licenses/iwlwifi-6000-ucode/LICENSE" - echo "- ARCH_INTEL_WIRELESS USAGE:" >> ${OPTIONSBOOTMESSAGE} - echo " In order to use those drivers, you have to agree to the firmware licenses" >> ${OPTIONSBOOTMESSAGE} - echo " by appending intel-wireless to boot prompt." >> ${OPTIONSBOOTMESSAGE} - echo "" >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/lib/initcpio/install/arch_motd b/lib/initcpio/install/arch_motd index f296f9205..bb1e2db41 100644 --- a/lib/initcpio/install/arch_motd +++ b/lib/initcpio/install/arch_motd @@ -30,7 +30,7 @@ if [ "$(echo $HOOKS | grep arch_installer)" ]; then echo " - Use '/arch/quickinst' to install and bypass the setup routine." >> ${MOTD} echo "Documentation:" >> ${MOTD} echo " - Documentation can be read by executing:" >> ${MOTD} - echo " zcat /arch/archdoc.txt.gz | less" >> ${MOTD} + echo " zcat /arch/archboot.txt.gz | less" >> ${MOTD} fi chmod 644 ${MOTD} add_file "${MOTD}" "/etc/motd" diff --git a/lib/initcpio/install/arch_tiacx_wireless b/lib/initcpio/install/arch_tiacx_wireless index 98a29e1eb..7c45cc761 100644 --- a/lib/initcpio/install/arch_tiacx_wireless +++ b/lib/initcpio/install/arch_tiacx_wireless @@ -10,11 +10,6 @@ install () for i in $(find /usr/share/tiacx/ ! -type d); do add_file $i done - echo "- ARCH_TIACX_WIRELESS USAGE:" >> ${OPTIONSBOOTMESSAGE} - echo " Please identify the correct file(s) for your device in /usr/share/tiacx" >> ${OPTIONSBOOTMESSAGE} - echo " and copy them to /lib/firmware and reload your kernel module." >> ${OPTIONSBOOTMESSAGE} - echo " See http://acx100.sourceforge.net/wiki/Firmware for details." >> ${OPTIONSBOOTMESSAGE} - echo "" >> ${OPTIONSBOOTMESSAGE} } help () diff --git a/usr/share/archboot/bootloader/messages/allinone b/usr/share/archboot/bootloader/messages/allinone index 7670b49df..1468ae5ee 100644 --- a/usr/share/archboot/bootloader/messages/allinone +++ b/usr/share/archboot/bootloader/messages/allinone @@ -9,16 +9,16 @@ Creation Tool: 'archboot' written by Tobias Powalowski INSTALLATION / RESCUEBOOT SYSTEM Arch Linux @@RELEASENAME@@ -Kernel: @@KERNEL@@ +Kernel: @@KERNEL@@ / @@KERNEL_LTS@@ Architecture: i686/x86_64 Creation Date: @@DATE@@ -Available boot options (no input will boot the 32bit archboot system): -- For 64bit environment, please use arch64 or lowmem64. +Available boot options (no input will boot the 32bit archboot system after 30): - 'arch ' to boot the archboot system. -- 'arch root=/dev/??? ' to boot into an existing system. +- 'arch64 ' to boot the 64bit archboot system. - 'lowmem ' to boot the 96MB RAM archboot system. -- 'lowmem root=/dev/??? ' to boot into an existing - 96MB RAM system. +- 'lowmem64 ' to boot the 64bit 96MB RAM archboot system. +- For booting the LTS kernel, add -lts to each kernel image e.g. arch-lts. - 'memtest' to start the memory test program memtest86+. + - For troubleshooting and other options press the F2 key. diff --git a/usr/share/archboot/bootloader/messages/append-options b/usr/share/archboot/bootloader/messages/append-options index 27cad8baa..476013c88 100644 --- a/usr/share/archboot/bootloader/messages/append-options +++ b/usr/share/archboot/bootloader/messages/append-options @@ -1,9 +1,12 @@ -Arch Linux options and troubleshooting: +Arch Linux (archboot) options and troubleshooting: - For returning to start screen press F1 key. -- If you have trouble with IDE drives, use the "ide-legacy" boot option. - - If your system hangs during the boot process, any combinations of the boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. +- For general installation instructions, please have a look at: + arch/archboot.txt + +- For more bootparameter options, please have a look at: + arch/archboot.txt #Bootparameter section diff --git a/usr/share/archboot/installer/arch-install-guide.txt b/usr/share/archboot/installer/archboot.txt similarity index 100% rename from usr/share/archboot/installer/arch-install-guide.txt rename to usr/share/archboot/installer/archboot.txt