[initial-setup][rhel7-branch/master][PATCH] Don't create /etc/sysconfig/initial-setup on s390 (#1181209)

Brian C. Lane bcl at redhat.com
Tue Aug 25 20:11:48 UTC 2015


On Tue, Aug 25, 2015 at 01:15:33PM +0200, Martin Kolman wrote:
> Systemd unit status is now used for run detection on the s390,
> so this file is no longer needed.
> 
> Related: rhbz#1181209
> Signed-off-by: Martin Kolman <mkolman at redhat.com>
> ---
>  initial-setup.spec | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/initial-setup.spec b/initial-setup.spec
> index 6d313ac..9896b09 100644
> --- a/initial-setup.spec
> +++ b/initial-setup.spec
> @@ -71,15 +71,8 @@ make install-po-files
>  %find_lang %{name}
>  
>  %post
> -if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
> -  platform="$(arch)"
> -  if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
> -    echo "RUN_INITIAL_SETUP=YES" > /etc/sysconfig/initial-setup
> -  else
> -    %systemd_post initial-setup-graphical.service
> -    %systemd_post initial-setup-text.service
> -  fi
> -fi
> +%systemd_post initial-setup-graphical.service
> +%systemd_post initial-setup-text.service
>  
>  %preun
>  %systemd_preun initial-setup-graphical.service
> -- 
> 2.4.3

Looks good to me.

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)


More information about the anaconda-patches mailing list