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

' added new locations of git installer and added missing netfilter and wireless modules'

Browse source
This commit is contained in:
Tobias Powalowski 2007-11-19 18:38:05 +01:00
parent 858d7636f6
commit eaf3bc4e38
7 changed files with 59 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
install-lowmem.conf
View file

@ -27,8 +27,9 @@ fi
#
#SERVER PARAMETERS
FTPSERVER="ftp://ftp.archlinux.org/core/os"
# GIT SERVER
GIT_INSTALLER="git://projects.archlinux.org/installer.git"
# CVS SERVER
ARCH_CVSSETUP=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-arch"
CVSSETUP=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-core"
# CVS TAG
TAG="CURRENT"
@ -50,9 +51,7 @@ LOCALSETUP="no"
# export CVSROOT=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-arch"
# TAG="CURRENT"
# ### general setup stuff
# cvs -z3 co arch/scripts/{km,setup,quickinst}
# cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
# cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
# git-clone git://projects.archlinux.org/installer.git
# export CVSROOT=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-core"
# cvs -z3 co -r ${TAG} core/
# ---------------
@ -61,22 +60,22 @@ LOCALSETUP="no"
### GENERAL REMASTER PARAMETERS
# enter here your custom/modified cvs tree
CVSTREE=""
ARCH_CVSTREE=""
GIT_INSTALLER_TREE=""
# path to keyboard layout change script
KMSCRIPT="${ARCH_CVSTREE}/arch/scripts/km"
KMSCRIPT="/etc/archboot/scripts/km"
# path to setup script
SETUP="${ARCH_CVSTREE}/arch/scripts/setup"
SETUP="${GIT_INSTALLER_TREE}/setup"
# path to quickinst script
QUICKINST="${ARCH_CVSTREE}/arch/scripts/quickinst"
QUICKINST="${GIT_INSTALLER_TREE}/quickinst"
# path to file which include the mirrors
MIRRORS="${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt"
MIRRORS="${GIT_INSTALLER_TREE}/mirrors.txt"
# path to documentation file
DOCUMENTATION="${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt"
DOCUMENTATION="${GIT_INSTALLER_TREE}/arch-install-guide.txt"
# path to built packages
PACKAGEDIR=""

27
install.conf
View file

@ -26,8 +26,9 @@ fi
#
#SERVER PARAMETERS
FTPSERVER="ftp://ftp.archlinux.org/core/os"
# GIT SERVER
GIT_INSTALLER="git://projects.archlinux.org/installer.git"
# CVS SERVER
ARCH_CVSSETUP=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-arch"
CVSSETUP=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-core"
# CVS TAG
TAG="CURRENT"
@ -41,17 +42,13 @@ TAG="CURRENT"
LOCALSETUP="no"
#### NOTES:
# To get the cvs tree use these commands:
# To get the git and cvs tree use these commands:
# - change to your dir you want to hold the cvs files and execute the script below
# Example Script:
# ---------------
# #!/bin/sh
# export CVSROOT=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-arch"
# TAG="CURRENT"
# ### general setup stuff
# cvs -z3 co arch/scripts/{km,setup,quickinst}
# cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
# cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
# git-clone git://projects.archlinux.org/installer.git
# export CVSROOT=":pserver:anonymous:anonymous@cvs.archlinux.org:/home/cvs-core"
# cvs -z3 co -r ${TAG} core/
# ---------------
@ -60,22 +57,22 @@ LOCALSETUP="no"
### GENERAL REMASTER PARAMETERS
# enter here your custom/modified cvs tree
CVSTREE=""
ARCH_CVSTREE=""
GIT_INSTALLER_TREE=""
# path to keyboard layout change script
KMSCRIPT="${ARCH_CVSTREE}/arch/scripts/km"
KMSCRIPT="/etc/archboot/scripts/km"
# path to setup script
SETUP="${ARCH_CVSTREE}/arch/scripts/setup"
SETUP="${GIT_INSTALLER_TREE}/setup"
# path to quickinst script
QUICKINST="${ARCH_CVSTREE}/arch/scripts/quickinst"
QUICKINST="${GIT_INSTALLER_TREE}/quickinst"
# path to file which include the mirrors
MIRRORS="${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt"
MIRRORS="${GIT_INSTALLER_TREE}/mirrors.txt"
# path to documentation file
DOCUMENTATION="${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt"
DOCUMENTATION="${GIT_INSTALLER_TREE}/arch-install-guide.txt"
# path to built packages
PACKAGEDIR=""
@ -86,7 +83,7 @@ PACKAGEDIR=""
# or build it on your own ;)
PACMANBINARY=""
# path to rc.sysinit to get arch version
# name of the release
ARCHVERSION="Core Dump"
#### REMASTER FTP INSTALL MEDIA
@ -94,5 +91,5 @@ ARCHVERSION="Core Dump"
#### REMASTER CORE INSTALL MEDIA
### main cvs dir for base install
# Note: the MAINCVSDIR dir must include a 'base' and 'kernels' directory
# Note: the MAINCVSDIR dir must include a 'base' directory
MAINCVSDIR="${CVSTREE}/core"

31
install/arch_core_install
View file

@ -19,16 +19,16 @@ install ()
### begin cvs part
if ! [ "${LOCALSETUP}" = "yes" ]; then
CVSTREE=$(mktemp /tmp/corecvs.XXXX)
ARCH_CVSTREE=$(mktemp /tmp/archcvs.XXXX)
GIT_INSTALLER_TREE=$(mktemp /tmp/installer.git.XXXX)
rm ${CVSTREE}
rm ${ARCH_CVSTREE}
rm ${GIT_INSTALLER_TREE}
mkdir -p ${CVSTREE}
mkdir -p ${ARCH_CVSTREE}
mkdir -p ${GIT_INSTALLER_TREE}
# checkout actual core cvs
export CVSROOT=${CVSSETUP}
else
CVSTREE=${CVSTREE}
ARCH_CVSTREE=${ARCH_CVSTREE}
GIT_INSTALLER_TREE=${GIT_INSTALLER_TREE}
fi
cd ${CVSTREE}
if ! [ "${LOCALSETUP}" = "yes" ]; then
@ -87,17 +87,14 @@ install ()
SCRIPT=
BINARIES=
# always needed for every install
cd ${ARCH_CVSTREE}
cd ${GIT_INSTALLER_TREE}
if ! [ "${LOCALSETUP}" = "yes" ]; then
export CVSROOT=${ARCH_CVSSETUP}
cvs -z3 co arch/scripts/{km,setup,quickinst}
cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
git-clone ${GIT_INSTALLER}
fi
# fix km script
KM=$(mktemp /tmp/km.XXXX)
if ! [ "${LOCALSETUP}" = "yes" ]; then
cp -f ${ARCH_CVSTREE}/arch/scripts/km ${KM}
cp -f /etc/archboot/scripts/km ${KM}
else
cp -f ${KMSCRIPT} ${KM}
fi
@ -107,15 +104,15 @@ install ()
add_file "${KM}" "/bin/km"
# fix mirrors.txt
if ! [ "${LOCALSETUP}" = "yes" ]; then
sed -i -e "s/i686/$(uname -m)/g" ${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt
add_file "${ARCH_CVSTREE}/arch/scripts/setup" "/arch/setup"
add_file "${ARCH_CVSTREE}/arch/scripts/quickinst" "/arch/quickinst"
add_file "${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt" "/arch/mirrors.txt"
sed -i -e "s/i686/$(uname -m)/g" ${GIT_INSTALLER_TREE}/installer/mirrors.txt
add_file "${GIT_INSTALLER_TREE}/installer/setup" "/arch/setup"
add_file "${GIT_INSTALLER_TREE}/installer/quickinst" "/arch/quickinst"
add_file "${GIT_INSTALLER_TREE}/installer/mirrors.txt" "/arch/mirrors.txt"
else
MIRRORTREE=$(mktemp /tmp/mirror.XXXX)
rm ${MIRRORTREE}
mkdir -p ${MIRRORTREE}
cp ${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt ${MIRRORTREE}/
cp ${GIT_INSTALLER_TREE}/mirrors.txt ${MIRRORTREE}/
sed -i -e "s/i686/$(uname -m)/g" ${MIRRORTREE}/mirrors.txt
add_file "${SETUP}" "/arch/setup"
add_file "${QUICKINST}" "/arch/quickinst"
@ -123,7 +120,7 @@ install ()
fi
DOCS=$(mktemp /tmp/docs.XXXX)
if ! [ "${LOCALSETUP}" = "yes" ]; then
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
cp -f ${GIT_INSTALLER_TREE}/installer/arch-install-guide.txt ${DOCS}
else
cp -f ${DOCUMENTATION} ${DOCS}
fi
@ -132,7 +129,7 @@ install ()
add_dir "/src"
if ! [ "${LOCALSETUP}" = "yes" ]; then
if ! [ "${TEMPDIR}" = "" ]; then
cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
cp ${GIT_INSTALLER_TREE}/installer/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
cd ${TEMPDIR}/arch/pkg/setup/
#wget ${FTPSERVER}/$(uname -m)/setup/pacman.pkg.tar.gz
cd ${TEMPDIR}/core/pkg/

33
install/arch_ftp_install
View file

@ -14,31 +14,26 @@ install ()
### begin cvs part
if ! [ "${LOCALSETUP}" = "yes" ]; then
CVSTREE=$(mktemp /tmp/corecvs.XXXX)
ARCH_CVSTREE=$(mktemp /tmp/archcvs.XXXX)
GIT_INSTALLER_TREE=$(mktemp /tmp/installer.git.XXXX)
rm ${CVSTREE}
rm ${ARCH_CVSTREE}
rm ${GIT_INSTALLER_TREE}
mkdir -p ${CVSTREE}
mkdir -p ${ARCH_CVSTREE}
# checkout actual CURRENT cvs
export CVSROOT=${CVSSETUP}
mkdir -p ${GIT_INSTALLER_TREE}
else
CVSTREE=${CVSTREE}
ARCH_CVSTREE=${ARCH_CVSTREE}
GIT_INSTALLER_TREE=${GIT_INSTALLER_TREE}
fi
SCRIPT=
BINARIES=
# always needed for every install
cd ${ARCH_CVSTREE}
cd ${GIT_INSTALLER_TREE}
if ! [ "${LOCALSETUP}" = "yes" ]; then
export CVSROOT=${ARCH_CVSSETUP}
cvs -z3 co arch/scripts/{km,setup,quickinst}
cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
git-clone ${GIT_INSTALLER}
fi
# fix km script
KM=$(mktemp /tmp/km.XXXX)
if ! [ "${LOCALSETUP}" = "yes" ]; then
cp -f ${ARCH_CVSTREE}/arch/scripts/km ${KM}
cp -f ${GIT_INSTALLER_TREE}/arch/scripts/km ${KM}
else
cp -f ${KMSCRIPT} ${KM}
fi
@ -48,15 +43,15 @@ install ()
add_file "${KM}" "/bin/km"
# fix mirrors.txt
if ! [ "${LOCALSETUP}" = "yes" ]; then
sed -i -e "s/i686/$(uname -m)/g" ${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt
add_file "${ARCH_CVSTREE}/arch/scripts/setup" "/arch/setup"
add_file "${ARCH_CVSTREE}/arch/scripts/quickinst" "/arch/quickinst"
add_file "${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt" "/arch/mirrors.txt"
sed -i -e "s/i686/$(uname -m)/g" ${GIT_INSTALLER_TREE}/installer/mirrors.txt
add_file "${GIT_INSTALLER_TREE}/installer/setup" "/arch/setup"
add_file "${GIT_INSTALLER_TREE}/installer/quickinst" "/arch/quickinst"
add_file "${GIT_INSTALLER_TREE}/installer/mirrors.txt" "/arch/mirrors.txt"
else
MIRRORTREE=$(mktemp /tmp/mirror.XXXX)
rm ${MIRRORTREE}
mkdir -p ${MIRRORTREE}
cp ${ARCH_CVSTREE}/arch/misc/bootdisk/2/mirrors.txt ${MIRRORTREE}/
cp ${GIT_INSTALLER_TREE}/mirrors.txt ${MIRRORTREE}/
sed -i -e "s/i686/$(uname -m)/g" ${MIRRORTREE}/mirrors.txt
add_file "${SETUP}" "/arch/setup"
add_file "${QUICKINST}" "/arch/quickinst"
@ -64,7 +59,7 @@ install ()
fi
DOCS=$(mktemp /tmp/docs.XXXX)
if ! [ "${LOCALSETUP}" = "yes" ]; then
cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
cp -f ${GIT_INSTALLER_TREE}/arch-install-guide.txt ${DOCS}
else
cp -f ${DOCUMENTATION} ${DOCS}
fi
@ -72,7 +67,7 @@ install ()
add_file "${DOCS}.gz" "/arch/archdoc.txt.gz"
add_dir "/src"
if ! [ "${LOCALSETUP}" = "yes" ]; then
! [ "${TEMPDIR}" = "" ] && cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
! [ "${TEMPDIR}" = "" ] && cp ${GIT_INSTALLER_TREE}/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
else
! [ "${TEMPDIR}" = "" ] && cp -f ${DOCUMENTATION} ${TEMPDIR}/arch/archdoc.txt
fi

2
install/arch_iptables
View file

@ -2,7 +2,7 @@
install ()
{
MODULES="$(checked_modules "/net/ipv6") $(checked_modules "/net/ipv4") $(checked_modules "/net/netfilter")"
MODULES="$(checked_modules "/net/ipv6") $(checked_modules "/net/ipv4") $(checked_modules "/net/netfilter") $(checked_modules "/net/bridge/")"
BINARIES="ip6tables ip6tables-restore ip6tables-save iptables iptables-restore iptables-save iptables-xml"
FILES=""
SCRIPT=""

17
install/arch_lowmem_install
View file

@ -14,30 +14,29 @@ install ()
### begin cvs part
if ! [ "${LOCALSETUP}" = "yes" ]; then
CVSTREE=$(mktemp /tmp/corecvs.XXXX)
ARCH_CVSTREE=$(mktemp /tmp/archcvs.XXXX)
GIT_INSTALLER_TREE=$(mktemp /tmp/installer.git.XXXX)
rm ${CVSTREE}
rm ${ARCH_CVSTREE}
rm ${GIT_INSTALLER_TREE}
mkdir -p ${CVSTREE}
mkdir -p ${ARCH_CVSTREE}
mkdir -p ${GIT_INSTALLER_TREE}
# checkout actual CURRENT cvs
export CVSROOT=${CVSSETUP}
else
CVSTREE=${CVSTREE}
ARCH_CVSTREE=${ARCH_CVSTREE}
GIT_INSTALLER_TREE=${GIT_INSTALLER_TREE}
fi
SCRIPT=
BINARIES=
# always needed for every install
cd ${ARCH_CVSTREE}
cd ${GIT_INSTALLER_TREE}
if ! [ "${LOCALSETUP}" = "yes" ]; then
export CVSROOT=${ARCH_CVSSETUP}
cvs -z3 co arch/scripts/{setup,quickinst}
git-cone ${GIT_INSTALL}
fi
mkdir -p ${TEMPDIR}/arch
add_dir "/src"
if ! [ "${LOCALSETUP}" = "yes" ]; then
add_file "${ARCH_CVSTREE}/arch/scripts/setup" "/arch/setup"
add_file "${ARCH_CVSTREE}/arch/scripts/quickinst" "/arch/quickinst"
add_file "${GIT_INSTALLER_TREE}/installer/setup" "/arch/setup"
add_file "${GIT_INSTALLER_TREE}/installer/quickinst" "/arch/quickinst"
else
sed -i -e "s/i686/$(uname -m)/g" ${MIRRORS}
add_file "${SETUP}" "/arch/setup"

2
install/arch_wireless
View file

@ -2,7 +2,7 @@
install ()
{
MODULES=" $(checked_modules "/drivers/net/wirless/") "
MODULES="$(checked_modules "/drivers/net/wirless/") $(checked_modules "/net/wirless/") $(checked_modules "/net/ieee80211/") $(checked_modules "/net/mac80211/")"
BINARIES="iwconfig iwevent iwgetid iwlist iwpriv iwspy bcm43xx-fwcutter wpa_cli wpa_passphrase wpa_supplicant 80211debug 80211stats athchans athctrl athdebug athkey athstats wlanconfig nwepgen prism2dl wlancfg wlanctl-ng loadndisdriver perl"
FILES=""