bootdisk/trunk/batch-installer: installer-pkgs ui/ui-wizard
hawk
cvs at pld-linux.org
Mon Feb 20 00:17:08 CET 2006
Author: hawk
Date: Mon Feb 20 00:16:53 2006
New Revision: 6981
Modified:
bootdisk/trunk/batch-installer/installer-pkgs
bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- allow smp kernel with mini-iso
Modified: bootdisk/trunk/batch-installer/installer-pkgs
==============================================================================
--- bootdisk/trunk/batch-installer/installer-pkgs (original)
+++ bootdisk/trunk/batch-installer/installer-pkgs Mon Feb 20 00:16:53 2006
@@ -109,7 +109,7 @@
# add chosen kernel package
case "$pkgs_kernel" in
2.4)
- if [ "$pkgs_smp" = yes ] && ! is_mini_iso; then
+ if [ "$pkgs_smp" = yes ] ; then
add_rpm kernel24-smp
else
add_rpm kernel24
@@ -119,7 +119,7 @@
fi
;;
2.4om)
- if [ "$pkgs_smp" = yes ] && ! is_mini_iso; then
+ if [ "$pkgs_smp" = yes ] ; then
add_rpm kernel-mosix-smp
else
add_rpm kernel-mosix
@@ -129,7 +129,7 @@
fi
;;
*)
- if [ "$pkgs_smp" = yes ] && ! is_mini_iso; then
+ if [ "$pkgs_smp" = yes ] ; then
add_rpm kernel-grsecurity-smp
else
add_rpm kernel-grsecurity
Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-wizard (original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard Mon Feb 20 00:16:53 2006
@@ -998,13 +998,13 @@
<item id=2.6>$(nls "Linux 2.6.x")
</menu>
EOF
+ smp=1
+ if [ "$pkgs_smp" = no ] ; then
+ smp=0
+ fi
+ echo -n "<br><check id=pkgs_smp checked=$smp> "
+ nls "Install SMP version of kernel<br><br>"
if ! test -f /tmp/is-mini-iso ; then
- smp=1
- if [ "$pkgs_smp" = no ] ; then
- smp=0
- fi
- echo -n "<br><check id=pkgs_smp checked=$smp> "
- nls "Install SMP version of kernel<br><br>"
nls "Press enter on [ %s ],<br>" "$(nls "Fine-grained packages selection")"
nls "if you want it. Otherwise press [ Next >> ].<br><br>"
echo "<button res=1 caption='_$(nls "Fine-grained packages selection")'>"
More information about the pld-cvs-commit
mailing list