bootdisk: ui-boot (HEAD) [malekith]

PLD CVS pld-cvs-commit w pld.org.pl
Pon, 29 Lip 2002, 13:15:37 CEST


Module name:	bootdisk
Changes by:	malekith	02/07/29 13:15:34

Modified files:
	ui-boot

Log message:
- use parse_boot_loader_entry()
- little bugfix
- Finish button is now "Leave bootloader config"

Index: ui-boot
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/ui/ui-boot,v
diff -d -u -r1.2 -r1.3
--- ui-boot	2002/04/06 11:46:03	1.2
+++ ui-boot	2002/07/29 11:15:34	1.3
@@ -170,27 +170,7 @@
 load_it ()
 {
   for img in $boot_loader_other ; do
-    id=1
-    for f in $(echo $img | tr ":" " ") ; do
-      eval f${id}=$f
-      id=$(($id+1))
-    done
-    img_os=$f1
-    img_label=$f2
-    img_root=$f3
-    img_kernel=
-    img_initrd=
-    case $img in
-    linux:*:*:*:* )
-      img_kernel=$f3
-      img_initrd=$f4
-      img_root=$f5
-      ;;
-    linux:*:*:* )
-      img_kernel=$f3
-      img_root=$f4
-      ;;
-    esac
+    eval $(parse_boot_loader_entry $img)
     save_img $img_label
   done
 }
@@ -234,7 +214,7 @@
   echo "<item id='change_root $img_label'>      root   = $img_root"
   case $img_os in
     linux )
-      echo "<item id='edit_img $img_label'>      kernel = $img_kernel initrd = $img_kernel"
+      echo "<item id='edit_img $img_label'>      kernel = $img_kernel initrd = $img_initrd"
       ;;
   esac
 }
@@ -263,7 +243,7 @@
 <br>
 <button res=1 caption="$(nls "_Change")">
  <button res=2 caption="$(nls "_Make new entry")">
- <button res=4 caption="$(nls "_Finish")">
+ <button res=4 caption="$(nls "_Leave bootloader configurator")">
 EOF
   case $res in
   1)



Więcej informacji o liście dyskusyjnej pld-installer