From 36459f3acc217ff6a0b4ad1b6049d68a8da413e2 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sat, 28 Jun 2014 00:35:50 -0300
Subject: [archiso] Drop aitab support

Always create one filesystem of a fixed size (32G), format (ext4) and
know name "airootfs".

Simplify logic a lot.
---
 configs/baseline/aitab    |  2 --
 configs/baseline/build.sh |  8 +-------
 configs/releng/aitab      |  3 ---
 configs/releng/build.sh   | 10 +---------
 4 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 configs/baseline/aitab
 delete mode 100644 configs/releng/aitab

(limited to 'configs')

diff --git a/configs/baseline/aitab b/configs/baseline/aitab
deleted file mode 100644
index 9134d60..0000000
--- a/configs/baseline/aitab
+++ /dev/null
@@ -1,2 +0,0 @@
-# <img>         <mnt>                 <arch>   <sfs_comp>  <fs_type>  <fs_size>
-airootfs      /                     %ARCH%   gzip        ext4       50%
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 19bc0c4..46033cb 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -60,12 +60,7 @@ make_isolinux() {
     cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
 }
 
-# Process aitab
-make_aitab() {
-    sed "s|%ARCH%|${arch}|g" ${script_path}/aitab > ${work_dir}/iso/${install_dir}/aitab
-}
-
-# Build all filesystem images specified in aitab (.fs.sfs .sfs)
+# Build airootfs filesystem image
 make_prepare() {
     mkarchiso -v -w "${work_dir}" -D "${install_dir}" prepare
 }
@@ -81,6 +76,5 @@ run_once make_setup_mkinitcpio
 run_once make_boot
 run_once make_syslinux
 run_once make_isolinux
-run_once make_aitab
 run_once make_prepare
 run_once make_iso
diff --git a/configs/releng/aitab b/configs/releng/aitab
deleted file mode 100644
index f9b482d..0000000
--- a/configs/releng/aitab
+++ /dev/null
@@ -1,3 +0,0 @@
-# <img>         <mnt>                 <arch>   <sfs_comp>  <fs_type>  <fs_size>
-airootfs      /                     i686     xz          ext4       50%
-airootfs      /                     x86_64   xz          ext4       50%
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 2438175..f0b6f42 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -182,13 +182,7 @@ make_efiboot() {
     umount ${work_dir}/efiboot
 }
 
-# Copy aitab
-make_aitab() {
-    mkdir -p ${work_dir}/iso/${install_dir}
-    cp ${script_path}/aitab ${work_dir}/iso/${install_dir}/aitab
-}
-
-# Build all filesystem images specified in aitab (.fs.sfs .sfs)
+# Build airootfs filesystem image
 make_prepare() {
     cp -a -l -f ${work_dir}/${arch}/airootfs ${work_dir}
     setarch ${arch} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
@@ -253,8 +247,6 @@ run_once make_isolinux
 run_once make_efi
 run_once make_efiboot
 
-run_once make_aitab
-
 for arch in i686 x86_64; do
     run_once make_prepare
 done
-- 
cgit v1.2.3-54-g00ecf