| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-28 17:10:37 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 1340 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/livecdfs-update.sh |
| 8 |
Log: |
| 9 |
Force-enable livecd/users for livecd/type gentoo-release-livecd and gentoo-gamecd. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-02-28 17:00:01 UTC (rev 1339) |
| 14 |
+++ trunk/ChangeLog 2008-02-28 17:10:37 UTC (rev 1340) |
| 15 |
@@ -3,6 +3,11 @@ |
| 16 |
|
| 17 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 18 |
targets/support/livecdfs-update.sh: |
| 19 |
+ Force-enable livecd/users for livecd/type gentoo-release-livecd and |
| 20 |
+ gentoo-gamecd. |
| 21 |
+ |
| 22 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 23 |
+ targets/support/livecdfs-update.sh: |
| 24 |
Remove /etc/conf.d/domainname code, since /etc/conf.d/domainname is no |
| 25 |
longer used. |
| 26 |
|
| 27 |
|
| 28 |
Modified: trunk/targets/support/livecdfs-update.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/support/livecdfs-update.sh 2008-02-28 17:00:01 UTC (rev 1339) |
| 31 |
+++ trunk/targets/support/livecdfs-update.sh 2008-02-28 17:10:37 UTC (rev 1340) |
| 32 |
@@ -31,10 +31,25 @@ |
| 33 |
echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts |
| 34 |
fi |
| 35 |
|
| 36 |
+# Since we're an official Gentoo release, we do things the official Gentoo way. |
| 37 |
+# As such, we override livecd/users. |
| 38 |
+case ${clst_livecd_type} in |
| 39 |
+ gentoo-release-livecd) |
| 40 |
+ user_comment="Gentoo default user" |
| 41 |
+ clst_livecd_users="gentoo" |
| 42 |
+ ;; |
| 43 |
+ gentoo-gamecd) |
| 44 |
+ user_comment="Gentoo GameCD default user" |
| 45 |
+ clst_livecd_users="gamecd" |
| 46 |
+ ;; |
| 47 |
+esac |
| 48 |
+ |
| 49 |
# Add any users |
| 50 |
if [ -n "${clst_livecd_users}" ] |
| 51 |
then |
| 52 |
first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1) |
| 53 |
+ default_comment="Default LiveCD User" |
| 54 |
+ [ -z "${user_comment}" ] && user_comment=${default_comment} |
| 55 |
|
| 56 |
# Here we check to see if games exists for bug #125498 |
| 57 |
if [ "$(getent group games | cut -d: -f1)" != "games" ] |
| 58 |
@@ -50,7 +65,7 @@ |
| 59 |
for x in ${clst_livecd_users} |
| 60 |
do |
| 61 |
useradd -G users,wheel,audio,plugdev,games,cdrom,disk,floppy,usb \ |
| 62 |
- -c "Default LiveCD User" -m ${x} |
| 63 |
+ -g 100 -c ${user_comment} -m ${x} |
| 64 |
chown -R ${x}:users /home/${x} |
| 65 |
if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ] |
| 66 |
then |
| 67 |
|
| 68 |
-- |
| 69 |
gentoo-commits@l.g.o mailing list |
Archives