From b5f46111874e90a0cb757074a561f75734b772d6 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Wed, 3 Apr 2013 12:15:53 +0300
Subject: [PATCH] Use oneshot to add default user to ssu group

---
 rpm/ssu.changes | 3 +++
 rpm/ssu.spec    | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rpm/ssu.changes b/rpm/ssu.changes
index d42928d..c27dd6d 100644
--- a/rpm/ssu.changes
+++ b/rpm/ssu.changes
@@ -1,3 +1,6 @@
+* Wed Apr 03 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.30.1
+- Use oneshot to add default user to ssu group
+
 * Tue Apr 02 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.30
 - Add some more unit tests
 
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index ad3648c..2e83386 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -1,5 +1,5 @@
 Name: ssu
-Version: 0.30
+Version: 0.30.1
 Release: 1
 Summary: SSU enabler for RND
 Group: System/Base
@@ -14,6 +14,7 @@ BuildRequires: pkgconfig(libsystemd-journal)
 BuildRequires: oneshot
 BuildRequires: doxygen
 Requires(pre): shadow-utils
+Requires(pre): /usr/bin/groupadd-user
 Requires(postun): shadow-utils
 Requires: ssu-vendor-data
 
@@ -142,10 +143,7 @@ cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
 
 %pre
 groupadd -rf ssu
-USER=$(getent passwd 1000 | cut -d: -f1)
-if [ -n "$USER" ]; then
-  usermod -a -G ssu $USER
-fi
+groupadd-user ssu
 if [ -f /etc/ssu/ssu.ini ]; then
   chgrp ssu /etc/ssu/ssu.ini
   chmod 664 /etc/ssu/ssu.ini