We check for a plugdev group, add it if it doesn't exist, and make sure any users...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1294 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 04de4a35aba08efbc7ac34d646df990432d3cf97..7dde8a9eed85ea566e9dae18d061f3017d538a3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  09 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  We check for a plugdev group, add it if it doesn't exist, and make sure any
+  users specified by livecd/users is in the group.
+
   09 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> arch/mips.py:
   Changing cobalt_n32 to use mipsel4_n32 as its inheritance point. Thanks to
   Stuart Longland <redhatter@gentoo.org> for pointing this change out.

diff --git a/catalyst b/catalyst
index 25dc9ba7a87c0f130c71175db19b4bc7ea982401..3b9fc44b219f8376a42533237dde667de774f7e1 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -39,7 +39,7 @@ def usage():
 
 def version():
        print "Catalyst, version "+__version__
-       print "Copyright 2003-2007 Gentoo Foundation"
+       print "Copyright 2003-2008 Gentoo Foundation"
        print "Distributed under the GNU General Public License version 2\n"
 
 def parse_config(myconfig):

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2d07bd57ad02b9d5cab2c656f098c2973fb717c2..a5aec3cb5634652ede208d386fc57147fd44e8ad 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -44,10 +44,15 @@ then
                echo "Adding games group"
                groupadd -g 35 games
        fi
+       if [ "$(getent group plugdev | cut -d: -f1)" != "plugdev" ]
+       then
+               echo "Adding plugdev group"
+               groupadd plugdev
+       fi
        for x in ${clst_livecd_users}
        do
-               useradd -G users,wheel,audio,games,cdrom,usb -c "Default LiveCD User" \
-                       -m ${x}
+               useradd -G users,wheel,audio,plugdev,games,cdrom,disk,floppy,usb \
+                       -c "Default LiveCD User" -m ${x}
                chown -R ${x}:users /home/${x}
                if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ]
                then