Made releng/auto_isocontent work with disabled xorriso ACL adapter
This commit is contained in:
parent
a4c43288ed
commit
b9e9d45644
@ -127,7 +127,7 @@ then
|
|||||||
then
|
then
|
||||||
default_acls=yes
|
default_acls=yes
|
||||||
fi
|
fi
|
||||||
setfacl_opts="-setfacl u::rwx,g::r-x,o::---,u:root:rwx,g:sys:rwx,u:daemon:r--,mask::rwx,d:u::rwx,d:g::r-x,d:o::---,d:u:root:rwx,d:g:sys:rwx,d:u:daemon:r--,d:mask::rwx --"
|
setfacl_opts="-setfacl u::rwx,g::r-x,o::---,u:root:rwx,g:sys:rwx,u:daemon:r--,mask::rwx,d:u::rwx,d:g::r-x,d:o::---,d:u:root:rwx,d:g:sys:rwx,d:u:daemon:r--,d:mask::rwx $acl_xattr_iso_dir --"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -185,6 +185,7 @@ fi
|
|||||||
if test "$xorriso_acls" = no
|
if test "$xorriso_acls" = no
|
||||||
then
|
then
|
||||||
acls=no
|
acls=no
|
||||||
|
setfacl_opts=
|
||||||
fi
|
fi
|
||||||
if test "$xorriso_xattrs" = no
|
if test "$xorriso_xattrs" = no
|
||||||
then
|
then
|
||||||
@ -205,7 +206,6 @@ is_valid_iso9660 "$workdir"/image_redirected.iso
|
|||||||
echo -e "\n${SELF}: Producing simple image via pipe" >&2
|
echo -e "\n${SELF}: Producing simple image via pipe" >&2
|
||||||
"$xorriso" -as mkisofs "$on_disk" | cat > "$workdir"/image_piped.iso
|
"$xorriso" -as mkisofs "$on_disk" | cat > "$workdir"/image_piped.iso
|
||||||
is_valid_iso9660 "$workdir"/image_piped.iso
|
is_valid_iso9660 "$workdir"/image_piped.iso
|
||||||
|
|
||||||
echo -e "\n${SELF}: Producing simple image with for_backup/update_r/hardlinks" >&2
|
echo -e "\n${SELF}: Producing simple image with for_backup/update_r/hardlinks" >&2
|
||||||
"$xorriso" \
|
"$xorriso" \
|
||||||
$report_about \
|
$report_about \
|
||||||
|
Loading…
Reference in New Issue
Block a user