faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] Rename root-image to airootfs

Browse Source 
Two purposes:
 * systemd filename friendly: "-" is used for "/" and must be escaped with "\x20"
 * ISO9660 filename friendly: "-" is replaced with "_"
This commit is contained in:
Gerardo Exequiel Pozzi 2014-06-28 00:35:50 -03:00
parent 6a7497e23d
commit 604b182af5
21 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
archiso/mkarchiso
View File

@ -51,14 +51,14 @@ _chroot_init() {
if [[ -f "${work_dir}/mkarchiso.init" ]]; then if [[ -f "${work_dir}/mkarchiso.init" ]]; then
_msg_info "Initial enviroment already installed, skipping." _msg_info "Initial enviroment already installed, skipping."
else else
mkdir -p ${work_dir}/root-image mkdir -p ${work_dir}/airootfs
_pacman "base syslinux" _pacman "base syslinux"
: > "${work_dir}/mkarchiso.init" : > "${work_dir}/mkarchiso.init"
fi fi
} }
_chroot_run() { _chroot_run() {
eval arch-chroot ${work_dir}/root-image "${run_cmd}" eval arch-chroot ${work_dir}/airootfs "${run_cmd}"
} }
# Mount a filesystem (trap signals in case of error for unmounting it # Mount a filesystem (trap signals in case of error for unmounting it
@ -116,7 +116,7 @@ _usage ()
echo "usage ${app_name} [options] command <command options>" echo "usage ${app_name} [options] command <command options>"
echo " general options:" echo " general options:"
echo " -p PACKAGE(S) Package(s) to install, can be used multiple times" echo " -p PACKAGE(S) Package(s) to install, can be used multiple times"
echo " -r <command> Run <command> inside root-image" echo " -r <command> Run <command> inside airootfs"
echo " -C <file> Config file for pacman." echo " -C <file> Config file for pacman."
echo " Default: '${pacman_conf}'" echo " Default: '${pacman_conf}'"
echo " -L <label> Set a label for the disk" echo " -L <label> Set a label for the disk"
@ -146,7 +146,7 @@ _usage ()
echo " checksum" echo " checksum"
echo " make a checksum.md5 for self-test" echo " make a checksum.md5 for self-test"
echo " pkglist" echo " pkglist"
echo " make a pkglist.txt of packages installed on root-image" echo " make a pkglist.txt of packages installed on airootfs"
echo " iso <image name>" echo " iso <image name>"
echo " build an iso image from the working dir" echo " build an iso image from the working dir"
exit ${1} exit ${1}
@ -189,51 +189,51 @@ _show_config () {
echo echo
} }
# Install desired packages to root-image # Install desired packages to airootfs
_pacman () _pacman ()
{ {
_msg_info "Installing packages to '${work_dir}/root-image/'..." _msg_info "Installing packages to '${work_dir}/airootfs/'..."
if [[ "${quiet}" = "y" ]]; then if [[ "${quiet}" = "y" ]]; then
pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/root-image" $* &> /dev/null pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $* &> /dev/null
else else
pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/root-image" $* pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $*
fi fi
_msg_info "Packages installed successfully!" _msg_info "Packages installed successfully!"
} }
# Cleanup root-image # Cleanup airootfs
_cleanup () { _cleanup () {
_msg_info "Cleaning up what we can on root-image..." _msg_info "Cleaning up what we can on airootfs..."
# Delete initcpio image(s) # Delete initcpio image(s)
if [[ -d "${work_dir}/root-image/boot" ]]; then if [[ -d "${work_dir}/airootfs/boot" ]]; then
find "${work_dir}/root-image/boot" -type f -name '*.img' -delete find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete
fi fi
# Delete kernel(s) # Delete kernel(s)
if [[ -d "${work_dir}/root-image/boot" ]]; then if [[ -d "${work_dir}/airootfs/boot" ]]; then
find "${work_dir}/root-image/boot" -type f -name 'vmlinuz*' -delete find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete
fi fi
# Delete pacman database sync cache files (*.tar.gz) # Delete pacman database sync cache files (*.tar.gz)
if [[ -d "${work_dir}/root-image/var/lib/pacman" ]]; then if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then
find "${work_dir}/root-image/var/lib/pacman" -maxdepth 1 -type f -delete find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete
fi fi
# Delete pacman database sync cache # Delete pacman database sync cache
if [[ -d "${work_dir}/root-image/var/lib/pacman/sync" ]]; then if [[ -d "${work_dir}/airootfs/var/lib/pacman/sync" ]]; then
find "${work_dir}/root-image/var/lib/pacman/sync" -delete find "${work_dir}/airootfs/var/lib/pacman/sync" -delete
fi fi
# Delete pacman package cache # Delete pacman package cache
if [[ -d "${work_dir}/root-image/var/cache/pacman/pkg" ]]; then if [[ -d "${work_dir}/airootfs/var/cache/pacman/pkg" ]]; then
find "${work_dir}/root-image/var/cache/pacman/pkg" -type f -delete find "${work_dir}/airootfs/var/cache/pacman/pkg" -type f -delete
fi fi
# Delete all log files, keeps empty dirs. # Delete all log files, keeps empty dirs.
if [[ -d "${work_dir}/root-image/var/log" ]]; then if [[ -d "${work_dir}/airootfs/var/log" ]]; then
find "${work_dir}/root-image/var/log" -type f -delete find "${work_dir}/airootfs/var/log" -type f -delete
fi fi
# Delete all temporary files and dirs # Delete all temporary files and dirs
if [[ -d "${work_dir}/root-image/var/tmp" ]]; then if [[ -d "${work_dir}/airootfs/var/tmp" ]]; then
find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete
fi fi
# Delete package pacman related files. # Delete package pacman related files.
find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete
@ -359,9 +359,9 @@ command_checksum () {
command_pkglist () { command_pkglist () {
_show_config pkglist _show_config pkglist
if _is_directory_changed "${work_dir}/root-image/var/lib/pacman/local" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"; then if _is_directory_changed "${work_dir}/airootfs/var/lib/pacman/local" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"; then
_msg_info "Creating a list of installed packages on live-enviroment..." _msg_info "Creating a list of installed packages on live-enviroment..."
pacman -Sl -r "${work_dir}/root-image" --config "${pacman_conf}" | \ pacman -Sl -r "${work_dir}/airootfs" --config "${pacman_conf}" | \
awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \ awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \
"${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
_msg_info "Done!" _msg_info "Done!"
@ -450,7 +450,7 @@ command_prepare () {
done < "${work_dir}/iso/${install_dir}/aitab" done < "${work_dir}/iso/${install_dir}/aitab"
} }
# Install packages on root-image. # Install packages on airootfs.
# A basic check to avoid double execution/reinstallation is done via hashing package names. # A basic check to avoid double execution/reinstallation is done via hashing package names.
command_install () { command_install () {
if [[ ! -f "${pacman_conf}" ]]; then if [[ ! -f "${pacman_conf}" ]]; then

2
configs/baseline/aitab
View File

@ -1,2 +1,2 @@
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
root-image / %ARCH% gzip ext4 50% airootfs / %ARCH% gzip ext4 50%

26
configs/baseline/build.sh
View File

@ -20,24 +20,24 @@ run_once() {
fi fi
} }
# Base installation (root-image) # Base installation (airootfs)
make_basefs() { make_basefs() {
mkarchiso -v -w "${work_dir}" -D "${install_dir}" init mkarchiso -v -w "${work_dir}" -D "${install_dir}" init
} }
# Copy mkinitcpio archiso hooks and build initramfs (root-image) # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() { make_setup_mkinitcpio() {
cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks cp /usr/lib/initcpio/hooks/archiso ${work_dir}/airootfs/usr/lib/initcpio/hooks
cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install cp /usr/lib/initcpio/install/archiso ${work_dir}/airootfs/usr/lib/initcpio/install
cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf cp ${script_path}/mkinitcpio.conf ${work_dir}/airootfs/etc/mkinitcpio-archiso.conf
mkarchiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run mkarchiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
} }
# Prepare ${install_dir}/boot/ # Prepare ${install_dir}/boot/
make_boot() { make_boot() {
mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
cp ${work_dir}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp ${work_dir}/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp ${work_dir}/airootfs/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
} }
# Prepare /${install_dir}/boot/syslinux # Prepare /${install_dir}/boot/syslinux
@ -46,18 +46,18 @@ make_syslinux() {
sed "s|%ARCHISO_LABEL%|${iso_label}|g; sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g; s|%INSTALL_DIR%|${install_dir}|g;
s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg
cp ${work_dir}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
cp ${work_dir}/root-image/usr/lib/syslinux/bios/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
cp ${work_dir}/root-image/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
} }
# Prepare /isolinux # Prepare /isolinux
make_isolinux() { make_isolinux() {
mkdir -p ${work_dir}/iso/isolinux mkdir -p ${work_dir}/iso/isolinux
sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
cp ${work_dir}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
cp ${work_dir}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
cp ${work_dir}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
} }
# Process aitab # Process aitab

0
configs/releng/root-image/etc/fstab → configs/releng/airootfs/etc/fstab
View File

0
configs/releng/root-image/etc/hostname → configs/releng/airootfs/etc/hostname
View File

0
configs/releng/root-image/etc/locale.conf → configs/releng/airootfs/etc/locale.conf
View File

0
configs/releng/root-image/etc/pam.d/su → configs/releng/airootfs/etc/pam.d/su
View File

0
configs/releng/root-image/etc/sudoers.d/g_wheel → configs/releng/airootfs/etc/sudoers.d/g_wheel
View File

0
configs/releng/root-image/etc/systemd/scripts/choose-mirror → configs/releng/airootfs/etc/systemd/scripts/choose-mirror
View File

0
configs/releng/root-image/etc/systemd/system/choose-mirror.service → configs/releng/airootfs/etc/systemd/system/choose-mirror.service
View File

0
configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount → configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
View File

0
configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf → configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
View File

0
configs/releng/root-image/etc/systemd/system/pacman-init.service → configs/releng/airootfs/etc/systemd/system/pacman-init.service
View File

0
configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules → configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules
View File

0
configs/releng/root-image/root/.automated_script.sh → configs/releng/airootfs/root/.automated_script.sh
View File

0
configs/releng/root-image/root/.zlogin → configs/releng/airootfs/root/.zlogin
View File

0
configs/releng/root-image/root/customize_root_image.sh → configs/releng/airootfs/root/customize_airootfs.sh
View File

0
configs/releng/root-image/root/install.txt → configs/releng/airootfs/root/install.txt
View File

4
configs/releng/aitab
View File

@ -1,3 +1,3 @@
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> # <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
root-image / i686 xz ext4 50% airootfs / i686 xz ext4 50%
root-image / x86_64 xz ext4 50% airootfs / x86_64 xz ext4 50%

76
configs/releng/build.sh
View File

@ -51,53 +51,53 @@ make_pacman_conf() {
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${pacman_conf} sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${pacman_conf}
} }
# Base installation, plus needed packages (root-image) # Base installation, plus needed packages (airootfs)
make_basefs() { make_basefs() {
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install
} }
# Additional packages (root-image) # Additional packages (airootfs)
make_packages() { make_packages() {
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install
} }
# Copy mkinitcpio archiso hooks and build initramfs (root-image) # Copy mkinitcpio archiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() { make_setup_mkinitcpio() {
local _hook local _hook
for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/hooks cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks
cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install
done done
cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install
cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/airootfs/usr/lib/initcpio
cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-archiso.conf cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/airootfs/etc/mkinitcpio-archiso.conf
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
} }
# Customize installation (root-image) # Customize installation (airootfs)
make_customize_root_image() { make_customize_airootfs() {
cp -af ${script_path}/root-image ${work_dir}/${arch} cp -af ${script_path}/airootfs ${work_dir}/${arch}
curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh rm ${work_dir}/${arch}/airootfs/root/customize_airootfs.sh
} }
# Prepare kernel/initramfs ${install_dir}/boot/ # Prepare kernel/initramfs ${install_dir}/boot/
make_boot() { make_boot() {
mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
cp ${work_dir}/${arch}/root-image/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp ${work_dir}/${arch}/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp ${work_dir}/${arch}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
} }
# Add other aditional/extra files to ${install_dir}/boot/ # Add other aditional/extra files to ${install_dir}/boot/
make_boot_extra() { make_boot_extra() {
cp ${work_dir}/${arch}/root-image/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest cp ${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
cp ${work_dir}/${arch}/root-image/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING cp ${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
} }
# Prepare /${install_dir}/boot/syslinux # Prepare /${install_dir}/boot/syslinux
@ -108,30 +108,30 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/} s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done done
cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
gzip -c -9 ${work_dir}/${arch}/root-image/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz gzip -c -9 ${work_dir}/${arch}/airootfs/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz gzip -c -9 ${work_dir}/${arch}/airootfs/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
} }
# Prepare /isolinux # Prepare /isolinux
make_isolinux() { make_isolinux() {
mkdir -p ${work_dir}/iso/isolinux mkdir -p ${work_dir}/iso/isolinux
sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
} }
# Prepare /EFI # Prepare /EFI
make_efi() { make_efi() {
mkdir -p ${work_dir}/iso/EFI/boot mkdir -p ${work_dir}/iso/EFI/boot
cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/ cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/
cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi cp ${work_dir}/x86_64/airootfs/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi
mkdir -p ${work_dir}/iso/loader/entries mkdir -p ${work_dir}/iso/loader/entries
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
@ -162,10 +162,10 @@ make_efiboot() {
cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img
mkdir -p ${work_dir}/efiboot/EFI/boot mkdir -p ${work_dir}/efiboot/EFI/boot
cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
cp ${work_dir}/x86_64/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/
cp ${work_dir}/x86_64/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi cp ${work_dir}/x86_64/airootfs/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi
mkdir -p ${work_dir}/efiboot/loader/entries mkdir -p ${work_dir}/efiboot/loader/entries
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/
@ -190,11 +190,11 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs.sfs .sfs) # Build all filesystem images specified in aitab (.fs.sfs .sfs)
make_prepare() { make_prepare() {
cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir} cp -a -l -f ${work_dir}/${arch}/airootfs ${work_dir}
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
rm -rf ${work_dir}/root-image rm -rf ${work_dir}/airootfs
# rm -rf ${work_dir}/${arch}/root-image (if low space, this helps) # rm -rf ${work_dir}/${arch}/airootfs (if low space, this helps)
} }
# Build ISO # Build ISO
@ -234,12 +234,12 @@ mkdir -p ${work_dir}
run_once make_pacman_conf run_once make_pacman_conf
# Do all stuff for each root-image # Do all stuff for each airootfs
for arch in i686 x86_64; do for arch in i686 x86_64; do
run_once make_basefs run_once make_basefs
run_once make_packages run_once make_packages
run_once make_setup_mkinitcpio run_once make_setup_mkinitcpio
run_once make_customize_root_image run_once make_customize_airootfs
done done
for arch in i686 x86_64; do for arch in i686 x86_64; do

2
docs/README.build
View File

@ -22,7 +22,7 @@ INDEX
+ dosfstools for mkfs.vfat + dosfstools for mkfs.vfat
+ lynx for fetching the latest installation guide + lynx for fetching the latest installation guide
** For these hooks needs these packages (on target root-image) ** For these hooks needs these packages (on target airootfs)
* archiso * archiso
+ (none) + (none)
* archiso_loop_mnt * archiso_loop_mnt