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 +- configs/releng/build.sh | 4 ++-- configs/releng/syslinux.dual/syslinux_arch32.cfg | 2 +- configs/releng/syslinux.dual/syslinux_arch64.cfg | 2 +- configs/releng/syslinux/syslinux.cfg | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'configs') 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% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 7da0215..0398269 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -57,9 +57,9 @@ make_boot() { mkinitcpio \ -c ./mkinitcpio.conf \ -b ${_src} \ - -k /boot/vmlinuz26 \ + -k /boot/vmlinuz-linux \ -g ${_dst_boot}/${arch}/archiso.img - mv ${_src}/boot/vmlinuz26 ${_dst_boot}/${arch} + mv ${_src}/boot/vmlinuz-linux ${_dst_boot}/${arch}/vmlinuz cp ${_src}/boot/memtest86+/memtest.bin ${_dst_boot}/memtest cp ${_src}/usr/share/licenses/common/GPL2/license.txt ${_dst_boot}/memtest.COPYING : > ${work_dir}/build.${FUNCNAME} diff --git a/configs/releng/syslinux.dual/syslinux_arch32.cfg b/configs/releng/syslinux.dual/syslinux_arch32.cfg index 6947d75..9b4030e 100644 --- a/configs/releng/syslinux.dual/syslinux_arch32.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch32.cfg @@ -4,7 +4,7 @@ Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) -LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz INITRD /%INSTALL_DIR%/boot/i686/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. diff --git a/configs/releng/syslinux.dual/syslinux_arch64.cfg b/configs/releng/syslinux.dual/syslinux_arch64.cfg index 02ddc5a..6cc644d 100644 --- a/configs/releng/syslinux.dual/syslinux_arch64.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch64.cfg @@ -4,7 +4,7 @@ Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg index de840f4..7762278 100644 --- a/configs/releng/syslinux/syslinux.cfg +++ b/configs/releng/syslinux/syslinux.cfg @@ -33,7 +33,7 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot 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% # Next line should be uncommented when prepare enviroment to boot from PXE. -- cgit v1.2.3-54-g00ecf From 14f1d7d479575a160facc192a060b8587554121c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 11 Aug 2011 11:13:31 -0300 Subject: [configs/releng] Rename core pkgs images and mountpoint. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/aitab.core | 12 ++++++------ configs/releng/build.sh | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'configs') diff --git a/configs/releng/aitab.core b/configs/releng/aitab.core index e538000..5a54bec 100644 --- a/configs/releng/aitab.core +++ b/configs/releng/aitab.core @@ -1,6 +1,6 @@ -# -root-image / %ARCH% xz ext4 50% -lib-modules /lib/modules %ARCH% xz ext4 10% -usr-share /usr/share any xz ext4 50% -core-pkgs /repo/pkg %ARCH% xz none 0 -core-any-pkgs /repo/any any xz none 0 +# +root-image / %ARCH% xz ext4 50% +lib-modules /lib/modules %ARCH% xz ext4 10% +usr-share /usr/share any xz ext4 50% +repo-core-%ARCH% /repo/core/%ARCH% %ARCH% xz none 0 +repo-core-any /repo/core/any any xz none 0 diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0398269..5f1e0db 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -117,14 +117,14 @@ make_usr_share() { make_core_repo() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then local _url _urls _pkg_name _cached_pkg _dst - mkdir -p ${work_dir}/core-any-pkgs - mkdir -p ${work_dir}/core-pkgs + mkdir -p ${work_dir}/repo-core-any + mkdir -p ${work_dir}/repo-core-${arch} pacman -Sy _urls=$(pacman -Sddp $(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# core.exclude.${arch} | sort))) for _url in ${_urls}; do _pkg_name=${_url##*/} _cached_pkg=/var/cache/pacman/pkg/${_pkg_name} - _dst=${work_dir}/core-pkgs/${_pkg_name} + _dst=${work_dir}/repo-core-${arch}/${_pkg_name} if [[ ! -e ${_dst} ]]; then if [[ -e ${_cached_pkg} ]]; then cp -v "${_cached_pkg}" "${_dst}" @@ -132,10 +132,10 @@ make_core_repo() { wget -nv "${_url}" -O "${_dst}" fi fi - repo-add -q ${work_dir}/core-pkgs/core.db.tar.gz ${work_dir}/core-pkgs/${_pkg_name} + repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${work_dir}/repo-core-${arch}/${_pkg_name} if [[ ${_pkg_name} =~ any.pkg ]]; then - mv "${_dst}" ${work_dir}/core-any-pkgs/${_pkg_name} - ln -sf ../any/${_pkg_name} ${work_dir}/core-pkgs/${_pkg_name} + mv "${_dst}" ${work_dir}/repo-core-any/${_pkg_name} + ln -sf ../any/${_pkg_name} ${work_dir}/repo-core-${arch}/${_pkg_name} fi done : > ${work_dir}/build.${FUNCNAME} @@ -187,16 +187,16 @@ make_dual() { rm -f ${work_dir}/dual/iso/${install_dir}/aitab rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/syslinux.cfg if [[ ${_iso_type} == "core" ]]; then - if [[ ! -e ${work_dir}/dual/iso/${install_dir}/any/core-any-pkgs.sfs || - ! -e ${work_dir}/dual/iso/${install_dir}/i686/core-pkgs.sfs || - ! -e ${work_dir}/dual/iso/${install_dir}/x86_64/core-pkgs.sfs ]]; then + if [[ ! -e ${work_dir}/dual/iso/${install_dir}/any/repo-core-any.sfs || + ! -e ${work_dir}/dual/iso/${install_dir}/i686/repo-core-i686.sfs || + ! -e ${work_dir}/dual/iso/${install_dir}/x86_64/repo-core-x86_64.sfs ]]; then echo "ERROR: core_iso_single build is not found." _usage 1 fi else - rm -f ${work_dir}/dual/iso/${install_dir}/any/core-any-pkgs.sfs - rm -f ${work_dir}/dual/iso/${install_dir}/i686/core-pkgs.sfs - rm -f ${work_dir}/dual/iso/${install_dir}/x86_64/core-pkgs.sfs + rm -f ${work_dir}/dual/iso/${install_dir}/any/repo-core-any.sfs + rm -f ${work_dir}/dual/iso/${install_dir}/i686/repo-core-i686.sfs + rm -f ${work_dir}/dual/iso/${install_dir}/x86_64/repo-core-x86_64.sfs fi paste -d"\n" <(sed "s|%ARCH%|i686|g" aitab.${_iso_type}) \ <(sed "s|%ARCH%|x86_64|g" aitab.${_iso_type}) | uniq > ${work_dir}/dual/iso/${install_dir}/aitab -- cgit v1.2.3-54-g00ecf 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 -- configs/releng/root-image/etc/fstab | 5 ----- 3 files changed, 16 deletions(-) delete mode 100644 configs/baseline/root-image/etc/fstab delete mode 100644 configs/releng/root-image/etc/fstab (limited to 'configs') 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 diff --git a/configs/releng/root-image/etc/fstab b/configs/releng/root-image/etc/fstab deleted file mode 100644 index 0df0cba..0000000 --- a/configs/releng/root-image/etc/fstab +++ /dev/null @@ -1,5 +0,0 @@ -# -# /etc/fstab: static file system information -# -# -/dev/mapper/root-image / auto defaults 0 0 -- cgit v1.2.3-54-g00ecf 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 ++++++---- configs/releng/build.sh | 24 +++++++++++++----------- 2 files changed, 19 insertions(+), 15 deletions(-) (limited to 'configs') 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 } diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 5f1e0db..135cc03 100755 --- a/configs/releng/build.sh +++ b/configs/releng/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}" @@ -18,13 +20,13 @@ make_basefs() { # Additional packages (root-image) make_packages() { - mkarchiso ${verbose} -D "${install_dir}" -p "$(grep -v ^# packages.${arch})" create "${work_dir}" + mkarchiso ${verbose} -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" create "${work_dir}" } # Customize installation (root-image) make_customize_root_image() { if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then - cp -af root-image ${work_dir} + cp -af ${script_path}/root-image ${work_dir} chmod 750 ${work_dir}/root-image/etc/sudoers.d chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d @@ -55,7 +57,7 @@ make_boot() { local _dst_boot=${work_dir}/iso/${install_dir}/boot mkdir -p ${_dst_boot}/${arch} mkinitcpio \ - -c ./mkinitcpio.conf \ + -c ${script_path}/mkinitcpio.conf \ -b ${_src} \ -k /boot/vmlinuz-linux \ -g ${_dst_boot}/${arch}/archiso.img @@ -74,8 +76,8 @@ make_syslinux() { mkdir -p ${_dst_syslinux} sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; - s|%ARCH%|${arch}|g" syslinux/syslinux.cfg > ${_dst_syslinux}/syslinux.cfg - cp syslinux/splash.png ${_dst_syslinux} + s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${_dst_syslinux}/syslinux.cfg + cp ${script_path}/syslinux/splash.png ${_dst_syslinux} cp ${_src_syslinux}/*.c32 ${_dst_syslinux} cp ${_src_syslinux}/*.com ${_dst_syslinux} cp ${_src_syslinux}/*.0 ${_dst_syslinux} @@ -91,7 +93,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 @@ -120,7 +122,7 @@ make_core_repo() { mkdir -p ${work_dir}/repo-core-any mkdir -p ${work_dir}/repo-core-${arch} pacman -Sy - _urls=$(pacman -Sddp $(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# core.exclude.${arch} | sort))) + _urls=$(pacman -Sddp $(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# ${script_path}/core.exclude.${arch} | sort))) for _url in ${_urls}; do _pkg_name=${_url##*/} _cached_pkg=/var/cache/pacman/pkg/${_pkg_name} @@ -147,7 +149,7 @@ make_core_repo() { make_aitab() { local _iso_type=${1} if [[ ! -e ${work_dir}/build.${FUNCNAME}_${_iso_type} ]]; then - sed "s|%ARCH%|${arch}|g" aitab.${_iso_type} > ${work_dir}/iso/${install_dir}/aitab + sed "s|%ARCH%|${arch}|g" ${script_path}/aitab.${_iso_type} > ${work_dir}/iso/${install_dir}/aitab : > ${work_dir}/build.${FUNCNAME}_${_iso_type} fi } @@ -198,9 +200,9 @@ make_dual() { rm -f ${work_dir}/dual/iso/${install_dir}/i686/repo-core-i686.sfs rm -f ${work_dir}/dual/iso/${install_dir}/x86_64/repo-core-x86_64.sfs fi - paste -d"\n" <(sed "s|%ARCH%|i686|g" aitab.${_iso_type}) \ - <(sed "s|%ARCH%|x86_64|g" aitab.${_iso_type}) | uniq > ${work_dir}/dual/iso/${install_dir}/aitab - for _cfg in syslinux.dual/*.cfg; do + paste -d"\n" <(sed "s|%ARCH%|i686|g" ${script_path}/aitab.${_iso_type}) \ + <(sed "s|%ARCH%|x86_64|g" ${script_path}/aitab.${_iso_type}) | uniq > ${work_dir}/dual/iso/${install_dir}/aitab + for _cfg in ${script_path}/syslinux.dual/*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/} done -- cgit v1.2.3-54-g00ecf From 12e9d32435c0d3c40168c3fea1b6092825227497 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 8 Aug 2011 15:40:31 -0300 Subject: [configs/releng] Add purge_* commands purge_single command can be usefull to save space during build. It removes all files in working directory except "iso/" and *.iso. Workflow can be: (32) ./build.sh all_iso_single -> i686 *.iso are ready. (32) ./build.sh purge_single -> safe cleanup. (64) ./build.sh all_iso_single -> x86_64 *.iso are ready. (64) ./build.sh purge_single -> safe cleanup. (any) ./build.sh all_iso_dual -> dual *.iso are ready. Signed-off-by: Gerardo Exequiel Pozzi --- README | 4 +++- configs/releng/build.sh | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/README b/README index 09765fb..ff1832e 100644 --- a/README +++ b/README @@ -240,6 +240,7 @@ Note: These steps should be done with 64 bits support. [chroot32] # cp -r /usr/share/archiso/configs/releng /tmp [chroot32] # cd /tmp/releng [chroot32] # ./build.sh all_iso_single + [chroot32] # ./build.sh purge_single #optional * Enter 64 bits chroot enviroment then build core and netinstall single images. @@ -248,9 +249,10 @@ Note: These steps should be done with 64 bits support. [chroot64] # cp -r /usr/share/archiso/configs/releng /tmp [chroot64] # cd /tmp/releng [chroot64] # ./build.sh all_iso_single + [chroot64] # ./build.sh purge_single #optional * Build core and netinstall dual images from any of the chroot enviroments. - [host64] mkarchroot -r bash /tmp/chroot64 + [host64] # mkarchroot -r bash /tmp/chroot64 [chroot64] # cd /tmp/releng [chroot64] # ./build.sh all_iso_dual diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 135cc03..e75edb7 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -215,8 +215,8 @@ make_dual() { _usage () { - echo "usage ${0##*/} net_iso_single | core_iso_single | all_iso_single | clean_single" - echo " net_iso_dual | core_iso_dual | all_iso_dual | clean_dual" + echo "usage ${0##*/} net_iso_single | core_iso_single | all_iso_single | purge_single | clean_single" + echo " net_iso_dual | core_iso_dual | all_iso_dual | purge_dual | clean_dual" echo exit ${1} } @@ -280,6 +280,20 @@ case "${command_name}" in make_dual netinstall make_dual core ;; + purge_single) + if [[ -d ${work_dir} ]]; then + find ${work_dir} -mindepth 1 -maxdepth 1 \ + ! -path ${work_dir}/iso -prune \ + | xargs rm -rf + fi + ;; + purge_dual) + if [[ -d ${work_dir}/dual ]]; then + find ${work_dir}/dual -mindepth 1 -maxdepth 1 \ + ! -path ${work_dir}/dual/iso -prune \ + | xargs rm -rf + fi + ;; clean_single) rm -rf ${work_dir} rm -f ${name}-${version}-*-${arch}.iso -- cgit v1.2.3-54-g00ecf 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 --- README | 4 ++++ archiso/hooks/archiso | 26 ++++++++++++++++++++++++++ archiso/mkarchiso | 17 +++++++++++++++++ configs/baseline/build.sh | 1 + configs/releng/build.sh | 2 ++ 5 files changed, 50 insertions(+) (limited to 'configs') diff --git a/README b/README index ff1832e..97b5f77 100644 --- a/README +++ b/README @@ -31,6 +31,10 @@ INDEX * copytoram= If set to "y" or just "copytoram" without arguments, all SquashFS are copied to "RAM". Default: (unset) +* checksum= If set to "y" or just "checksum" without arguments, + performs a self-test of all files inside ${install_dir}, + and continue booting if ok. + Default: (unset) * cowspace_size= Set the size of tmpfs /cowspace. This space is used for Copy-On-Write files of dm-snapshot. (directory not visible outside initramfs) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 66dbafd..c973ffc 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -77,6 +77,16 @@ _mnt_sfs() { fi } +_verify_checksum() { + local _status + cd "/bootmnt/${archisobasedir}" + md5sum -c checksum.md5 > /checksum.log 2>&1 + _status=$? + cd "${OLDPWD}" + return ${_status} +} + + run_hook() { [[ -z "${arch}" ]] && arch="$(uname -m)" [[ -z "${cowspace_size}" ]] && cowspace_size="75%" @@ -135,6 +145,22 @@ archiso_mount_handler() { launch_interactive_shell fi + if [[ "${checksum}" == "y" ]]; then + if [[ -f "/bootmnt/${archisobasedir}/checksum.md5" ]]; then + msg -n ":: Self-test requested, please wait..." + if _verify_checksum; then + msg "done. Checksum is OK, continue booting." + else + echo "ERROR: one or more files are corrupted" + echo "see /checksum.log for details" + launch_interactive_shell + fi + else + echo "ERROR: checksum=y option specified but checksum.md5 not found" + launch_interactive_shell + fi + fi + if [[ "${copytoram}" == "y" ]]; then msg -n ":: Mounting /copytoram (tmpfs) filesystem, size=${copytoram_size}..." mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /copytoram diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 12d8936..6826441 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -112,6 +112,8 @@ _usage () echo " includes all specified packages" echo " prepare " echo " build all images" + echo " checksum " + echo " make a checksum.md5 for self-test" echo " iso " echo " build an iso image from the working dir" exit ${1} @@ -134,6 +136,8 @@ _show_config () { ;; prepare) ;; + checksum) + ;; iso) _msg_info " Image name: ${img_name}" _msg_info " Disk label: ${iso_label}" @@ -286,6 +290,16 @@ _mkfs () { _umount_fs "${work_dir}/mnt/${_src}" } +command_checksum () { + _show_config checksum + + _msg_info "Creating checksum file for self-test" + cd "${work_dir}/iso/${install_dir}" + find -type f ! -name checksum.md5 -print0 | xargs -0 md5sum > checksum.md5 + cd ${OLDPWD} + _msg_info "Done!" +} + # Create an ISO9660 filesystem from "iso" directory. command_iso () { if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then @@ -428,6 +442,9 @@ case "${command_name}" in prepare) command_prepare ;; + checksum) + command_checksum + ;; iso) if [[ $# -lt 3 ]]; then _msg_error "No image specified" 0 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" } diff --git a/configs/releng/build.sh b/configs/releng/build.sh index e75edb7..ab7aae7 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -163,6 +163,7 @@ make_prepare() { # args: $1 (core | netinstall) make_iso() { local _iso_type=${1} + mkarchiso ${verbose} checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${_iso_type}-${arch}.iso" } @@ -206,6 +207,7 @@ make_dual() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/} done + mkarchiso ${verbose} checksum "${work_dir}/dual" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${name}-${version}-${_iso_type}-dual.iso" : > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type} fi -- cgit v1.2.3-54-g00ecf From 708ba38c206a2147fbd7a357d6ece8881807231d Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 15 Aug 2011 19:42:28 -0300 Subject: [configs/releng] Fixed and improved serial console support. Current implementation fails if console=ttyS0 (without more options). Tested with: console=ttyS0 console=ttyS0,9600 console=ttyS0,38400 console=ttyS0,9600n8 console=ttyS0,38400n8r Closing FS#16232 Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/root-image/etc/rc.d/archiso | 32 +++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'configs') diff --git a/configs/releng/root-image/etc/rc.d/archiso b/configs/releng/root-image/etc/rc.d/archiso index 68e8375..cc930f6 100755 --- a/configs/releng/root-image/etc/rc.d/archiso +++ b/configs/releng/root-image/etc/rc.d/archiso @@ -16,20 +16,24 @@ do_locale_gen () # start agetty on it too. do_special_console() { - cmdline_console="$(kernel_cmdline console)" - [ $? -ne 0 ] && return - - dev="${cmdline_console%%,*}" - args="${cmdline_console##*,}" - baud="${args%%[neo]*}" && baud="${baud:-"9600"}" - [ "x${args}" != "x${args%%r}" ] && rts="-h" - - - stat_busy "Starting agetty on console: ${cmdline_console}" - echo "${dev}" >> /etc/securetty - echo "z0:2345:respawn:/sbin/agetty ${rts} ${baud} ${dev} linux" >> /etc/inittab - /sbin/telinit q - stat_done + local cmdline_console + if cmdline_console=$(kernel_cmdline console); then + stat_busy "Starting agetty on console: ${cmdline_console}" + local port options baud rts + port=${cmdline_console%%,*} + options=${cmdline_console#${port}} + options=${options#,} + baud=${options%%[neo]*} + [[ ${options} =~ r$ ]] && rts="-h" + if ! grep -q "^${port}" /etc/securetty; then + echo ${port} >> /etc/securetty + fi + if ! grep -q "^z0:" /etc/inittab; then + echo "z0:2345:respawn:/sbin/agetty -8 -s ${rts} ${baud:-9600} ${port} linux" >> /etc/inittab + fi + /sbin/telinit q + stat_done + fi } case "$1" in -- cgit v1.2.3-54-g00ecf