Force-enable livecd/users for livecd/type gentoo-release-livecd and gentoo-gamecd.

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

diff --git a/ChangeLog b/ChangeLog
index a383ba154284d4bff1c5a31b16215d740dd7f8cc..befebd2c7be7be0e74654abd2ffbacd1c34c3e92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Force-enable livecd/users for livecd/type gentoo-release-livecd and
+  gentoo-gamecd.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
   Remove /etc/conf.d/domainname code, since /etc/conf.d/domainname is no

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 53df15e4ab71133e39f1bf1472586ae497122a1b..1b0e9a35c0ca9ede7fd6df31c46e39ae1545b551 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -31,10 +31,25 @@ else
        echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
 fi
 
+# Since we're an official Gentoo release, we do things the official Gentoo way.
+# As such, we override livecd/users.
+case ${clst_livecd_type} in
+       gentoo-release-livecd)
+               user_comment="Gentoo default user"
+               clst_livecd_users="gentoo"
+       ;;
+       gentoo-gamecd)
+               user_comment="Gentoo GameCD default user"
+               clst_livecd_users="gamecd"
+       ;;
+esac
+
 # Add any users
 if [ -n "${clst_livecd_users}" ]
 then
        first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
+       default_comment="Default LiveCD User"
+       [ -z "${user_comment}" ] && user_comment=${default_comment}
 
        # Here we check to see if games exists for bug #125498
        if [ "$(getent group games | cut -d: -f1)" != "games" ]
@@ -50,7 +65,7 @@ then
        for x in ${clst_livecd_users}
        do
                useradd -G users,wheel,audio,plugdev,games,cdrom,disk,floppy,usb \
-                       -c "Default LiveCD User" -m ${x}
+                       -g 100 -c ${user_comment} -m ${x}
                chown -R ${x}:users /home/${x}
                if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ]
                then