sysconfig/init* files dropped

  Users can still create the /etc/sysconfig/init file manually to
  override the default values, which are now taken from init.d/functions.

5 files changed, 12 insertions, 48 deletions

diff --git a/Makefile b/Makefile
index 70caf6ab..bb7d7854 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install:
 
 	install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
-	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
+	install -m644 sysconfig/debug sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
 	cp -af NetworkManager $(ROOT)/etc
 	mkdir -p $(ROOT)/usr/lib/systemd/
@@ -43,9 +43,6 @@ install:
 	chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
 	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/console
-	if uname -m | grep -q s390 ; then \
-	  install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
-	fi
 
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin
diff --git a/initscripts.spec b/initscripts.spec
index 1f954644..2e5b41f5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -61,9 +61,6 @@ make ROOT=%{buildroot} SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir}
 %ifnarch s390 s390x
 rm -f \
   %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc \
-%else
-rm -f \
-  %{buildroot}%{_sysconfdir}/sysconfig/init.s390
 %endif
 
 rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.local
@@ -92,7 +89,6 @@ fi
 %defattr(-,root,root)
 %dir %{_sysconfdir}/sysconfig/network-scripts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
-%config(noreplace) %{_sysconfdir}/sysconfig/init
 %config(noreplace) %{_sysconfdir}/sysconfig/netconsole
 %config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
 %{_sysconfdir}/sysconfig/network-scripts/ifdown
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index fd685682..63686737 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -78,15 +78,24 @@ if [ -z "${BOOTUP:-}" ]; then
     if [ -f /etc/sysconfig/init ]; then
         . /etc/sysconfig/init
     else
-        # This all seem confusing? Look in /etc/sysconfig/init,
-        # or in /usr/share/doc/initscripts-*/sysconfig.txt
+        # verbose ->> very (very!) old bootup look (prior to RHL-6.0?)
+        # color ->> default bootup look
+        # other ->> default bootup look without ANSI colors or positioning
         BOOTUP=color
+        # Column to start "[  OK  ]" label in:
         RES_COL=60
+        # terminal sequence to move to that column:
         MOVE_TO_COL="echo -en \\033[${RES_COL}G"
+        # Terminal sequence to set color to a 'success' (bright green):
         SETCOLOR_SUCCESS="echo -en \\033[1;32m"
+        # Terminal sequence to set color to a 'failure' (bright red):
         SETCOLOR_FAILURE="echo -en \\033[1;31m"
+        # Terminal sequence to set color to a 'warning' (bright yellow):
         SETCOLOR_WARNING="echo -en \\033[1;33m"
+        # Terminal sequence to reset to the default color:
         SETCOLOR_NORMAL="echo -en \\033[0;39m"
+
+        # Verbosity of logging:
         LOGLEVEL=1
     fi
     if [ "$CONSOLETYPE" = "serial" ]; then
diff --git a/sysconfig/init b/sysconfig/init
deleted file mode 100644
index 249ae6df..00000000
--- a/sysconfig/init
+++ /dev/null
@@ -1,17 +0,0 @@
-# color => new RH6.0 bootup
-# verbose => old-style bootup
-# anything else => new style bootup without ANSI colors or positioning
-BOOTUP=color
-# column to start "[  OK  ]" label in 
-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[${RES_COL}G"
-# terminal sequence to set color to a 'success' color (currently: green)
-SETCOLOR_SUCCESS="echo -en \\033[0;32m"
-# terminal sequence to set color to a 'failure' color (currently: red)
-SETCOLOR_FAILURE="echo -en \\033[0;31m"
-# terminal sequence to set color to a 'warning' color (currently: yellow)
-SETCOLOR_WARNING="echo -en \\033[0;33m"
-# terminal sequence to reset to the default color.
-SETCOLOR_NORMAL="echo -en \\033[0;39m"
diff --git a/sysconfig/init.s390 b/sysconfig/init.s390
deleted file mode 100644
index 79955f07..00000000
--- a/sysconfig/init.s390
+++ /dev/null
@@ -1,21 +0,0 @@
-# color => new RH6.0 bootup
-# verbose => old-style bootup
-# anything else => new style bootup without ANSI colors or positioning
-BOOTUP=serial
-# column to start "[  OK  ]" label in 
-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=
-# terminal sequence to set color to a 'success' color (currently: green)
-SETCOLOR_SUCCESS=
-# terminal sequence to set color to a 'failure' color (currently: red)
-SETCOLOR_FAILURE=
-# terminal sequence to set color to a 'warning' color (currently: yellow)
-SETCOLOR_WARNING=
-# terminal sequence to reset to the default color.
-SETCOLOR_NORMAL=
-# default kernel loglevel on boot (syslog will reset this)
-LOGLEVEL=3
-# Set to anything other than 'no' to allow hotkey interactive startup...
-PROMPT=no