From 4a402037ad6666181768721244d5fad85b16a87c Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 20 Nov 2007 12:27:09 +0100 Subject: [PATCH] 'fixed git calls in hooks, changed 64MB RAM message again to not use >= anymore' --- etc/append-message-syslinux-lowmem | 4 ++-- install/arch_ftp_install | 6 +++--- install/arch_lowmem_install | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/append-message-syslinux-lowmem b/etc/append-message-syslinux-lowmem index f1634c736..98e3681f8 100644 --- a/etc/append-message-syslinux-lowmem +++ b/etc/append-message-syslinux-lowmem @@ -1,9 +1,9 @@ Available boot options (no input will boot the install/rescue system): - 'arch ' to boot the install/rescue system. - 'arch root=/dev/??? ' to boot into an existing system. -- 'lowmem ' to boot the >=64MB RAM install system. +- 'lowmem ' to boot the 64MB RAM install system. - 'lowmem root=/dev/??? ' to boot into an existing - >=64MB RAM system. + 64MB RAM system. - 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 may be useful. diff --git a/install/arch_ftp_install b/install/arch_ftp_install index 6016cda70..bcb8b4e12 100644 --- a/install/arch_ftp_install +++ b/install/arch_ftp_install @@ -33,7 +33,7 @@ install () # fix km script KM=$(mktemp /tmp/km.XXXX) if ! [ "${LOCALSETUP}" = "yes" ]; then - cp -f ${GIT_INSTALLER_TREE}/arch/scripts/km ${KM} + cp -f /etc/archboot/scripts/km ${KM} else cp -f ${KMSCRIPT} ${KM} fi @@ -59,7 +59,7 @@ install () fi DOCS=$(mktemp /tmp/docs.XXXX) if ! [ "${LOCALSETUP}" = "yes" ]; then - cp -f ${GIT_INSTALLER_TREE}/arch-install-guide.txt ${DOCS} + cp -f ${GIT_INSTALLER_TREE}/installer/arch-install-guide.txt ${DOCS} else cp -f ${DOCUMENTATION} ${DOCS} fi @@ -67,7 +67,7 @@ install () add_file "${DOCS}.gz" "/arch/archdoc.txt.gz" add_dir "/src" if ! [ "${LOCALSETUP}" = "yes" ]; then - ! [ "${TEMPDIR}" = "" ] && cp ${GIT_INSTALLER_TREE}/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt + ! [ "${TEMPDIR}" = "" ] && cp ${GIT_INSTALLER_TREE}/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt else ! [ "${TEMPDIR}" = "" ] && cp -f ${DOCUMENTATION} ${TEMPDIR}/arch/archdoc.txt fi diff --git a/install/arch_lowmem_install b/install/arch_lowmem_install index 7f85f7de1..e58366d42 100644 --- a/install/arch_lowmem_install +++ b/install/arch_lowmem_install @@ -30,7 +30,7 @@ install () # always needed for every install cd ${GIT_INSTALLER_TREE} if ! [ "${LOCALSETUP}" = "yes" ]; then - git-cone ${GIT_INSTALL} + git-clone ${GIT_INSTALLER} fi mkdir -p ${TEMPDIR}/arch add_dir "/src"