[firstboot/f18] new version
Martin Sivák
msivak at fedoraproject.org
Wed Sep 19 11:32:05 UTC 2012
commit a3e261a535e2f665cfcecba8b39b9524b980f5d5
Author: Martin Sivak <msivak at redhat.com>
Date: Wed Sep 19 13:31:41 2012 +0200
new version
.gitignore | 1 +
firstboot.spec | 21 +++++++++------------
sources | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b15f112..e03a3dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,3 +84,4 @@ firstboot-1.111.tar.bz2
/firstboot-18.1.tar.gz
/firstboot-18.2.tar.gz
/firstboot-18.3.tar.gz
+/firstboot-18.4.tar.gz
diff --git a/firstboot.spec b/firstboot.spec
index e0ad388..5d0fcc1 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: 18.3
+Version: 18.4
Release: 1%{?dist}
# This is a Red Hat maintained package which is specific to
# our distribution. Thus the source is only available from
@@ -58,7 +58,7 @@ if [ $1 -ne 2 -a ! -f /etc/sysconfig/firstboot ]; then
if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
echo "RUN_FIRSTBOOT=YES" > /etc/sysconfig/firstboot
else
- systemctl enable firstboot-graphical.service >/dev/null 2>&1 || :
+ %systemd_post firstboot-graphical.service
fi
fi
@@ -66,15 +66,11 @@ fi
if [ $1 = 0 ]; then
rm -rf /usr/share/firstboot/*.pyc
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 || :
fi
+%systemd_preun firstboot-graphical.service
%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 || :
-fi
+%systemd_postun_with_restart firstboot-graphical.service
%triggerun -- firstboot < 1.117
%{_bindir}/systemd-sysv-convert --save firstboot > /dev/null 2>&1 ||:
@@ -104,15 +100,16 @@ fi
%changelog
+* Wed Sep 19 2012 Martin Sivak <msivak at redhat.com> 18.4-1
+- Scriptlets replaced with new systemd macros (#850112) (vpavlin at redhat.com)
+- When creating first user in system with no root, force the user to be admin
+ (#856194) (msivak at redhat.com)
+
* Wed Sep 12 2012 Martin Sivak <msivak at redhat.com> 18.3-1
- patch systemd service to refer to display-manager.service
not prefdm.service (awilliam at redhat.com)
- Make the created user administrator by default (#856194)
-* Fri Aug 31 2012 Adam Williamson <awilliam at redhat.com> 18.2-2
-- patch systemd service to refer to display-manager.service not
- prefdm.service (will be 'upstreamed' shortly)
-
* Thu Aug 23 2012 Brian C. Lane <bcl at redhat.com> 18.2-1
- Fix traceback when /etc/sysconfig/i18n doesn't exist (#849967)
(vpodzime at redhat.com)
diff --git a/sources b/sources
index 37da3f4..40df189 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c64ec40a8707fa23ec2fb6ce02887ae7 firstboot-18.3.tar.gz
+fffaf32eecd9a65d154c848f2e32a7b8 firstboot-18.4.tar.gz
More information about the scm-commits
mailing list