altboot: More 2.6 changes

- Use altboot-KERNEL_VERSION.cfg instead of altboot.cfg

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index 786d45e..46a95ac 100644 (file)
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,14 +6,14 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r14"
+PR = "r15"
 
 
 SRC_URI = "file://altboot-menu \
           file://altboot.rc \
           file://altboot.func \         
           file://init.altboot \
-          file://altboot.cfg"
+          file://altboot*.cfg"
 
 # S = "${WORKDIR}/files"
  
@@ -24,7 +24,7 @@ do_install() {
        install -d ${D}/etc/altboot.rc
        install -d ${D}/usr/share/doc/altboot
        
-       install -m 0644 ${WORKDIR}/altboot.cfg ${D}/etc
+       install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc
        install -m 0644 ${WORKDIR}/altboot.func ${D}/etc
 #      install -m 0644 ${WORKDIR}/docs/altboot/*.txt ${D}/usr/share/doc/altboot
        install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin       

diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot-2.4.cfg
similarity index 100%
rename from packages/altboot/files/akita/altboot.cfg
rename to packages/altboot/files/akita/altboot-2.4.cfg

diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot-2.4.cfg
similarity index 100%
rename from packages/altboot/files/collie/altboot.cfg
rename to packages/altboot/files/collie/altboot-2.4.cfg

diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 506f175..2de4ba2 100644 (file)
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -17,7 +17,11 @@ REAL_INIT="/sbin/init.sysvinit"
 INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`"
 test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5
 
-test -e /etc/altboot.cfg && . /etc/altboot.cfg || echo "WARNING: No altboot.cfg found! Check your installation of Altboot!" > /dev/tty1
+case "`uname -r`" in
+2.6*)  test -e /etc/altboot-2.6.cfg && . /etc/altboot-2.6.cfg || echo "WARNING: No altboot-2.6.cfg found! Check your installation of Altboot!" > /dev/tty1;;
+2.4*)  test -e /etc/altboot-2.4.cfg && . /etc/altboot-2.4.cfg || echo "WARNING: No altboot-2.4.cfg found! Check your installation of Altboot!" > /dev/tty1;;
+*)     die "Unknown kernel [uname -r], no configuration found.";;
+esac
 
 C_RED="\033[31m"
 C_BLUE="\033[34m"

diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg
similarity index 100%
rename from packages/altboot/files/poodle/altboot.cfg
rename to packages/altboot/files/poodle/altboot-2.4.cfg

diff --git a/packages/altboot/files/spitz/altboot.cfg b/packages/altboot/files/spitz/altboot-2.4.cfg
similarity index 100%
rename from packages/altboot/files/spitz/altboot.cfg
rename to packages/altboot/files/spitz/altboot-2.4.cfg