Skip to content
Browse files

user setup and hostname setup no longer in liveboot, xinitrc now re-r…

…eads webc.conf
  • Loading branch information...
1 parent 0e16829 commit e915cf87cf5b21c88f8a3110d1559f9d1e9adba2 root committed Apr 14, 2012
Showing with 26 additions and 9 deletions.
  1. +8 −7 etc/group
  2. +1 −1 etc/hostname
  3. +6 −0 etc/hosts
  4. +1 −0 etc/passwd
  5. +5 −0 etc/rc.local
  6. +3 −1 home/webc/.xinitrc
  7. +1 −0 lib/live/config/001-hostname
  8. +1 −0 lib/live/config/002-user-setup
View
15 etc/group
@@ -13,13 +13,13 @@ man:x:12:
proxy:x:13:
kmem:x:15:
dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
+fax:x:21:webc
+voice:x:22:webc
+cdrom:x:24:webc
+floppy:x:25:webc
+tape:x:26:webc
sudo:x:27:
-audio:x:29:
+audio:x:29:webc
dip:x:30:
www-data:x:33:
backup:x:34:
@@ -30,7 +30,7 @@ src:x:40:
gnats:x:41:
shadow:x:42:
utmp:x:43:
-video:x:44:
+video:x:44:webc
sasl:x:45:
plugdev:x:46:
staff:x:50:
@@ -41,3 +41,4 @@ libuuid:x:101:
crontab:x:102:
utempter:x:103:
netdev:x:104:
+webc:x:1000:
View
2 etc/hostname
@@ -1 +1 @@
-localhost.localdomain
+webconverger
View
6 etc/hosts
@@ -0,0 +1,6 @@
+127.0.0.1 localhost
+::1 localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
View
1 etc/passwd
@@ -17,3 +17,4 @@ irc:x:39:39:ircd:/var/run/ircd:/bin/sh
gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
libuuid:x:100:101::/var/lib/libuuid:/bin/sh
+webc:x:1000:1000::/home/webc:/bin/bash
View
5 etc/rc.local
@@ -1,3 +1,8 @@
#!/bin/bash
#
#
+source "/etc/webc/webc.conf"
+
+cmdline_has debug && {
+ sed -i -e 's/^sudo:.*/sudo:x:27:webc/' /etc/group
+}
View
4 home/webc/.xinitrc
@@ -3,7 +3,7 @@
# hendry@webconverger.com
WEBCHOME=/home/webc
-. "/etc/webc/webc.conf"
+source "/etc/webc/webc.conf"
logs xsession invoked
exec &> /home/webc/.xerrors.debug
cmdline_has debug && {
@@ -23,6 +23,7 @@ then
done
fi
+source "/etc/webc/webc.conf"
update_background /etc/webc/configuring.png
! cmdline_has debug && live_config_update
@@ -118,5 +119,6 @@ do
rm -rf /home/webc/.macromedia
rm -rf /home/webc/Downloads
+ source "/etc/webc/webc.conf"
! cmdline_has debug && live_config_update
done
View
1 lib/live/config/001-hostname
@@ -7,6 +7,7 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
+exit 0
Hostname ()
{
View
1 lib/live/config/002-user-setup
@@ -7,6 +7,7 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
+exit 0
User_setup ()
{

0 comments on commit e915cf8

Please sign in to comment.
Something went wrong with that request. Please try again.