aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-02-25 17:13:36 +0000
committerBill Nottingham <notting@redhat.com>1999-02-25 17:13:36 +0000
commitd49b76009d467ce1751d56058239efea9d279816 (patch)
treeb69b09487ee758534108a7e46ec746dce6cca99d
parent8f3de3c2215ad165c80bedaa99e408193cf91606 (diff)
downloadinitscripts-d49b76009d467ce1751d56058239efea9d279816.tar
initscripts-d49b76009d467ce1751d56058239efea9d279816.tar.gz
initscripts-d49b76009d467ce1751d56058239efea9d279816.tar.bz2
initscripts-d49b76009d467ce1751d56058239efea9d279816.tar.xz
initscripts-d49b76009d467ce1751d56058239efea9d279816.zip
*** empty log message ***
-rw-r--r--ChangeLog5
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/init.d/functions10
-rw-r--r--sysconfig.txt4
-rw-r--r--sysconfig/init10
5 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 08b38a94..acfbf977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
* rc.d/rc.sysinit: put preferred support back in
+ * ChangeLog, sysconfig.txt, sysconfig/init:
+ more changes for sysconfig/init
+
+ * rc.d/init.d/functions: ditto
+
1999-02-23 Bill Nottingham <notting@redhat.com>
* rc.d/rc.sysinit: fix 'force fsck on boot'
diff --git a/initscripts.spec b/initscripts.spec
index 9c1e0cd1..02fa23d2 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,7 +4,7 @@ Name: initscripts
Version: %{version}
Copyright: GPL
Group: System Environment/Base
-Release: 0
+Release: 1
Source: initscripts-%{version}.tar.gz
BuildRoot: /var/tmp/initbld
Requires: mingetty, bash, mktemp, modutils >= 2.1.85-3, e2fsprogs, kbd, sysklogd >= 1.3.31
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 20ae44b6..4b8f91a0 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -24,11 +24,11 @@ else
# or in /usr/doc/initscripts-*/sysconfig.txt
BOOTUP=color
RES_COL=60
- MOVE_TO_COL="echo -en \"\\033[300C\\033[$[${COLUMNS}-${RES_COL}]D\""
- SETCOLOR_SUCCESS="echo -en \"\\033[1;32m\""
- SETCOLOR_FAILURE="echo -en \"\\033[1;31m\""
- SETCOLOR_WARNING="echo -en \"\\033[1;33m\""
- SETCOLOR_NORMAL="echo -en \"\\033[0;39m\""
+ MOVE_TO_COL="echo -en \\033[300C\\033[$[${COLUMNS}-${RES_COL}]D"
+ SETCOLOR_SUCCESS="echo -en \\033[1;32m"
+ SETCOLOR_FAILURE="echo -en \\033[1;31m"
+ SETCOLOR_WARNING="echo -en \\033[1;33m"
+ SETCOLOR_NORMAL="echo -en \\033[0;39m"
LOGLEVEL=1
fi
diff --git a/sysconfig.txt b/sysconfig.txt
index 88fd16a9..5add0329 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -22,8 +22,8 @@ Files in /etc/sysconfig
BOOTUP=<some bootup mode>
BOOTUP=color means new (as of RH6.0) boot display.
- BOOTUP=serial means new display, but without ANSI-formatting
- Anything else means old-style display
+ BOOTUP=verbose means old style display
+ Anything else means new display, but without ANSI-formatting
LOGLEVEL=<a number>
Sets the initial console logging level for the kernel.
The default is 7. 8 means everything (including debugging);
diff --git a/sysconfig/init b/sysconfig/init
index 4b0f326e..7b4d8151 100644
--- a/sysconfig/init
+++ b/sysconfig/init
@@ -6,14 +6,14 @@ BOOTUP=color
RES_COL=60
# terminal sequence to move to that column. You could change this
# to something like "tput hpa ${RES_COL}" if your terminal supports it
-MOVE_TO_COL="echo -en \"\\033[300C\\033[$[${COLUMNS}-${RES_COL}]D\""
+MOVE_TO_COL="echo -en \\033[300C\\033[$[${COLUMNS}-${RES_COL}]D"
# terminal sequence to set color to a 'success' color (currently: green)
-SETCOLOR_SUCCESS="echo -en \"\\033[1;32m\""
+SETCOLOR_SUCCESS="echo -en \\033[1;32m"
# terminal sequence to set color to a 'failure' color (currently: red)
-SETCOLOR_FAILURE="echo -en \"\\033[1;31m\""
+SETCOLOR_FAILURE="echo -en \\033[1;31m"
# terminal sequence to set color to a 'warning' color (currently: yellow)
-SETCOLOR_WARNING="echo -en \"\\033[1;33m\""
+SETCOLOR_WARNING="echo -en \\033[1;33m"
# terminal sequence to reset to the default color.
-SETCOLOR_NORMAL="echo -en \"\\033[0;39m\""
+SETCOLOR_NORMAL="echo -en \\033[0;39m"
# default kernel loglevel on boot (syslog will reset this)
LOGLEVEL=1