[meta-selinux][PATCH] selinux-image: Fix RE error getting POL_TYPE

[meta-selinux][PATCH] selinux-image: Fix RE error getting POL_TYPE

[George McCollister]

Change [:space:] to [[:space:]]. [:space:] is incorrect and is treated
as a list of characters. Prior to this change having a policy of
'standard' resulted in POL_TYPE being set to 'tandard'.

Change the regular expression to match from the beginning of the line
since correcting the [:space:] error causes the '# SELINUXTYPE= can
take one of these values:' line to match.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
 classes/selinux-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/selinux-image.bbclass b/classes/selinux-image.bbclass
index 362ca5c..9303610 100644
--- a/classes/selinux-image.bbclass
+++ b/classes/selinux-image.bbclass
@@ -1,5 +1,5 @@
 selinux_set_labels () {
-    POL_TYPE=$(sed -n -e "s&SELINUXTYPE[:space:]*=[:space:]*\([0-9A-Za-z_]\+\)&\1&p" ${IMAGE_ROOTFS}/${sysconfdir}/selinux/config)
+    POL_TYPE=$(sed -n -e "s&^SELINUXTYPE[[:space:]]*=[[:space:]]*\([0-9A-Za-z_]\+\)&\1&p" ${IMAGE_ROOTFS}/${sysconfdir}/selinux/config)
     setfiles -r ${IMAGE_ROOTFS} ${IMAGE_ROOTFS}/${sysconfdir}/selinux/${POL_TYPE}/contexts/files/file_contexts ${IMAGE_ROOTFS} || exit 1;
 }
 
-- 
2.4.5

Re: [meta-selinux][PATCH] selinux-image: Fix RE error getting POL_TYPE

[Philip Tricca]

On 11/05/2015 08:56 AM, George McCollister wrote:
> Change [:space:] to [[:space:]]. [:space:] is incorrect and is treated
> as a list of characters. Prior to this change having a policy of
> 'standard' resulted in POL_TYPE being set to 'tandard'.

Good catch.

> Change the regular expression to match from the beginning of the line
> since correcting the [:space:] error causes the '# SELINUXTYPE= can
> take one of these values:' line to match.

You may want to add an additional [[:space:]]* between the '^' and
'SELINUXTYPE' to allow for valid whitespace but that's cosmetic. I'd say
pull it either way.

Best,
Philip

> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> ---
>  classes/selinux-image.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/selinux-image.bbclass b/classes/selinux-image.bbclass
> index 362ca5c..9303610 100644
> --- a/classes/selinux-image.bbclass
> +++ b/classes/selinux-image.bbclass
> @@ -1,5 +1,5 @@
>  selinux_set_labels () {
> -    POL_TYPE=$(sed -n -e "s&SELINUXTYPE[:space:]*=[:space:]*\([0-9A-Za-z_]\+\)&\1&p" ${IMAGE_ROOTFS}/${sysconfdir}/selinux/config)
> +    POL_TYPE=$(sed -n -e "s&^SELINUXTYPE[[:space:]]*=[[:space:]]*\([0-9A-Za-z_]\+\)&\1&p" ${IMAGE_ROOTFS}/${sysconfdir}/selinux/config)
>      setfiles -r ${IMAGE_ROOTFS} ${IMAGE_ROOTFS}/${sysconfdir}/selinux/${POL_TYPE}/contexts/files/file_contexts ${IMAGE_ROOTFS} || exit 1;
>  }
>  
>