[Lunar-commits] r18249 - lunar-iso/trunk/scripts

[Auke Kok]

Author: sofar
Date: 2006-01-22 23:17:34 +0000 (Sun, 22 Jan 2006)
New Revision: 18249

Modified:
   lunar-iso/trunk/scripts/kernels
Log:
Fix grsecurity kernels, also implementing "server" configs in 2 kernels

Modified: lunar-iso/trunk/scripts/kernels
===================================================================
--- lunar-iso/trunk/scripts/kernels	2006-01-22 23:11:16 UTC (rev 18248)
+++ lunar-iso/trunk/scripts/kernels	2006-01-22 23:17:34 UTC (rev 18249)
@@ -43,9 +43,11 @@
 			done
 		done
 	elif [ "$ISO_KSUFFIX" == "2.6" ]; then
-		if [ "$3" == "grsec" ]; then
-			patch_it $ISO_SOURCE/spool/grsecurity-$ISO_GRSVER.patch.bz2 1 || exit 1
-		fi
+		for P in $@; do
+			if [ "$P" == "grsec" ]; then
+				patch_it $ISO_SOURCE/spool/grsecurity-$ISO_GRSVER.patch.bz2 1 || exit 1
+			fi
+		done
 	fi
 }
 
@@ -173,13 +175,13 @@
 	build -safe-i386 "i386 nosmp lowmem safe" "" \
 		"Very safe i386 (default is i686) minimal kernel (no ACPI, DMA, SMP)" "safe"
 	build -normal "nosmp lowmem" "" \
-		"Normal kernel (no SMP) (RECOMMENDED)" "linux"
-	build -smp-4gb "smp mem" "" \
-		"Normal SMP kernel with large memory (4GB)"
+		"Normal kernel (no SMP, 1GB memory max) (RECOMMENDED)" "linux"
+	build -smp-4gb "server smp mem" "" \
+		"Server-optimized SMP kernel with large memory (4GB)"
 	build -grs "nosmp lowmem grsec" "grsec" \
 		"Grsecurity patch" ""
-	build -grs-smp-4gb "smp mem grsec" "grsec" \
-		"Grsecurity patch, SMP, 4GB" ""
+	build -grs-smp-4gb "server smp mem grsec" "grsec" \
+		"Grsecurity, server optimized patch, SMP, 4GB" ""
 
 fi