duh. can we say, duplicated functionality?

4 files changed, 2 insertions, 92 deletions

diff --git a/ChangeLog b/ChangeLog
index f4851ffc..b54537b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,13 +10,6 @@
 
 	* initscripts.spec: req. e2fsprogs >= 1.15
 
-1999-09-29  Bill Nottingham  <notting@redhat.com>
-
-	* rc.d/init.d/halt:
-	add an extra awk check to make sure we omit root fs.
-
-	* initscripts.spec: req. e2fsprogs >= 1.15
-
 1999-09-28  Michael K. Johnson  <johnsonm@redhat.com>
 
 	* src/ppp-watch.c:
@@ -41,13 +34,6 @@
 	* lang.csh, lang.sh:
 	locale: C -> en_US
 
-1999-09-24  Bill Nottingham  <notting@redhat.com>
-
-	* rc.d/rc.sysinit: use fsck's completion bar
-
-	* lang.csh, lang.sh:
-	locale: C -> en_US
-
 1999-09-23  Michael K. Johnson  <johnsonm@redhat.com>
 
 	* initscripts.spec: new version
@@ -88,9 +74,6 @@
 	* rc.d/rc.sysinit:
 	look in /proc/cpuinfo for arc console
 
-	* rc.d/rc, initscripts.spec, ChangeLog, rc.d/init.d/functions:
-	*** empty log message ***
-
 	* src/process.c: don't dup stdin.
 
 	* rc.d/init.d/functions:
@@ -106,9 +89,6 @@
 
 	* rc.d/init.d/halt: typo
 
-	* ChangeLog, initscripts.spec:
-	*** empty log message ***
-
 	* rc.d/init.d/halt:
 	do process splatting for final umount too.
 
@@ -171,55 +151,11 @@
 
 	* prefdm: get rid of which output
 
-	* initscripts.spec, Makefile, ChangeLog:
-	*** empty log message ***
-
-	* sysconfig/network-scripts/ifdown-post:
-	add support for an ifdown-local
-
-	* rc.d/rc.sysinit:
-	simplify raid startup a little
-
-1999-09-13  Bill Nottingham  <notting@redhat.com>
-
-	* rc.d/init.d/functions, sysconfig/init:
-	Duh. Use different terminal escape.
-
-1999-09-13  Michael K. Johnson  <johnsonm@redhat.com>
-
-	* ChangeLog, initscripts.spec:
-	new version 4.41
-
-	* sysconfig/network-scripts/ifup-ppp, initscripts.spec:
-	new --remotename option to wvdial
-
-1999-09-13  Bill Nottingham  <notting@redhat.com>
-
-	* sysconfig/network-scripts/ifup:
-	i before e....
-
-1999-09-13  Michael K. Johnson  <johnsonm@redhat.com>
-
-	* src/ppp-watch.c:
-	tried to add backgrounding at boot time
-
-1999-09-13  Bill Nottingham  <notting@redhat.com>
-
-	* prefdm: get rid of which output
-
 	* sysconfig/network-scripts/ifdown-post:
 	add support for an ifdown-local
 
 	* rc.d/rc.sysinit: simplify raid startup a little
 
-1999-09-13  Bill Nottingham  <notting@redhat.com>
-
-	* sysconfig/network-scripts/ifdown-post:
-	add support for an ifdown-local
-
-	* rc.d/rc.sysinit:
-	simplify raid startup a little
-
 1999-09-13  johnsonm  <johnsonm@redhat.com>
 
 	* src/ppp-watch.c:
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d22b8f04..928e0779 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -38,7 +38,7 @@ if [ "$PROMPT" != "no" ]; then
 fi
 
 # Fix console loglevel
-/sbin/loglevel $LOGLEVEL
+/bin/dmesg -n $LOGLEVEL
 
 # Mount /proc (done here so volume labels can work with fsck)
 
diff --git a/src/Makefile b/src/Makefile
index 33801e07..b312a08b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 CFLAGS+=-Wall -D_GNU_SOURCE -g
 
 PROGS=usernetctl doexec netreport testd usleep ipcalc initlog minilogd \
-	loglevel getkey ppp-watch
+	getkey ppp-watch
 PPPWATCH_OBJS=ppp-watch.o shvar.o
 INITLOG_OBJS=initlog.o process.o
 USLEEP_OBJS=usleep.o
@@ -20,7 +20,6 @@ install:
 	install -s -m 755 ipcalc $(ROOT)/bin/ipcalc
 	install -s -m 755 initlog $(ROOT)/sbin/initlog
 	install -s -m 755 minilogd $(ROOT)/sbin/minilogd
-	install -s -m 755 loglevel $(ROOT)/sbin/loglevel
 	install -s -m 755 getkey $(ROOT)/sbin/getkey
 	install -s -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
 	install -m 644 initlog.1 $(ROOT)/usr/man/man1
diff --git a/src/loglevel.c b/src/loglevel.c
deleted file mode 100644
index de2a4e11..00000000
--- a/src/loglevel.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* Change the default console loglevel */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <linux/unistd.h>
-#include <sys/syscall.h>
-
-int main(int argc, char **argv) {
-   int level;
-
-   if (!argv[1]) exit(0);
-   level=atoi(argv[1]);
-   if ( (level<1) || (level>8) ) {
-      fprintf(stderr,"invalid log level %d\n",level);
-      exit(-1);
-   }
-   if (!syscall(SYS_syslog,8,NULL,level)) {
-      exit(0);
-   } else {
-      perror("syslog");
-      exit(-1);
-   }
-}