* Make it ISO9660 friendly (extra dot "." is replaced by "_") * Was used when support both .fs.sfs and .sfs --- archiso/initcpio/hooks/archiso | 4 ++-- archiso/initcpio/hooks/archiso_pxe_http | 2 +- archiso/mkarchiso | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index d6ca443..c5fd062 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -174,8 +174,8 @@ archiso_mount_handler() { fi mkdir -p "/run/archiso/cowspace/${cow_directory}" - _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.fs.sfs" "/run/archiso/sfs/airootfs" - _mnt_fs "/run/archiso/sfs/airootfs/airootfs.fs" "${newroot}" "/" + _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs" + _mnt_fs "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/" if [[ "${copytoram}" == "y" ]]; then umount /run/archiso/bootmnt diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http index 001b486..84ce17f 100644 --- a/archiso/initcpio/hooks/archiso_pxe_http +++ b/archiso/initcpio/hooks/archiso_pxe_http @@ -34,7 +34,7 @@ archiso_pxe_http_mount_handler () { mkdir -p "/run/archiso/httpspace" mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/run/archiso/httpspace" - _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.fs.sfs" "/${arch}" + _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}" if [[ "${checksum}" == "y" ]]; then _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/" diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 8325608..b0e451c 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -271,7 +271,7 @@ _mkfs () { local _src="${1}" local _fs_src="${work_dir}/${_src}" - local _fs_img="${work_dir}/${_src}.fs" + local _fs_img="${work_dir}/${_src}.img" if [[ ! -e "${_fs_src}" ]]; then _msg_error "The path '${_fs_src}' does not exist" 1 @@ -371,7 +371,7 @@ command_iso () { fi } -# create airootfs.fs.sfs filesystem, and push it in "iso" directory. +# create airootfs.sfs filesystem, and push it in "iso" directory. command_prepare () { _show_config prepare @@ -382,11 +382,11 @@ command_prepare () { mkdir -p "${_dst}" - if _is_directory_changed "${_src}" "${_dst}/airootfs.fs.sfs"; then + if _is_directory_changed "${_src}" "${_dst}/airootfs.sfs"; then _mkfs airootfs - _mksfs airootfs.fs - mv "${_src}.fs.sfs" "${_dst}" - rm "${_src}.fs" + _mksfs airootfs.img + mv "${_src}.sfs" "${_dst}" + rm "${_src}.img" fi } -- 1.9.1