[arch-commits] Commit in filesystem/trunk (filesystem.install gshadow)

[Pierre Schmitz]

    Date: Thursday, November 18, 2010 @ 08:26:35
  Author: pierre
Revision: 99843

* sync gshadow to group (fixes FS#19869
* Fix syntax error when using grep

Modified:
  filesystem/trunk/filesystem.install
  filesystem/trunk/gshadow

--------------------+
 filesystem.install |   26 +++++++++++++++-----------
 gshadow            |    1 +
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: filesystem.install
===================================================================
--- filesystem.install	2010-11-18 13:24:44 UTC (rev 99842)
+++ filesystem.install	2010-11-18 13:26:35 UTC (rev 99843)
@@ -14,53 +14,57 @@
 # arg 2:  the old package version
 post_upgrade() {
   post_install $1
-  if [ ! "`grep ^optical: etc/group`" ]; then
+  if [ ! "`grep '^optical:' etc/group`" ]; then
     echo "adding new groups: audio optical"
     usr/sbin/groupadd -g 92 audio   >/dev/null
     usr/sbin/groupadd -g 93 optical >/dev/null
   fi
-  if [ ! "`grep ^video: etc/group`" ]; then
+  if [ ! "`grep '^video:' etc/group`" ]; then
     echo "adding new groups: video floppy storage"
     usr/sbin/groupadd -g 91 video   >/dev/null
     usr/sbin/groupadd -g 94 floppy  >/dev/null
     usr/sbin/groupadd -g 95 storage >/dev/null
   fi
-  if [ ! "`grep ^log: etc/group`" ]; then
+  if [ ! "`grep '^log:' etc/group`" ]; then
     echo "adding new group: log"
     usr/sbin/groupadd -g 19 log     >/dev/null
   fi
-  if [ ! "`grep ^power: etc/group`" ]; then
+  if [ ! "`grep '^power:' etc/group`" ]; then
     echo "adding new group: power"
     usr/sbin/groupadd -g 98 power   >/dev/null
   fi
-  if [ ! "`grep ^network: etc/group`" ]; then
+  if [ ! "`grep '^network:' etc/group`" ]; then
     echo "adding new group: network"
     usr/sbin/groupadd -g 90 network >/dev/null
   fi
-  if [ ! "`grep ^games: etc/group`" ]; then
+  if [ ! "`grep '^games:' etc/group`" ]; then
     echo "adding new group: games"
     usr/sbin/groupadd -g 50 games >/dev/null
   fi
-  if [ ! "`grep ^uucp: etc/group`" ]; then
+  if [ ! "`grep '^uucp:' etc/group`" ]; then
     echo "adding new group: uucp"
     usr/sbin/groupadd -g 14 uucp >/dev/null
   fi
-  if [ ! "`grep ^http: etc/group`" ]; then
+  if [ ! "`grep '^http:' etc/group`" ]; then
     echo "adding new group: http"
     usr/sbin/groupadd -g 33 http >/dev/null
   fi
-  if [ ! "`grep ^http: etc/passwd`" ]; then
+  if [ ! "`grep '^http:' etc/passwd`" ]; then
     echo "adding new user http"
     usr/sbin/useradd -u 33 -d /srv/http -g http -s /bin/false http >/dev/null
   fi
-  if [ ! "`grep ^scanner: etc/group`" ]; then
+  if [ ! "`grep '^scanner:' etc/group`" ]; then
     echo "adding new group: scanner"
     usr/sbin/groupadd -g 96 scanner >/dev/null
   fi
-  if [ ! "`grep ^rfkill: etc/group`" ]; then
+  if [ ! "`grep '^rfkill:' etc/group`" ]; then
     echo "adding new group: rfkill"
     usr/sbin/groupadd -g 24 rfkill >/dev/null
   fi
+  # sync gshadow to group (fixes FS#19869
+  if [ ! "`grep '^rfkill:' etc/gshadow`" ]; then
+    usr/sbin/grpconv >/dev/null
+  fi
 
   grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf \
     || echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf

Modified: gshadow
===================================================================
--- gshadow	2010-11-18 13:24:44 UTC (rev 99842)
+++ gshadow	2010-11-18 13:26:35 UTC (rev 99843)
@@ -14,6 +14,7 @@
 uucp:::
 log:::root
 locate:::
+rfkill:x::
 smmsp:::
 http:::
 games:::