aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-08-18 21:20:56 +0000
committerBill Nottingham <notting@redhat.com>2004-08-18 21:20:56 +0000
commit81460d38825c32538f1f4e6749c51485ed83a9a4 (patch)
tree6507e78c0cdf68da00dfbf148d0bb41858ba6215
parent9c706f8bad8439ac35a467bbd3672b90b0a6c7c0 (diff)
downloadinitscripts-81460d38825c32538f1f4e6749c51485ed83a9a4.tar
initscripts-81460d38825c32538f1f4e6749c51485ed83a9a4.tar.gz
initscripts-81460d38825c32538f1f4e6749c51485ed83a9a4.tar.bz2
initscripts-81460d38825c32538f1f4e6749c51485ed83a9a4.tar.xz
initscripts-81460d38825c32538f1f4e6749c51485ed83a9a4.zip
remove mkkerneldoth
-rw-r--r--initscripts.spec1
-rwxr-xr-xrc.d/rc.sysinit6
-rw-r--r--src/Makefile4
-rw-r--r--src/mkkerneldoth58
4 files changed, 0 insertions, 69 deletions
diff --git a/initscripts.spec b/initscripts.spec
index e61a4a3d..ea702d3d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -220,7 +220,6 @@ rm -rf $RPM_BUILD_ROOT
%config /etc/profile.d/lang.sh
%config /etc/profile.d/lang.csh
/usr/sbin/sys-unconfig
-/sbin/mkkerneldoth
/sbin/setsysfont
/bin/doexec
/bin/ipcalc
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index fb88fe02..01d9d175 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -843,12 +843,6 @@ if [ -x /usr/sbin/system-config-network-cmd ]; then
fi
fi
-# Generate a header that defines the boot kernel.
-# remove after Fedora Core 2
-if [ "${version[0]}" -lt "3" -a "${version[1]}" -lt "6" ]; then
- /sbin/mkkerneldoth
-fi
-
# Now that we have all of our basic modules loaded and the kernel going,
# let's dump the syslog ring somewhere so we can find it later
dmesg -s 131072 > /var/log/dmesg
diff --git a/src/Makefile b/src/Makefile
index 1ba3026d..fc67203c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,10 +36,6 @@ install:
install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1
install -m 644 consoletype.1 $(ROOT)$(mandir)/man1
install -m 644 initlog.conf $(ROOT)/etc
- install -m 755 mkkerneldoth $(ROOT)/sbin
- if uname -m | grep -q s390 ; then \
- install -m 755 mkkerneldoth.s390 $(ROOT)/sbin/mkkerneldoth ; \
- fi
# this daemon and initscript are useful for testing the up/down/status stuff
# not installed by default, only comes from sources.
diff --git a/src/mkkerneldoth b/src/mkkerneldoth
deleted file mode 100644
index 1c3ee38a..00000000
--- a/src/mkkerneldoth
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# Generate a header that defines the boot kernel.
-#
-
-KERNEL_TYPE=`uname -r | sed 's_^.*\(smp\|enterprise\|bigmem\|hugemem\)$_-\1_;t;s_.*__;'`
-KERNEL_RELEASE=`uname -r | sed 's|smp\|enterprise\|bigmem\|hugemem||g'`
-
-rpm -q kernel$KERNEL_TYPE-$KERNEL_RELEASE >/dev/null 2>&1 && KERNEL_ARCH=`rpm -q --qf '%{ARCH}' kernel$KERNEL_TYPE-$KERNEL_RELEASE 2>/dev/null` || KERNEL_ARCH=`uname -m`
-
-OLD_KERNEL_ARCH_TYPE=`sed -n 's_^/\* Kernel type \(.*\) \*/_\1_p' /boot/kernel.h 2>/dev/null`
-if [ -n "$KERNEL_ARCH" -a "$KERNEL_ARCH$KERNEL_TYPE" != "$OLD_KERNEL_ARCH_TYPE" ]; then
- ENTERPRISE='0'
- SMP='0'
- UP='0'
- BIGMEM='0'
- HUGEMEM='0'
- case "$KERNEL_TYPE" in
- -smp) SMP='1';;
- -enterprise) ENTERPRISE='1';;
- -bigmem) BIGMEM='1';;
- -hugemem) HUGEMEM='1';;
- *) UP='1';;
- esac
- cat > /boot/kernel.h << EOF
-/* This file is automatically generated at boot time. */
-#ifndef __BOOT_KERNEL_H_
-#define __BOOT_KERNEL_H_
-
-/* Kernel type $KERNEL_ARCH$KERNEL_TYPE */
-
-#ifndef __MODULE_KERNEL_$KERNEL_ARCH
-#define __MODULE_KERNEL_$KERNEL_ARCH 1
-#endif
-
-#ifndef __BOOT_KERNEL_ENTERPRISE
-#define __BOOT_KERNEL_ENTERPRISE $ENTERPRISE
-#endif
-
-#ifndef __BOOT_KERNEL_BIGMEM
-#define __BOOT_KERNEL_BIGMEM $BIGMEM
-#endif
-
-#ifndef __BOOT_KERNEL_HUGEMEM
-#define __BOOT_KERNEL_HUGEMEM $HUGEMEM
-#endif
-
-#ifndef __BOOT_KERNEL_SMP
-#define __BOOT_KERNEL_SMP $SMP
-#endif
-
-#ifndef __BOOT_KERNEL_UP
-#define __BOOT_KERNEL_UP $UP
-#endif
-
-#endif
-EOF
-fi