[firstboot/f16] Do not run firstboot in text mode automatically (#737118) Clear the user entry text fields (#736193)

[Martin Gracik]

commit 392f7dc462a3997f842993391d4c80c232823139
Author: Martin Gracik <mgracik at redhat.com>
Date:   Mon Sep 19 22:09:54 2011 +0200

    Do not run firstboot in text mode automatically (#737118)
    Clear the user entry text fields (#736193)

 .gitignore     |    1 +
 firstboot.spec |   14 +++++---------
 sources        |    2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3017f39..ba01b28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@ firstboot-1.111.tar.bz2
 /firstboot-16.1.tar.bz2
 /firstboot-16.2.tar.bz2
 /firstboot-16.3.tar.bz2
+/firstboot-16.4.tar.bz2
diff --git a/firstboot.spec b/firstboot.spec
index 3a9bbbc..2f2cfe3 100644
--- a/firstboot.spec
+++ b/firstboot.spec
@@ -3,7 +3,7 @@
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
-Version: 16.3
+Version: 16.4
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -57,7 +57,6 @@ if [ $1 -ne 2 -a ! -f /etc/sysconfig/firstboot ]; then
     echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot
   else
     systemctl enable firstboot-graphical.service >/dev/null 2>&1 || :
-    systemctl enable firstboot-text.service >/dev/null 2>&1 || :
   fi
 fi
 
@@ -67,24 +66,19 @@ if [ $1 = 0 ]; then
   rm -rf /usr/share/firstboot/modules/*.pyc
   /bin/systemctl --no-reload firstboot-graphical.service > /dev/null 2>&1 || :
   /bin/systemctl stop firstboot-graphical.service > /dev/null 2>&1 || :
-  /bin/systemctl --no-reload firstboot-text.service > /dev/null 2>&1 || :
-  /bin/systemctl stop firstboot-text.service > /dev/null 2>&1 || :
 fi
 
 %postun
 /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     /bin/systemctl try-restart firstboot-graphical.service > /dev/null 2>&1 || :
-    /bin/systemctl try-restart firstboot-text.service > /dev/null 2>&1 || :
 fi
 
 %triggerun -- firstboot < 1.117
 %{_bindir}/systemd-sysv-convert --save firstboot > /dev/null 2>&1 ||:
 /bin/systemctl enable firstboot-graphical.service > /dev/null 2>&1
-/bin/systemctl enable firstboot-text.service > /dev/null 2>&1
 /sbin/chkconfig --del firstboot > /dev/null 2>&1 || :
 /bin/systemctl try-restart firstboot-graphical.service > /dev/null 2>&1 || :
-/bin/systemctl try-restart firstboot-text.service > /dev/null 2>&1 || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -94,14 +88,12 @@ fi
 %dir %{_datadir}/firstboot/themes/default
 %{python_sitelib}/*
 %{_sbindir}/firstboot
-%{_sbindir}/firstboot-text
 %{_datadir}/firstboot/modules/create_user.py*
 %{_datadir}/firstboot/modules/date.py*
 %{_datadir}/firstboot/modules/eula.py*
 %{_datadir}/firstboot/modules/welcome.py*
 %{_datadir}/firstboot/themes/default/*
 /lib/systemd/system/firstboot-graphical.service
-/lib/systemd/system/firstboot-text.service
 %ifarch s390 s390x
 %dir %{_sysconfdir}/profile.d
 %{_sysconfdir}/profile.d/firstboot.sh
@@ -110,6 +102,10 @@ fi
 
 
 %changelog
+* Mon Sep 19 2011 Martin Gracik <mgracik at redhat.com> 16.4-1
+- Do not run firstboot in text mode automatically (#737118)
+- Clear the user entry text fields (#736193)
+
 * Wed Sep 07 2011 Martin Gracik <mgracik at redhat.com> 16.3-1
 - Add a firstboot-text wrapper (#734306)
 
diff --git a/sources b/sources
index c00f01e..a994740 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1fe505fb36950197bd3a0e034412867  firstboot-16.3.tar.bz2
+1124c87f126bf7823f2dd04f1c324f9f  firstboot-16.4.tar.bz2