diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-02-26 21:01:49 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-02-26 22:41:22 +0100 |
| commit | b5eed997847fe5652dfa5a2987a383751de8df20 (patch) | |
| tree | e21561c9ae48781a1bb2cc8e742daba81e5f0f96 | |
| parent | a062a9461e68df9f0c6725bd30af11ff01288c95 (diff) | |
| download | clufter-b5eed997847fe5652dfa5a2987a383751de8df20.tar.gz clufter-b5eed997847fe5652dfa5a2987a383751de8df20.tar.xz clufter-b5eed997847fe5652dfa5a2987a383751de8df20.zip | |
filters/ccsflat2pcsprelude[bind-mount]: not bind-mountpoint
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | filters/cluster/rm/_fs.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/filters/cluster/rm/_fs.py b/filters/cluster/rm/_fs.py index ec0c5f1..28d5b17 100644 --- a/filters/cluster/rm/_fs.py +++ b/filters/cluster/rm/_fs.py @@ -68,7 +68,7 @@ ccsflat2pcsprelude = (''' '/', @export)"/> </xsl:when> - <xsl:when test="$FsKind = 'bind-mountpoint'"> + <xsl:when test="$FsKind = 'bind-mount'"> <xsl:value-of select="@source"/> </xsl:when> <xsl:otherwise> @@ -82,12 +82,12 @@ ccsflat2pcsprelude = (''' name="directory" value="{@mountpoint}"/> <!-- fstype ~ fstype --> - <xsl:if test="@fstype or $FsKind = 'bind-mountpoint'"> + <xsl:if test="@fstype or $FsKind = 'bind-mount'"> <nvpair id="{concat($Prefix, '-ATTRS-fstype')}" name="fstype"> <xsl:attribute name="value"> <xsl:choose> - <xsl:when test="$FsKind = 'bind-mountpoint'"> + <xsl:when test="$FsKind = 'bind-mount'"> <xsl:value-of select="'none'"/> </xsl:when> <xsl:otherwise> @@ -113,12 +113,12 @@ ccsflat2pcsprelude = (''' starts-with(@fstype, 'cifs')"> <xsl:value-of select="'guest'"/> </xsl:when> - <xsl:when test="$FsKind = 'bind-mountpoint'"> + <xsl:when test="$FsKind = 'bind-mount'"> <xsl:value-of select="'bind'"/> </xsl:when> <xsl:when test="$FsKind != 'netfs' and - $FsKind != 'bind-mountpoint'"> + $FsKind != 'bind-mount'"> <xsl:value-of select="@options"/> </xsl:when> <xsl:otherwise> @@ -130,7 +130,7 @@ ccsflat2pcsprelude = (''' </nvpair> </xsl:if> <!-- run_fsck ~ force_fsck --> - <xsl:if test="$FsKind != 'bind-mountpoint' + <xsl:if test="$FsKind != 'bind-mount' and ''' + ( xslt_is_member('@force_fsck', ('1', 'yes')) |