Skip to content

Commit

Permalink
Rename 'option' to 'fs_option' to fix a duplicate definition
Browse files Browse the repository at this point in the history
/usr/share/YaST2/schema/autoyast/rng/dhcp-server.rng:167: element define: Relax-NG parser error : Some defines for option needs the combine attribute
or
/usr/share/YaST2/schema/autoyast/rng/partitioning.rng:255:25: error: multiple definitions of "option" without "combine" attribute
  • Loading branch information
mvidner committed May 26, 2020
1 parent daf5ca4 commit 65bd184
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/autoyast-rnc/partitioning.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,21 @@ part_fs_options =
)
}

option = MAP, (option_str, option_value )
fs_option = MAP, (option_str, option_value )
blank_option = MAP, (option_blank, option_str, option_value )
opt_block_size = element opt_block_size { option }
opt_blocksize = element opt_blocksize { option }
opt_block_size = element opt_block_size { fs_option }
opt_blocksize = element opt_blocksize { fs_option }
opt_bytes_per_inode =
element opt_bytes_per_inode { option }
element opt_bytes_per_inode { fs_option }
opt_format =
element opt_format { blank_option }
opt_hash = element opt_hash { blank_option }
opt_inode_align = element opt_inode_align { option }
opt_inode_align = element opt_inode_align { fs_option }
opt_max_inode_space =
element opt_max_inode_space { option }
opt_raid = element opt_raid { option }
element opt_max_inode_space { fs_option }
opt_raid = element opt_raid { fs_option }
opt_reserved_blocks =
element opt_reserved_blocks { option }
element opt_reserved_blocks { fs_option }
raid_name = element raid_name { STRING }

raid_options = element raid_options { MAP, (persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & raid_name?) }
Expand Down

0 comments on commit 65bd184

Please sign in to comment.