summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xarchiso/mkarchiso54
-rw-r--r--configs/baseline/aitab2
-rwxr-xr-xconfigs/baseline/build.sh26
-rw-r--r--configs/releng/airootfs/etc/fstab (renamed from configs/releng/root-image/etc/fstab)0
-rw-r--r--configs/releng/airootfs/etc/hostname (renamed from configs/releng/root-image/etc/hostname)0
-rw-r--r--configs/releng/airootfs/etc/locale.conf (renamed from configs/releng/root-image/etc/locale.conf)0
-rw-r--r--configs/releng/airootfs/etc/pam.d/su (renamed from configs/releng/root-image/etc/pam.d/su)0
-rw-r--r--configs/releng/airootfs/etc/sudoers.d/g_wheel (renamed from configs/releng/root-image/etc/sudoers.d/g_wheel)0
-rwxr-xr-xconfigs/releng/airootfs/etc/systemd/scripts/choose-mirror (renamed from configs/releng/root-image/etc/systemd/scripts/choose-mirror)0
-rw-r--r--configs/releng/airootfs/etc/systemd/system/choose-mirror.service (renamed from configs/releng/root-image/etc/systemd/system/choose-mirror.service)0
-rw-r--r--configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount (renamed from configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount)0
-rw-r--r--configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf (renamed from configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf)0
-rw-r--r--configs/releng/airootfs/etc/systemd/system/pacman-init.service (renamed from configs/releng/root-image/etc/systemd/system/pacman-init.service)0
-rw-r--r--configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules (renamed from configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules)0
-rwxr-xr-xconfigs/releng/airootfs/root/.automated_script.sh (renamed from configs/releng/root-image/root/.automated_script.sh)0
-rw-r--r--configs/releng/airootfs/root/.zlogin (renamed from configs/releng/root-image/root/.zlogin)0
-rwxr-xr-xconfigs/releng/airootfs/root/customize_airootfs.sh (renamed from configs/releng/root-image/root/customize_root_image.sh)0
-rw-r--r--configs/releng/airootfs/root/install.txt (renamed from configs/releng/root-image/root/install.txt)0
-rw-r--r--configs/releng/aitab4
-rwxr-xr-xconfigs/releng/build.sh76
-rw-r--r--docs/README.build2
21 files changed, 82 insertions, 82 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 9655167..26a82ee 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -51,14 +51,14 @@ _chroot_init() {
if [[ -f "${work_dir}/mkarchiso.init" ]]; then
_msg_info "Initial enviroment already installed, skipping."
else
- mkdir -p ${work_dir}/root-image
+ mkdir -p ${work_dir}/airootfs
_pacman "base syslinux"
: > "${work_dir}/mkarchiso.init"
fi
}
_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
@@ -116,7 +116,7 @@ _usage ()
echo "usage ${app_name} [options] command <command options>"
echo " general options:"
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 " Default: '${pacman_conf}'"
echo " -L <label> Set a label for the disk"
@@ -146,7 +146,7 @@ _usage ()
echo " checksum"
echo " make a checksum.md5 for self-test"
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 " build an iso image from the working dir"
exit ${1}
@@ -189,51 +189,51 @@ _show_config () {
echo
}
-# Install desired packages to root-image
+# Install desired packages to airootfs
_pacman ()
{
- _msg_info "Installing packages to '${work_dir}/root-image/'..."
+ _msg_info "Installing packages to '${work_dir}/airootfs/'..."
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
- pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/root-image" $*
+ pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $*
fi
_msg_info "Packages installed successfully!"
}
-# Cleanup root-image
+# Cleanup airootfs
_cleanup () {
- _msg_info "Cleaning up what we can on root-image..."
+ _msg_info "Cleaning up what we can on airootfs..."
# Delete initcpio image(s)
- if [[ -d "${work_dir}/root-image/boot" ]]; then
- find "${work_dir}/root-image/boot" -type f -name '*.img' -delete
+ if [[ -d "${work_dir}/airootfs/boot" ]]; then
+ find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete
fi
# Delete kernel(s)
- if [[ -d "${work_dir}/root-image/boot" ]]; then
- find "${work_dir}/root-image/boot" -type f -name 'vmlinuz*' -delete
+ if [[ -d "${work_dir}/airootfs/boot" ]]; then
+ find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete
fi
# Delete pacman database sync cache files (*.tar.gz)
- if [[ -d "${work_dir}/root-image/var/lib/pacman" ]]; then
- find "${work_dir}/root-image/var/lib/pacman" -maxdepth 1 -type f -delete
+ if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then
+ find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete
fi
# Delete pacman database sync cache
- if [[ -d "${work_dir}/root-image/var/lib/pacman/sync" ]]; then
- find "${work_dir}/root-image/var/lib/pacman/sync" -delete
+ if [[ -d "${work_dir}/airootfs/var/lib/pacman/sync" ]]; then
+ find "${work_dir}/airootfs/var/lib/pacman/sync" -delete
fi
# Delete pacman package cache
- if [[ -d "${work_dir}/root-image/var/cache/pacman/pkg" ]]; then
- find "${work_dir}/root-image/var/cache/pacman/pkg" -type f -delete
+ if [[ -d "${work_dir}/airootfs/var/cache/pacman/pkg" ]]; then
+ find "${work_dir}/airootfs/var/cache/pacman/pkg" -type f -delete
fi
# Delete all log files, keeps empty dirs.
- if [[ -d "${work_dir}/root-image/var/log" ]]; then
- find "${work_dir}/root-image/var/log" -type f -delete
+ if [[ -d "${work_dir}/airootfs/var/log" ]]; then
+ find "${work_dir}/airootfs/var/log" -type f -delete
fi
# Delete all temporary files and dirs
- if [[ -d "${work_dir}/root-image/var/tmp" ]]; then
- find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete
+ if [[ -d "${work_dir}/airootfs/var/tmp" ]]; then
+ find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete
fi
# Delete package pacman related files.
find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete
@@ -359,9 +359,9 @@ command_checksum () {
command_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..."
- 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}' > \
"${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
_msg_info "Done!"
@@ -450,7 +450,7 @@ command_prepare () {
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.
command_install () {
if [[ ! -f "${pacman_conf}" ]]; then
diff --git a/configs/baseline/aitab b/configs/baseline/aitab
index 234f61c..9134d60 100644
--- a/configs/baseline/aitab
+++ b/configs/baseline/aitab
@@ -1,2 +1,2 @@
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
-root-image / %ARCH% gzip ext4 50%
+airootfs / %ARCH% gzip ext4 50%
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index ed65e17..19bc0c4 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -20,24 +20,24 @@ run_once() {
fi
}
-# Base installation (root-image)
+# Base installation (airootfs)
make_basefs() {
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() {
- cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks
- cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install
- cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
+ cp /usr/lib/initcpio/hooks/archiso ${work_dir}/airootfs/usr/lib/initcpio/hooks
+ cp /usr/lib/initcpio/install/archiso ${work_dir}/airootfs/usr/lib/initcpio/install
+ 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
}
# Prepare ${install_dir}/boot/
make_boot() {
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}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
+ cp ${work_dir}/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+ cp ${work_dir}/airootfs/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
}
# Prepare /${install_dir}/boot/syslinux
@@ -46,18 +46,18 @@ make_syslinux() {
sed "s|%ARCHISO_LABEL%|${iso_label}|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
- cp ${work_dir}/root-image/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}/root-image/usr/lib/syslinux/bios/libutil.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}/airootfs/usr/lib/syslinux/bios/menu.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
make_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
- cp ${work_dir}/root-image/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}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
+ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
}
# Process aitab
diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/airootfs/etc/fstab
index e69de29..e69de29 100644
--- a/configs/releng/root-image/etc/fstab
+++ b/configs/releng/airootfs/etc/fstab
diff --git a/configs/releng/root-image/etc/hostname b/configs/releng/airootfs/etc/hostname
index 2dbe21e..2dbe21e 100644
--- a/configs/releng/root-image/etc/hostname
+++ b/configs/releng/airootfs/etc/hostname
diff --git a/configs/releng/root-image/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf
index 01ec548..01ec548 100644
--- a/configs/releng/root-image/etc/locale.conf
+++ b/configs/releng/airootfs/etc/locale.conf
diff --git a/configs/releng/root-image/etc/pam.d/su b/configs/releng/airootfs/etc/pam.d/su
index a291042..a291042 100644
--- a/configs/releng/root-image/etc/pam.d/su
+++ b/configs/releng/airootfs/etc/pam.d/su
diff --git a/configs/releng/root-image/etc/sudoers.d/g_wheel b/configs/releng/airootfs/etc/sudoers.d/g_wheel
index 8c45359..8c45359 100644
--- a/configs/releng/root-image/etc/sudoers.d/g_wheel
+++ b/configs/releng/airootfs/etc/sudoers.d/g_wheel
diff --git a/configs/releng/root-image/etc/systemd/scripts/choose-mirror b/configs/releng/airootfs/etc/systemd/scripts/choose-mirror
index 0ae0806..0ae0806 100755
--- a/configs/releng/root-image/etc/systemd/scripts/choose-mirror
+++ b/configs/releng/airootfs/etc/systemd/scripts/choose-mirror
diff --git a/configs/releng/root-image/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service
index 1e4d771..1e4d771 100644
--- a/configs/releng/root-image/etc/systemd/system/choose-mirror.service
+++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service
diff --git a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
index 4eab551..4eab551 100644
--- a/configs/releng/root-image/etc/systemd/system/etc-pacman.d-gnupg.mount
+++ b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount
diff --git a/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
index d1d8474..d1d8474 100644
--- a/configs/releng/root-image/etc/systemd/system/getty@tty1.service.d/autologin.conf
+++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf
diff --git a/configs/releng/root-image/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service
index 23b8144..23b8144 100644
--- a/configs/releng/root-image/etc/systemd/system/pacman-init.service
+++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service
diff --git a/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules b/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules
index 1c4053c..1c4053c 100644
--- a/configs/releng/root-image/etc/udev/rules.d/81-dhcpcd.rules
+++ b/configs/releng/airootfs/etc/udev/rules.d/81-dhcpcd.rules
diff --git a/configs/releng/root-image/root/.automated_script.sh b/configs/releng/airootfs/root/.automated_script.sh
index 81a98a1..81a98a1 100755
--- a/configs/releng/root-image/root/.automated_script.sh
+++ b/configs/releng/airootfs/root/.automated_script.sh
diff --git a/configs/releng/root-image/root/.zlogin b/configs/releng/airootfs/root/.zlogin
index f598e43..f598e43 100644
--- a/configs/releng/root-image/root/.zlogin
+++ b/configs/releng/airootfs/root/.zlogin
diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/airootfs/root/customize_airootfs.sh
index 9c85453..9c85453 100755
--- a/configs/releng/root-image/root/customize_root_image.sh
+++ b/configs/releng/airootfs/root/customize_airootfs.sh
diff --git a/configs/releng/root-image/root/install.txt b/configs/releng/airootfs/root/install.txt
index 3c8f171..3c8f171 100644
--- a/configs/releng/root-image/root/install.txt
+++ b/configs/releng/airootfs/root/install.txt
diff --git a/configs/releng/aitab b/configs/releng/aitab
index b7e9a17..f9b482d 100644
--- a/configs/releng/aitab
+++ b/configs/releng/aitab
@@ -1,3 +1,3 @@
# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size>
-root-image / i686 xz ext4 50%
-root-image / x86_64 xz ext4 50%
+airootfs / i686 xz ext4 50%
+airootfs / x86_64 xz ext4 50%
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 63b7126..2438175 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -51,53 +51,53 @@ make_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() {
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
}
-# Additional packages (root-image)
+# Additional packages (airootfs)
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
}
-# Copy mkinitcpio archiso hooks and build initramfs (root-image)
+# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() {
local _hook
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/install/${_hook} ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
+ cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks
+ cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install
done
- cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
- cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio
- cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-archiso.conf
+ cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install
+ cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/airootfs/usr/lib/initcpio
+ 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
}
-# Customize installation (root-image)
-make_customize_root_image() {
- cp -af ${script_path}/root-image ${work_dir}/${arch}
+# Customize installation (airootfs)
+make_customize_airootfs() {
+ 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
- rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh
+ setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
+ rm ${work_dir}/${arch}/airootfs/root/customize_airootfs.sh
}
# Prepare kernel/initramfs ${install_dir}/boot/
make_boot() {
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}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
+ cp ${work_dir}/${arch}/airootfs/boot/archiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+ 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/
make_boot_extra() {
- cp ${work_dir}/${arch}/root-image/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/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
+ 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
@@ -108,30 +108,30 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done
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}/root-image/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/*.c32 ${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}/airootfs/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
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}/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/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.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
make_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
- cp ${work_dir}/${arch}/root-image/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}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
}
# Prepare /EFI
make_efi() {
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/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/
+ cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
+ 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
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
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/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/
+ cp ${work_dir}/x86_64/airootfs/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
+ 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
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)
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}" prepare
- rm -rf ${work_dir}/root-image
- # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
+ rm -rf ${work_dir}/airootfs
+ # rm -rf ${work_dir}/${arch}/airootfs (if low space, this helps)
}
# Build ISO
@@ -234,12 +234,12 @@ mkdir -p ${work_dir}
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
run_once make_basefs
run_once make_packages
run_once make_setup_mkinitcpio
- run_once make_customize_root_image
+ run_once make_customize_airootfs
done
for arch in i686 x86_64; do
diff --git a/docs/README.build b/docs/README.build
index e22ec65..1f2d703 100644
--- a/docs/README.build
+++ b/docs/README.build
@@ -22,7 +22,7 @@ INDEX
+ dosfstools for mkfs.vfat
+ 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
+ (none)
* archiso_loop_mnt
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-04 21:25:59 +0000