[Lunar-commits] r15240 - in lunar-iso/trunk: kernels lunar-install/sbin scripts
Auke Kok
sofar at lunar-linux.org
Fri Jun 3 09:00:15 UTC 2005
Author: sofar
Date: 2005-06-03 09:00:15 +0000 (Fri, 03 Jun 2005)
New Revision: 15240
Added:
lunar-iso/trunk/kernels/kernel-modules-2.4
lunar-iso/trunk/kernels/kernel-modules-2.6
Modified:
lunar-iso/trunk/lunar-install/sbin/lunar-install
lunar-iso/trunk/scripts/isofs
lunar-iso/trunk/scripts/kernels
Log:
Nice changeset commit: implement kernel-version-based kernel module lists. There are 2 template files atm for 2.4 and 2.6.
Added: lunar-iso/trunk/kernels/kernel-modules-2.4
===================================================================
--- lunar-iso/trunk/kernels/kernel-modules-2.4 2005-06-03 08:54:43 UTC (rev 15239)
+++ lunar-iso/trunk/kernels/kernel-modules-2.4 2005-06-03 09:00:15 UTC (rev 15240)
@@ -0,0 +1,6 @@
+L:linux-2.4:Default kernel with fixes and extra features
+V:linux-2.4-vanilla:Plain unpatched kernel
+S:linux-2.4-stable:Stable kernel with only crucial fixes
+A:linux-2.4-agr:Low-latency and preemptive kernel
+G:linux-2.4-grsec:Heavily patched with extra security options
+O:linux-2.4-om:OpenMosix clustering kernel
Added: lunar-iso/trunk/kernels/kernel-modules-2.6
===================================================================
--- lunar-iso/trunk/kernels/kernel-modules-2.6 2005-06-03 08:54:43 UTC (rev 15239)
+++ lunar-iso/trunk/kernels/kernel-modules-2.6 2005-06-03 09:00:15 UTC (rev 15240)
@@ -0,0 +1,7 @@
+L:linux-2.6:Latest 2.6 kernel with minor patchlevel patches (2.6.x.Y)
+G:linux-2.6-grsec:kernel with the latest grsecurity patch
+P:linux-2.6-prepatch:2.6 release candidate (rc) kernels
+C:linux-2.6-ck:Con Kolivas patches for desktop use
+I:linux-2.6-inotify:2.6 Kernel with Robert Love's Inotify patch
+K:linux-2.6-cko:Con Kolivas overloaded desktop patchset
+M:linux-2.6-mm:Andrew Mortons latest test patches
Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install 2005-06-03 08:54:43 UTC (rev 15239)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install 2005-06-03 09:00:15 UTC (rev 15240)
@@ -969,9 +969,18 @@
echo $LINE | cut -d: -f1
echo $LINE | cut -d: -f2-
echo $LINE | cut -d: -f2-
- done < /.kernels
+ done < /kernels/.kernels
}
+ list_kernel_modules()
+ {
+ while read LINE; do
+ echo $LINE | cut -d: -f1
+ echo $LINE | cut -d: -f2
+ echo $LINE | cut -d: -f3
+ done < /kernels/.kernel-modules
+ }
+
while true ; do
KCOMMAND=`$DIALOG --title "Kernel selection menu" --cancel-label "Exit" --default-item "C" --item-help --menu "In order to succesfully run linux you need to install the linux kernel, the heart of the operating system. You can choose between compiling one yourself or select a precompiled modular kernel." 0 0 0 \
"C" "Compile a kernel" "Custom configure and compile one of the linux kernels"\
@@ -983,22 +992,10 @@
case $KCOMMAND in
C)
- CCOMMAND=`$DIALOG --title "Kernel selection menu" --cancel-label "Exit" --default-item "L" --item-help --menu "" 0 0 0 \
- "L" "linux-2.4" "Default kernel with fixes and extra features" \
- "S" "linux-2.4-stable" "Stable kernel with only crucial fixes" \
- "V" "linuz-2.4-vanilla" "Plain unpatched kernel" \
- "G" "linux-2.4-grsec" "Heavily patched with extra security options" \
- "A" "linux-2.4-agr" "Low-latency and preemptive kernel" \
- "O" "linux-2.4-om" "OpenMosix clustering kernel"`
-
- case $CCOMMAND in
- L) chroot_run lin -r linux-2.4 ;;
- S) chroot_run lin -r linux-2.4-stable ;;
- V) chroot_run lin -r linuz-2.4-vanilla ;;
- G) chroot_run lin -r linux-2.4-grsec ;;
- A) chroot_run lin -r linux-2.4-agr ;;
- O) chroot_run lin -r linux-2.4-om ;;
- esac
+ CCOMMAND=`$DIALOG --title "Kernel selection menu" --cancel-label "Exit" --default-item "L" --item-help --menu "" 0 0 0 $(list_kernel_modules)`
+ if grep -q "^$CCOMMAND:" /kernels/kernel-modules ; then
+ chroot_run lin -r $(grep "^$CCOMMAND:" /kernels/kernel-modules | cut -d: -f2)
+ fi
;;
P)
CCOMMAND=`$DIALOG --title "Kernel selection menu" --cancel-label "Exit" --item-help --menu "" 0 0 0 \
Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs 2005-06-03 08:54:43 UTC (rev 15239)
+++ lunar-iso/trunk/scripts/isofs 2005-06-03 09:00:15 UTC (rev 15240)
@@ -7,11 +7,14 @@
echo "+ adding kernel modules"
mkdir -p $ISO_TARGET/kernels
-cp $ISO_SOURCE/kernels/.kernels $ISO_TARGET/
cp -a $ISO_SOURCE/kernels/TAR/* $ISO_TARGET/kernels/
tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/safe-modules.tar.bz2
tar xj -C $ISO_TARGET -f $ISO_SOURCE/kernels/linux-modules.tar.bz2
+echo "+ adding kernel module lists"
+cp $ISO_SOURCE/kernels/.kernels $ISO_TARGET/kernels/.kernels
+cp $ISO_SOURCE/kernels/kernel-modules-$ISO_KSUFFIX $ISO_TARGET/kernels/kernel-modules
+
# copy the installed code over:
echo "+ copying installer program"
cp lunar-install/init.d/lunar-install $ISO_TARGET/etc/init.d/
Modified: lunar-iso/trunk/scripts/kernels
===================================================================
--- lunar-iso/trunk/scripts/kernels 2005-06-03 08:54:43 UTC (rev 15239)
+++ lunar-iso/trunk/scripts/kernels 2005-06-03 09:00:15 UTC (rev 15240)
@@ -83,8 +83,8 @@
fi
cp .config $ISO_SOURCE/kernels/BUILD/boot/config-$ISO_KVER$1
gzip $ISO_SOURCE/kernels/BUILD/boot/config-$ISO_KVER$1
- cp -aL $ISO_SOURCE/kernels/linux-$ISO_KVER/include/asm $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1/asm
- cp -aL $ISO_SOURCE/kernels/linux-$ISO_KVER/include/linux $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1/linux
+ # cp -aL $ISO_SOURCE/kernels/linux-$ISO_KVER/include/asm $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1/asm
+ # cp -aL $ISO_SOURCE/kernels/linux-$ISO_KVER/include/linux $ISO_SOURCE/kernels/BUILD/usr/include/linux-$ISO_KVER$1/linux
cd $ISO_SOURCE/kernels/BUILD
tar cjf $ISO_SOURCE/kernels/TAR/$ISO_KVER$1.tar.bz2 boot/ lib/ usr/
cd $ISO_SOURCE/kernels
More information about the Lunar-commits
mailing list