From b3f918ee602fa39b9437f57b3fc816bdff2ee44a Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 24 Jul 2011 18:25:33 -0300 Subject: [archiso] Update kernel image name for linux-3.0 Also rename kernel from vmlinuz-linux to vmlinuz to make filename ISO9660 friendly. Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 4 ++-- configs/baseline/syslinux/syslinux.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'configs/baseline') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 1fec3d0..0dbed2a 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -40,9 +40,9 @@ make_boot() { mkinitcpio \ -c ./mkinitcpio.conf \ -b ${work_dir}/root-image \ - -k /boot/vmlinuz26 \ + -k /boot/vmlinuz-linux \ -g ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img - cp ${work_dir}/root-image/boot/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${arch} + cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz : > ${work_dir}/build.${FUNCNAME} fi } diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index f755453..5ae9823 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -5,7 +5,7 @@ TIMEOUT 300 LABEL arch MENU LABEL Arch Linux -LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% -- cgit v1.2.3 From 8b2acca2dee74e6a76dd12afa0d68d8631bb123c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Aug 2011 21:19:54 -0300 Subject: [configs/*] Remove custom fstab, not needed anymore. re-mount / as rw does not fail since regular file /etc/mtab does not exist at that stage. /etc/mtab was removed from root-image in this commit: 93763a2d8225a92ef99e73478ac118919872ab27 Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 9 --------- configs/baseline/root-image/etc/fstab | 2 -- 2 files changed, 11 deletions(-) delete mode 100644 configs/baseline/root-image/etc/fstab (limited to 'configs/baseline') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0dbed2a..11d4145 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -16,14 +16,6 @@ make_basefs() { mkarchiso ${verbose} -D "${install_dir}" -p "syslinux" create "${work_dir}" } -# Customize installation (root-image) -make_customize_root_image() { - if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - cp -af root-image ${work_dir} - : > ${work_dir}/build.${FUNCNAME} - fi -} - # Copy mkinitcpio archiso hooks (root-image) make_setup_mkinitcpio() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then @@ -94,7 +86,6 @@ else fi make_basefs -make_customize_root_image make_setup_mkinitcpio make_boot make_syslinux diff --git a/configs/baseline/root-image/etc/fstab b/configs/baseline/root-image/etc/fstab deleted file mode 100644 index 4b82b80..0000000 --- a/configs/baseline/root-image/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# -/dev/mapper/root-image / auto defaults 0 0 -- cgit v1.2.3 From 808c1a0ed656ea99807a89ee95c9354539192fd3 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 14 Jul 2011 00:46:42 -0300 Subject: [configs/*] Use $script_path for "source" files. Allows to execute directly build.sh from any directory, using it as working dir. Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'configs/baseline') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 11d4145..2f28913 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -10,6 +10,8 @@ arch=$(uname -m) work_dir=work verbose="n" +script_path=$(readlink -f ${0%/*}) + # Base installation (root-image) make_basefs() { mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}" @@ -30,7 +32,7 @@ make_boot() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} mkinitcpio \ - -c ./mkinitcpio.conf \ + -c ${script_path}/mkinitcpio.conf \ -b ${work_dir}/root-image \ -k /boot/vmlinuz-linux \ -g ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img @@ -45,7 +47,7 @@ make_syslinux() { mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; - s|%ARCH%|${arch}|g" 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/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ : > ${work_dir}/build.${FUNCNAME} fi @@ -55,7 +57,7 @@ make_syslinux() { make_isolinux() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then mkdir -p ${work_dir}/iso/isolinux - sed "s|%INSTALL_DIR%|${install_dir}|g" 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/isolinux.bin ${work_dir}/iso/isolinux/ : > ${work_dir}/build.${FUNCNAME} fi @@ -64,7 +66,7 @@ make_isolinux() { # Process aitab make_aitab() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - sed "s|%ARCH%|${arch}|g" aitab > ${work_dir}/iso/${install_dir}/aitab + sed "s|%ARCH%|${arch}|g" ${script_path}/aitab > ${work_dir}/iso/${install_dir}/aitab : > ${work_dir}/build.${FUNCNAME} fi } -- cgit v1.2.3 From 90cfe3ce2ce35382595223bf8d264fee63e86df5 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 12 Aug 2011 00:10:44 -0300 Subject: [archiso] Add checksum= boot param Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/baseline') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 2f28913..a3775c0 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -78,6 +78,7 @@ make_prepare() { # Build ISO make_iso() { + mkarchiso ${verbose} checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${arch}.iso" } -- cgit v1.2.3