Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] rename airootfs.fs.sfs to airootfs.sfs

Browse Source 
* Make it ISO9660 friendly (extra dot "." is replaced by "_")
* Was used when support both .fs.sfs and .sfs
This commit is contained in:
Gerardo Exequiel Pozzi 2014-06-28 00:35:50 -03:00
parent 36459f3acc
commit ba40f273f6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiso/initcpio/hooks/archiso
View File

@ -174,8 +174,8 @@ archiso_mount_handler() {
fi fi
mkdir -p "/run/archiso/cowspace/${cow_directory}" mkdir -p "/run/archiso/cowspace/${cow_directory}"
_mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.fs.sfs" "/run/archiso/sfs/airootfs" _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/sfs/airootfs"
_mnt_fs "/run/archiso/sfs/airootfs/airootfs.fs" "${newroot}" "/" _mnt_fs "/run/archiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
if [[ "${copytoram}" == "y" ]]; then if [[ "${copytoram}" == "y" ]]; then
umount /run/archiso/bootmnt umount /run/archiso/bootmnt

2
archiso/initcpio/hooks/archiso_pxe_http
View File

@ -34,7 +34,7 @@ archiso_pxe_http_mount_handler () {
mkdir -p "/run/archiso/httpspace" mkdir -p "/run/archiso/httpspace"
mount -t tmpfs -o size="${archiso_http_spc}",mode=0755 httpspace "/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 if [[ "${checksum}" == "y" ]]; then
_curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/" _curl_get "${archiso_http_srv}${archisobasedir}/checksum.${arch}.md5" "/"

12
archiso/mkarchiso
View File

@ -271,7 +271,7 @@ _mkfs () {
local _src="${1}" local _src="${1}"
local _fs_src="${work_dir}/${_src}" 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 if [[ ! -e "${_fs_src}" ]]; then
_msg_error "The path '${_fs_src}' does not exist" 1 _msg_error "The path '${_fs_src}' does not exist" 1
@ -371,7 +371,7 @@ command_iso () {
fi fi
} }
# create airootfs.fs.sfs filesystem, and push it in "iso" directory. # create airootfs.sfs filesystem, and push it in "iso" directory.
command_prepare () { command_prepare () {
_show_config prepare _show_config prepare
@ -382,11 +382,11 @@ command_prepare () {
mkdir -p "${_dst}" mkdir -p "${_dst}"
if _is_directory_changed "${_src}" "${_dst}/airootfs.fs.sfs"; then if _is_directory_changed "${_src}" "${_dst}/airootfs.sfs"; then
_mkfs airootfs _mkfs airootfs
_mksfs airootfs.fs _mksfs airootfs.img
mv "${_src}.fs.sfs" "${_dst}" mv "${_src}.sfs" "${_dst}"
rm "${_src}.fs" rm "${_src}.img"
fi fi
} }