August 2011 - Arch-releng - lists.archlinux.org

[arch-releng] [RFC] [PATCH] [archiso] Add dm_snap_prefix= boot param.
by Gerardo Exequiel Pozzi 15 Aug '11

15 Aug '11

Default value is "arch". This implies that all device mapper node for snapshot devices will be for example: arch_root-image. This helps AIF to hidden these devices from "Device Configuration". Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- README | 2 ++ archiso/hooks/archiso | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README b/README index 632f985..09765fb 100644 --- a/README +++ b/README @@ -43,6 +43,8 @@ INDEX Size is in bytes (suffix with "k", "m" and "g") or in percentage of available RAM. Default: "75%" +* dm_snap_prefix= Set a prefix for device-mapper snapshot node names. + Default: "arch" * arch= Force an architecture type (i686 | x86_64). Do not set it for normal operations. Useful for running a 64 bit kernel / 32 bit userspace. diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 7e2997a..66dbafd 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -29,6 +29,7 @@ _mnt_fs() { local mnt="${2}" local img_fullname="${img##*/}"; local img_name="${img_fullname%%.*}" + local dm_snap_name="${dm_snap_prefix}_${img_name}" local ro_dev ro_dev_size ro_dev_fs_type rw_dev mkdir -p "${mnt}" @@ -42,11 +43,11 @@ _mnt_fs() { _next_loop_dev rw_dev=$(_make_loop_dev "/cowspace/${img_name}.cow") - echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} N 8" | dmsetup create ${img_name} + echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} N 8" | dmsetup create ${dm_snap_name} - msg ":: Mounting '/dev/mapper/${img_name}' (${ro_dev_fs_type}) to '${mnt}'" - if ! mount -t "${ro_dev_fs_type}" "/dev/mapper/${img_name}" "${mnt}" ; then - echo "ERROR: while mounting '/dev/mapper/${img_name}' to '${mnt}'" + msg ":: Mounting '/dev/mapper/${dm_snap_name}' (${ro_dev_fs_type}) to '${mnt}'" + if ! mount -t "${ro_dev_fs_type}" "/dev/mapper/${dm_snap_name}" "${mnt}" ; then + echo "ERROR: while mounting '/dev/mapper/${dm_snap_name}' to '${mnt}'" launch_interactive_shell fi } @@ -81,6 +82,7 @@ run_hook() { [[ -z "${cowspace_size}" ]] && cowspace_size="75%" [[ -z "${copytoram_size}" ]] && copytoram_size="75%" [[ -z "${archisobasedir}" ]] && archisobasedir="arch" + [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}" if [[ -z "${aitab}" ]]; then aitab="/bootmnt/${archisobasedir}/aitab" -- 1.7.6

3 11

[arch-releng] [PATCH 1/4] [configs/*] Remove custom fstab, not needed anymore.
by Gerardo Exequiel Pozzi 15 Aug '11

15 Aug '11

Without fstab system start and shutdown without any issues (thanks to recent changes in initscripts). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/baseline/build.sh | 9 --------- configs/baseline/root-image/etc/fstab | 2 -- configs/releng/root-image/etc/fstab | 5 ----- 3 files changed, 0 insertions(+), 16 deletions(-) delete mode 100644 configs/baseline/root-image/etc/fstab delete mode 100644 configs/releng/root-image/etc/fstab 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 @@ -# <file system> <dir> <type> <options> <dump> <pass> -/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 -# -# <file system> <dir> <type> <options> <dump> <pass> -/dev/mapper/root-image / auto defaults 0 0 -- 1.7.6

2 3

[arch-releng] [RFCv2] [PATCH] [archiso] Add checksum= boot param
by Gerardo Exequiel Pozzi 14 Aug '11

14 Aug '11

v2: Fixed paths inside checksums.md5 (thanks Pierre). Also fix find arguments, and make a separate function in archiso hook for md5sum. NOTE 1: Needs md5sum, not added here (Waiting for rebuild of mkinitcpio-busybox) NOTE 2: This is a draft without testing, but should works(tm). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- README | 4 ++++ archiso/hooks/archiso | 25 +++++++++++++++++++++++++ archiso/mkarchiso | 17 +++++++++++++++++ configs/baseline/build.sh | 1 + configs/releng/build.sh | 2 ++ 5 files changed, 49 insertions(+), 0 deletions(-) diff --git a/README b/README index 4eaf904..852f3bd 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..0495195 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,21 @@ archiso_mount_handler() { launch_interactive_shell fi + if [[ "${checksum}" == "y" ]]; then + if [[ -f "/bootmnt/${archisobasedir}/checksum.md5" ]]; then + echo ":: Self-test requested, please wait..." + if _verify_checksum; then + echo "done. Checksum is OK, continue booting." + else + echo "ERROR: one or more files are corrupted, 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 <dir>" echo " build all images" + echo " checksum <dir>" + echo " make a checksum.md5 for self-test" echo " iso <dir> <image name>" 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 a07599c..eabe21f 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -86,6 +86,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 d078ee2..44e41f6 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 -- 1.7.6

2 3

[arch-releng] [RFC] [PATCH] [configs/releng] Add purge_* commands
by Gerardo Exequiel Pozzi 14 Aug '11

14 Aug '11

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 <vmlinuz386(a)yahoo.com.ar> --- configs/releng/build.sh | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 135cc03..284ab76 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,16 @@ case "${command_name}" in make_dual netinstall make_dual core ;; + purge_single) + find ${work_dir} -mindepth 1 -maxdepth 1 \ + ! -path ${work_dir}/iso -prune \ + | xargs rm -r + ;; + purge_dual) + find ${work_dir}/dual -mindepth 1 -maxdepth 1 \ + ! -path ${work_dir}/dual/iso -prune \ + | xargs rm -r + ;; clean_single) rm -rf ${work_dir} rm -f ${name}-${version}-*-${arch}.iso -- 1.7.6

2 3

[arch-releng] [RFC] [PATCH] [configs/*] Use $script_path for "source" files.
by Gerardo Exequiel Pozzi 14 Aug '11

14 Aug '11

Allows to execute directly build.sh from any directory, using it as working dir. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/baseline/build.sh | 12 +++++++----- configs/releng/build.sh | 24 +++++++++++++----------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0dbed2a..a07599c 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}" @@ -19,7 +21,7 @@ make_basefs() { # 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} : > ${work_dir}/build.${FUNCNAME} fi } @@ -38,7 +40,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 @@ -53,7 +55,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 @@ -63,7 +65,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 @@ -72,7 +74,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 -- 1.7.6

1 1

[arch-releng] "last success" does not really show last success
by Dieter Plaetinck 13 Aug '11

13 Aug '11

Hi Tom, I just entered a success result for 2011.08.13-slightlybroken (arch i686), but the "last success" column for arch i686 shows 2011.06.10 , even though when I click the 'i686' link, it shows my report. http://www.archlinux.org/releng/feedback/ Maybe the sorting or something needs to be fixed for these 'last success' (and 'last failure') columns? Dieter

2 2

[arch-releng] My archiso TODO/ideas (_draft_)
by Gerardo Exequiel Pozzi 12 Aug '11

12 Aug '11

Hello, This is a draft of some sorts of ideas, future changes, and fixes for archiso that I have in mind: FEATURES: * UEFI boot support (FS#20419) At some time I want to support UEFI boot. But I do not have any real hardware to test it. Neither UEFI firmware for qemu (two versions tested) or virtualbox works fine, testing with some UEFI compatible mediums without happy results. * syslinux keymaps (FS#21725) I worked on this some time ago, but I want some feedback from people that needs this, we need a trivial lilo patch for keymaps generation. * syslinux helps For now, put boot options that are on the new README. * md5sum Self check of all files (mostly important *.sfs), as boot option, executed at initramfs stage. $install_dir/checksums.md5 * swap on zram (FS#18463) A boot options that setup a zram storage for swap space. (I done some tests with my custom build and works nice, helps a lot on machine with 512MiB of RAM). This feature will be experimental since zram is in linux/stage. * dm-snapshots cow on zram Currently *.cow files are store on a a single tmpfs filesystem /cowspace. We can setup one zram device for each cow device directly without any filesystem. * cow options (cowdevice=/cowpath=) Allow to setup a device and path where cow files will be stored, this can be usefull for persistent feature. Live distros based on archiso can benefit. * mount options for images based on dm-snapshot. Allow to specify mount options in some place. Maybe in aitab (per image) or via bootparam (global). For example for using noatime (save fews megabytes on cow dev). * build.sh allows execute from absolute path (implemented on my experimental branch) Instead of copying all files from /usr/share/archiso/config/%blah-blah% to some place and work on it. Allow to execute directly from /usr/share/archiso/config/%blah-blah% and use current directory as working dir. FIXES: * configs/releng/build.sh: Needs a better error-recovery for download core repo (wget). Try again if fails, maybe pacman can be used instead of wget (FS#18959) * console serial port. Needs better command line parsing, current implementation works partially. (example console=ttyS0 does not work, needs at least speed [console=ttyS0,9600]). (FS#16232) Feedback is welcomed, good luck! -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

3 7

[arch-releng] [RFC] [PATCH] [configs/releng] Rename core pkgs images and mountpoint.
by Gerardo Exequiel Pozzi 12 Aug '11

12 Aug '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/releng/aitab.core | 12 ++++++------ configs/releng/build.sh | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) 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 @@ -# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> -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 +# <img> <mnt> <arch> <sfs_comp> <fs_type> <fs_size> +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 -- 1.7.6

3 3

[arch-releng] [RFC] [PATCH] [archiso] Add checksum= boot param
by Gerardo Exequiel Pozzi 12 Aug '11

12 Aug '11

NOTE 1: Needs md5sum, not added here. Option 1: Use md5sum from coreutils. Option 2: Use md5sum from mkinitcpio-busybox (currently is not builded). NOTE 2: This is a draft without testing, but should works. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- README | 4 ++++ archiso/hooks/archiso | 15 +++++++++++++++ archiso/mkarchiso | 15 +++++++++++++++ configs/baseline/build.sh | 1 + configs/releng/build.sh | 2 ++ 5 files changed, 37 insertions(+), 0 deletions(-) diff --git a/README b/README index 09765fb..26be787 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..fb817b2 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -135,6 +135,21 @@ archiso_mount_handler() { launch_interactive_shell fi + if [[ "${checksum}" == "y" ]]; then + if [[ -f "/bootmnt/${archisobasedir}/checksum.md5" ]]; then + echo ":: Self-test requested, please wait..." + if md5sum -c "/bootmnt/${archisobasedir}/checksum.md5" > /checksum.log 2>&1; then + echo "done. Checksum is OK, continue booting." + else + echo "ERROR: one or more files are wrong, 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..e4a85eb 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -112,6 +112,8 @@ _usage () echo " includes all specified packages" echo " prepare <dir>" echo " build all images" + echo " checksum <dir>" + echo " make a checksum.md5 for self-test" echo " iso <dir> <image name>" 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,14 @@ _mkfs () { _umount_fs "${work_dir}/mnt/${_src}" } +command_checksum () { + _show_config checksum + + _msg_info "Creating checksum file for self-test" + find "${work_dir}/iso/${install_dir}" -print0 | xargs -0 md5sum > "${work_dir}/iso/${install_dir}/checksum.md5" + _msg_info "Done!" +} + # Create an ISO9660 filesystem from "iso" directory. command_iso () { if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then @@ -428,6 +440,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 a07599c..eabe21f 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -86,6 +86,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 284ab76..22229ce 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 -- 1.7.6

3 4

[arch-releng] [RFC] [PATCH] [configs/releng] Change source core-repo mount point
by Gerardo Exequiel Pozzi 12 Aug '11

12 Aug '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/releng/aitab.core | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/releng/aitab.core b/configs/releng/aitab.core index e538000..ebb0aa3 100644 --- a/configs/releng/aitab.core +++ b/configs/releng/aitab.core @@ -2,5 +2,5 @@ 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 +core-pkgs /repo/core/%ARCH% %ARCH% xz none 0 +core-any-pkgs /repo/core/any any xz none 0 -- 1.7.6

2 3