summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2014-06-28 00:35:50 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2014-06-28 00:35:50 -0300
commit36459f3acc217ff6a0b4ad1b6049d68a8da413e2 (patch)
treed078f5d6053dc40760eb72e3f5fe1c1820e0757c /configs/releng
parent9131f83404a5e2b45db9d79711e052ff9eba9c56 (diff)
downloadarchiso32-36459f3acc217ff6a0b4ad1b6049d68a8da413e2.tar.xz
[archiso] Drop aitab support
Always create one filesystem of a fixed size (32G), format (ext4) and know name "airootfs". Simplify logic a lot.
Diffstat (limited to 'configs/releng')
-rw-r--r--configs/releng/aitab3
-rwxr-xr-xconfigs/releng/build.sh10
2 files changed, 1 insertions, 12 deletions
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