Author: havner Date: Wed Jul 12 09:11:36 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- move $CHARS to config file
---- Files affected:
livecd:
livecd (1.11 -> 1.12) , livecd.sysconfig (1.3 -> 1.4) , rc.live (1.33 ->
1.34)
---- Diffs:
================================================================
Index: livecd/livecd
diff -u livecd/livecd:1.11 livecd/livecd:1.12
--- livecd/livecd:1.11 Wed Jul 12 11:03:59 2006
+++ livecd/livecd Wed Jul 12 11:11:31 2006
@@ -19,7 +19,6 @@
case "$1" in
start|restart|reload|force-reload)
- CHARS="LiveCD: "
if [ "$CONFIG_DHCP" = "yes" -a "$CONFIG_NET" = "yes" -a -x "`which
dhcpcd`" ] && ! getparam nodhcp && ! getparam nonet; then
for I in `awk '/^[ \t]*alias[ \t]+eth/ {print $2}'
/etc/modprobe.conf`; do
@@ -54,7 +53,6 @@
touch /var/lock/subsys/livecd
;;
stop)
- CHARS="LiveCD: "
if [ "`cat /proc/mounts | grep \/home\/users`" != "" -a -x "`which
lsof`" ]; then
for I in `lsof +D /home/users | awk '!/[C]OMMAND/ {print $2}' |
sort | uniq`; do
kill -15 $I > /dev/null 2>&1
================================================================
Index: livecd/livecd.sysconfig
diff -u livecd/livecd.sysconfig:1.3 livecd/livecd.sysconfig:1.4
--- livecd/livecd.sysconfig:1.3 Mon Jul 10 16:47:33 2006
+++ livecd/livecd.sysconfig Wed Jul 12 11:11:31 2006
@@ -21,3 +21,6 @@
# alsa mixer cause its hard to make /etc/asound.state compatible
# for all cards)
CONFIG_MIXER=yes
+
+# Text written before every livecd specific rc-scripts line
+CHARS="LiveCD: "
================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.33 livecd/rc.live:1.34
--- livecd/rc.live:1.33 Wed Jul 12 10:43:37 2006
+++ livecd/rc.live Wed Jul 12 11:11:31 2006
@@ -36,7 +36,6 @@
LREDB="`termput setaf 1 1`"
LGREENB="`termput setaf 2 1`"
LBLUEB="`termput setaf 4 1`"
-CHARS="LiveCD: "
show "Setting locale"
busy
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/livecd?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/livecd/livecd.sysconfig?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/livecd/rc.live?r1=1.33&r2=1.34&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
