[firstboot] - Honor the tty set by console kernel argument (#701648) - Translation updates

Tue Jul 19 11:55:07 UTC 2011

commit edd7bb94870bff0a578a800e9fee19b527f4788a
Author: Martin Gracik <mgracik at redhat.com>
Date:   Tue Jul 19 13:58:17 2011 +0200

    - Honor the tty set by console kernel argument (#701648)
    - Translation updates

 .gitignore     |    1 +
 firstboot.spec |   83 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 sources        |    2 +-
 3 files changed, 75 insertions(+), 11 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2a9efed..37f2634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ firstboot-1.111.tar.bz2
 /firstboot-1.114.tar.bz2
 /firstboot-1.115.tar.bz2
 /firstboot-1.116.tar.bz2
+/firstboot-16.0.tar.bz2
diff --git a/firstboot.spec b/firstboot.spec
index a3e02fd..21d431f 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: 1.116
+Version: 16.0
 Release: 1%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -16,15 +16,17 @@ ExclusiveOS: Linux
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext
 BuildRequires: python-devel, python-setuptools-devel
+BuildRequires: systemd-units
 Requires: pygtk2, python
 Requires: setuptool, libuser-python, system-config-users, system-config-date
 Requires: authconfig-gtk, python-meh
 Requires: system-config-keyboard
 Requires: python-ethtool
 Requires: cracklib-python
-Requires: systemd-units
+Requires(post): systemd-units systemd-sysv chkconfig
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 Requires: firstboot(windowmanager)
-Requires(post): chkconfig
 
 %define debug_package %{nil}
 
@@ -45,30 +47,56 @@ make DESTDIR=%{buildroot} SITELIB=%{python_sitelib} install
 rm %{buildroot}/%{_datadir}/firstboot/modules/additional_cds.py*
 %find_lang %{name}
 
+# systemd
+mkdir -p %{buildroot}%{_unitdir}
+install -m644 /lib/systemd/system/firstboot-graphical.service %{buildroot}%{_unitdir}
+install -m644 /lib/systemd/system/firstboot-text.service %{buildroot}%{_unitdir}
+rm -rf %{buildroot}%{_initrddir}
+
 %clean
 rm -rf %{buildroot}
 
 %post
 if [ $1 -ne 2 -a ! -f /etc/sysconfig/firstboot ]; then
-  systemctl enable firstboot-text.service >/dev/null 2>&1 || :
-  systemctl enable firstboot-graphical.service >/dev/null 2>&1 || :
+  platform="$(arch)"
+  if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
+    echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot
+  else
+    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+  fi
 fi
 
 %preun
 if [ $1 = 0 ]; then
   rm -rf /usr/share/firstboot/*.pyc
   rm -rf /usr/share/firstboot/modules/*.pyc
-  systemctl disable firstboot-graphical.service >/dev/null 2>&1 || :
-  systemctl disable firstboot-text.service >/dev/null 2>&1 || :
+  /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,-)
 %dir %{_datadir}/firstboot/
 %dir %{_datadir}/firstboot/modules/
 %dir %{_datadir}/firstboot/themes/
 %dir %{_datadir}/firstboot/themes/default
-%config %{_initrddir}/firstboot
 %{python_sitelib}/*
 %{_sbindir}/firstboot
 %{_datadir}/firstboot/modules/create_user.py*
@@ -76,10 +104,45 @@ fi
 %{_datadir}/firstboot/modules/eula.py*
 %{_datadir}/firstboot/modules/welcome.py*
 %{_datadir}/firstboot/themes/default/*
-/lib/systemd/system/firstboot-text.service
-/lib/systemd/system/firstboot-graphical.service
+%{_unitdir}/firstboot-graphical.service
+%{_unitdir}/firstboot-text.service
+%ifarch s390 s390x
+%dir %{_sysconfdir}/profile.d
+%{_sysconfdir}/profile.d/firstboot.sh
+%{_sysconfdir}/profile.d/firstboot.csh
+%endif
+
 
 %changelog
+* Tue Jul 19 2011 Martin Gracik <mgracik at redhat.com> 16.0-1
+- Honor the tty set by console kernel argument (#701648)
+- Translation updates
+
+* Tue Jul 19 2011 Martin Gracik <mgracik at redhat.com> 1.118-1
+- Get UID_MIN from /etc/login.defs (#717113)
+- Drop SysV support (Jóhann B. Guðmundsson) (#714668)
+- Fix firstboot-text.service (#696320)
+- Fix firstboot for s390 architecture (#463564)
+- Set the theme directory
+- Changes to systemd service files
+- Save exception to a file
+- Remove init file from the spec
+- New systemd service files
+- Remove old init from setup
+- Remove the old init
+- Use the new loader in moduleset
+- Rewritten the firstboot executable
+- Added reconfig property to module and moduleset
+- Added new constants
+- Rewritten frontend
+- Rewritten loader
+- Update systemd config to prevent tty conflict (#681292)
+- Fix username guessing
+- We need to quit plymouth before running firstboot (#679171)
+
+* Fri Feb 18 2011 Martin Gracik <mgracik at redhat.com> 1.117-1
+- Fix username guessing with unicode chars (#678070)
+
 * Tue Feb 15 2011 Martin Gracik <mgracik at redhat.com> 1.116-1
 - systemd's ValidNoProcess renamed to RemainAfterExit
 - Don't run Xorg with -nr option and use vt1
diff --git a/sources b/sources
index 6fe6730..e8deb84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-165be95e4840f16b4f1a79d9dbe802dd  firstboot-1.116.tar.bz2
+f6e2c34824eb6b8d32ff617a1596b7f4  firstboot-16.0.tar.bz2
