summaryrefslogtreecommitdiff
path: root/configs/baseline
diff options
context:
space:
mode:
authorEsteban Carnevale <alfplayer@mailoo.org>2013-03-13 19:25:39 -0300
committerEsteban Carnevale <alfplayer@mailoo.org>2013-09-02 20:03:35 -0300
commiteed77efd49e7104f776d411e8a20442d129d9db8 (patch)
tree0729d36c8d816a300b8e32a6f02255418d915608 /configs/baseline
parent68d1cfcd26cf31178120bf4fab8c033810e2d776 (diff)
Replace: archiso -> parabolaiso
Diffstat (limited to 'configs/baseline')
-rwxr-xr-xconfigs/baseline/build.sh20
-rw-r--r--configs/baseline/mkinitcpio.conf2
-rw-r--r--configs/baseline/syslinux/syslinux.cfg4
3 files changed, 13 insertions, 13 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 8a75e7a..faef37d 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -22,21 +22,21 @@ run_once() {
# Base installation (root-image)
make_basefs() {
- mkarchiso -v -w "${work_dir}" -D "${install_dir}" init
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" init
}
-# Copy mkinitcpio archiso hooks and build initramfs (root-image)
+# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
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
- mkarchiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
+ cp /usr/lib/initcpio/hooks/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/hooks
+ cp /usr/lib/initcpio/install/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/install
+ cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-parabolaiso.conf
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux -g /boot/parabolaiso.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/parabolaiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img
cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
}
@@ -64,13 +64,13 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs.sfs .sfs)
make_prepare() {
- mkarchiso -v -w "${work_dir}" -D "${install_dir}" prepare
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" prepare
}
# Build ISO
make_iso() {
- mkarchiso -v -w "${work_dir}" -D "${install_dir}" checksum
- mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" checksum
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
}
run_once make_basefs
diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf
index 1b3d35f..8cf3926 100644
--- a/configs/baseline/mkinitcpio.conf
+++ b/configs/baseline/mkinitcpio.conf
@@ -1 +1 @@
-HOOKS="base udev archiso block filesystems"
+HOOKS="base udev parabolaiso block filesystems"
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index e504bec..6ddccc0 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -4,5 +4,5 @@ MENU TITLE Parabola GNU/Linux-libre
LABEL arch
MENU LABEL Parabola GNU/Linux-libre
LINUX boot/%ARCH%/vmlinuz
-INITRD boot/%ARCH%/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+INITRD boot/%ARCH%/parabolaiso.img
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%