From f2cd450a9b8fba37fbb4f2db5f2fece9777a865f Mon Sep 17 00:00:00 2001 From: atratsevskiy Date: Tue, 11 Aug 2009 06:46:08 +0000 Subject: [PATCH] git-svn-id: http://svn.calculate.ru/calculate/trunk@2390 c91db197-33c1-4113-bf15-f8a5c547ca64 --- .../2locale/etc/motd?pass=profile&load=ram&language!=ru | 4 ++-- .../2locale/etc/motd?pass=profile&load=ram&language=ru | 4 ++-- ...> README.html?language!=ru&calculate!=CLS&calculate!=CLSG} | 0 ...=> README.html?language=ru&calculate!=CLS&calculate!=CLSG} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename install/profile/desktop/usr/share/doc/{README.html?language!=ru&calculate!=CLS => README.html?language!=ru&calculate!=CLS&calculate!=CLSG} (100%) rename install/profile/desktop/usr/share/doc/{README.html?language=ru&calculate!=CLS => README.html?language=ru&calculate!=CLS&calculate!=CLSG} (100%) diff --git a/install/profile/2locale/etc/motd?pass=profile&load=ram&language!=ru b/install/profile/2locale/etc/motd?pass=profile&load=ram&language!=ru index 4abf57c..74b3fee 100644 --- a/install/profile/2locale/etc/motd?pass=profile&load=ram&language!=ru +++ b/install/profile/2locale/etc/motd?pass=profile&load=ram&language!=ru @@ -2,10 +2,10 @@ Welcome to the #-calculatename-# Installation CD! If any ethernet adapters were detected at boot, they should be auto-configured if DHCP is available on your network. -#?system=server# +#?system=server?calculate=CLS# Type "net-setup eth0" to specify eth0 IP address settings by hand. #system# -#?system=desktop# +#?system=desktop&calculate!=CLS# Type "wicd-curses" to specify eth0 IP address settings by hand. #system# diff --git a/install/profile/2locale/etc/motd?pass=profile&load=ram&language=ru b/install/profile/2locale/etc/motd?pass=profile&load=ram&language=ru index d987464..f8e1f75 100644 --- a/install/profile/2locale/etc/motd?pass=profile&load=ram&language=ru +++ b/install/profile/2locale/etc/motd?pass=profile&load=ram&language=ru @@ -2,10 +2,10 @@ Если какой-либо из сетевых адаπтеров был обнаружен πри загрузке, он будет автоматически сконфигурирован, если в сети достуπен DHCP сервер. -#?system=server# +#?system=server?calculate=CLS# Выπолните "net-setup eth0" для указания сетевой карты и IP адреса вручную. #system# -#?system=desktop# +#?system=desktop&calculate!=CLS# Выполните "wicd-curses" для указания сетевой карты и IP адреса вручную. #system# diff --git a/install/profile/desktop/usr/share/doc/README.html?language!=ru&calculate!=CLS b/install/profile/desktop/usr/share/doc/README.html?language!=ru&calculate!=CLS&calculate!=CLSG similarity index 100% rename from install/profile/desktop/usr/share/doc/README.html?language!=ru&calculate!=CLS rename to install/profile/desktop/usr/share/doc/README.html?language!=ru&calculate!=CLS&calculate!=CLSG diff --git a/install/profile/desktop/usr/share/doc/README.html?language=ru&calculate!=CLS b/install/profile/desktop/usr/share/doc/README.html?language=ru&calculate!=CLS&calculate!=CLSG similarity index 100% rename from install/profile/desktop/usr/share/doc/README.html?language=ru&calculate!=CLS rename to install/profile/desktop/usr/share/doc/README.html?language=ru&calculate!=CLS&calculate!=CLSG