[Salix-commits] SF.net SVN: salix:[3103] lxc-salix/trunk/lxc-salix

[<sal...@li...>]

Revision: 3103
          http://salix.svn.sourceforge.net/salix/?rev=3103&view=rev
Author:   fredgnix
Date:     2012-02-25 13:14:50 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
include rc.M patch

Modified Paths:
--------------
    lxc-salix/trunk/lxc-salix

Modified: lxc-salix/trunk/lxc-salix
===================================================================
--- lxc-salix/trunk/lxc-salix	2012-02-25 13:14:39 UTC (rev 3102)
+++ lxc-salix/trunk/lxc-salix	2012-02-25 13:14:50 UTC (rev 3103)
@@ -370,40 +370,39 @@
 +# confirm successful shutdown
 +echo ; echo -e "${BOLDYELLOW}Container stopped.${COLOR_RESET}" ; echo
 +
-
-
---- ./etc/rc.d/rc.M.orig    2011-07-20 11:13:38.332252512 +0200
-+++ ./etc/rc.d/rc.M 2011-07-20 13:22:23.206678301 +0200
-@@ -10,6 +10,10 @@
- # Author:  Fred N. van Kempen, <wa...@uw...>
- #      Heavily modified by Patrick Volkerding <vol...@sl...>
+--- ./etc/rc.d/rc.M.orig	2012-02-15 20:15:58.000000000 +0100
++++ ./etc/rc.d/rc.M	2012-02-15 20:29:52.000000000 +0100
+@@ -11,6 +11,9 @@
+ #		Heavily modified by Patrick Volkerding <vol...@sl...>
  #
-+# tweaks for an lxc container by ponce <mat...@gm...>,
+ # Modified for Salix by: George Vlahavas <vlahavas~at~gmail~dot~com>
++# Tweaks for an lxc container by ponce <mat...@gm...>,
++# Tweaks for Salix container by Frédéric Galusik <fredg~at~salixos~dot~org>
 +# a check for a CONTAINER variable is made to jump unneeded sections
-+
-+CONTAINER=yes
-
- # Tell the viewers what's going to happen.
- echo "Going multiuser..."
-@@ -20,6 +24,9 @@
-   /sbin/ldconfig &
- fi
-
+ 
+ # modified for colorized screen messages and local needs
+ . /etc/shell-colors
+@@ -19,6 +22,9 @@
+ echo
+ echo -e "${BOLDYELLOW}Going to multi user mode.${COLOR_RESET}"
+ 
 +# container check
 +if [ ! $CONTAINER ]; then
 +
  # Screen blanks after 15 minutes idle time, and powers down in one hour
  # if the kernel supports APM or ACPI power management:
  /bin/setterm -blank 15 -powersave powerdown -powerdown 60
-@@ -33,6 +40,8 @@
+@@ -32,6 +38,8 @@
    /bin/hostname darkstar
  fi
-
+ 
 +fi # end container check
 +
  # Set the permissions on /var/log/dmesg according to whether the kernel
  # permits non-root users to access kernel dmesg information:
  if [ -r /proc/sys/kernel/dmesg_restrict ]; then
+
+
 --- ./etc/rc.d/rc.inet1.orig    2011-07-20 11:13:56.671023244 +0200
 +++ ./etc/rc.d/rc.inet1 2011-07-20 11:14:26.553649659 +0200
 @@ -3,6 +3,11 @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.