Browse Source

Made releng/auto_isocontent work with disabled xorriso ACL adapter

master
Thomas Schmitt 11 years ago
parent
commit
cd6bd02dc8
  1. 4
      releng/auto_isocontent

4
releng/auto_isocontent

@ -127,7 +127,7 @@ then
then
default_acls=yes
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
@ -185,6 +185,7 @@ fi
if test "$xorriso_acls" = no
then
acls=no
setfacl_opts=
fi
if test "$xorriso_xattrs" = no
then
@ -205,7 +206,6 @@ is_valid_iso9660 "$workdir"/image_redirected.iso
echo -e "\n${SELF}: Producing simple image via pipe" >&2
"$xorriso" -as mkisofs "$on_disk" | cat > "$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
"$xorriso" \
$report_about \

Loading…
Cancel
Save