tools/archiso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[archiso] mkarchiso: improve info messages

Browse source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2012-05-27 00:28:05 -03:00
parent 0b39407e68
commit 8e9c65fa5d
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
archiso/mkarchiso
View file

@ -233,7 +233,7 @@ _pacman ()
# Cleanup root-image # Cleanup root-image
_cleanup () { _cleanup () {
_msg_info "Cleaning up what we can on root-image" _msg_info "Cleaning up what we can on root-image..."
# remove the initcpio images that were generated for the host system # remove the initcpio images that were generated for the host system
if [[ -d "${work_dir}/root-image/boot" ]]; then if [[ -d "${work_dir}/root-image/boot" ]]; then
@ -269,6 +269,7 @@ _cleanup () {
if [[ ! -L "${work_dir}/root-image/etc/mtab" ]]; then if [[ ! -L "${work_dir}/root-image/etc/mtab" ]]; then
ln -sf "/proc/self/mounts" "${work_dir}/root-image/etc/mtab" ln -sf "/proc/self/mounts" "${work_dir}/root-image/etc/mtab"
fi fi
_msg_info "Done!"
} }
# Makes a SquashFS filesystem image of file/directory passes as argument with desired compression. # Makes a SquashFS filesystem image of file/directory passes as argument with desired compression.
@ -327,7 +328,7 @@ _mkfs () {
fi fi
fi fi
_msg_info "Creating ${_fs_type} image of ${_fs_size} MiB" _msg_info "Creating ${_fs_type} image of ${_fs_size} MiB..."
rm -f "${_fs_img}" rm -f "${_fs_img}"
dd of="${_fs_img}" count=0 bs=1M seek=${_fs_size} &> /dev/null dd of="${_fs_img}" count=0 bs=1M seek=${_fs_size} &> /dev/null
local _qflag="" local _qflag=""
@ -354,9 +355,11 @@ _mkfs () {
_msg_error "Invalid filesystem: ${_fs_type}" 1 _msg_error "Invalid filesystem: ${_fs_type}" 1
;; ;;
esac esac
_msg_info "Done!"
_mount_fs "${_fs_img}" "${work_dir}/mnt/${_src}" _mount_fs "${_fs_img}" "${work_dir}/mnt/${_src}"
_msg_info "Copying '${_fs_src}/' to '${work_dir}/mnt/${_src}/'" _msg_info "Copying '${_fs_src}/' to '${work_dir}/mnt/${_src}/'..."
rsync -aH "${_fs_src}/" "${work_dir}/mnt/${_src}/" rsync -aH "${_fs_src}/" "${work_dir}/mnt/${_src}/"
_msg_info "Done!"
_umount_fs "${work_dir}/mnt/${_src}" _umount_fs "${work_dir}/mnt/${_src}"
} }
@ -367,7 +370,7 @@ command_checksum () {
for _chk_arch in i686 x86_64; do for _chk_arch in i686 x86_64; do
if _is_directory_changed "${work_dir}/iso/${install_dir}" "${work_dir}/iso/${install_dir}/checksum.${_chk_arch}.md5"; then if _is_directory_changed "${work_dir}/iso/${install_dir}" "${work_dir}/iso/${install_dir}/checksum.${_chk_arch}.md5"; then
_msg_info "Creating checksum file for self-test (${_chk_arch})" _msg_info "Creating checksum file for self-test (${_chk_arch})..."
cd "${work_dir}/iso/${install_dir}" cd "${work_dir}/iso/${install_dir}"
if [[ -d "${_chk_arch}" ]]; then if [[ -d "${_chk_arch}" ]]; then
md5sum aitab > checksum.${_chk_arch}.md5 md5sum aitab > checksum.${_chk_arch}.md5
@ -386,7 +389,7 @@ command_pkglist () {
_show_config pkglist _show_config pkglist
if _is_directory_changed "${work_dir}/root-image/var/lib/pacman/local" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"; then if _is_directory_changed "${work_dir}/root-image/var/lib/pacman/local" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"; then
_msg_info "Creating a list of installed packages on live-enviroment" _msg_info "Creating a list of installed packages on live-enviroment..."
pacman -Sl -r "${work_dir}/root-image" --config "${pacman_conf}" | \ pacman -Sl -r "${work_dir}/root-image" --config "${pacman_conf}" | \
awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \ awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \
"${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"