Re: Bug#268555: two partition types for efi on ia64
As promised. Here is the revised patch. This has been tested
and I had my glasses on at the time so I could see that the 'efi'
was indeed gone. As with the previous patch this has changes
to the templates but since they are deletions, they require no
translator work.
Jim
On Monday 27 September 2004 18:02, Jim Lieb wrote:
> On Monday 27 September 2004 11:55, Jim Lieb wrote:
> > On Monday 27 September 2004 09:54, Anton Zinoviev wrote:
> > > On Mon, Sep 27, 2004 at 07:15:42AM -0700, Jim Lieb wrote:
> > > > Since there is no template item, it doesn't process that line or
> > > > display it
> > >
> > > If partman doesn't process that line then this is a bug and I will
> > > have to fix it. Have you tested that partman doesn't display this
> > > line?
> >
> > yes I have. I noted a comment in changelog that indicated how to
> > handle this template not being there, which is to cleanly skip it.
> >
> > > Anton Zinoviev
>
> An Oops on my part. I tested again and saw the efi. I must have
> just overlooked it. Please drop this patch even though it does fix
> some other display issues. I'll issue a new one shortly.
>
> Sorry,
>
> Jim
>
> > --
> > *************
> > Jim Lieb Wild Open Source Inc.
> > lieb@wildopensource.com Cell: 831.295.9317
> > Office: 831.421.0883 Fax: 831.421.0885
>
> --
> *************
> Jim Lieb Wild Open Source Inc.
> lieb@wildopensource.com Cell: 831.295.9317
> Office: 831.421.0883 Fax: 831.421.0885
--
*************
Jim Lieb Wild Open Source Inc.
lieb@wildopensource.com Cell: 831.295.9317
Office: 831.421.0883 Fax: 831.421.0885
Index: choose_method/efi/do_option
===================================================================
--- choose_method/efi/do_option (revision 21963)
+++ choose_method/efi/do_option (working copy)
@@ -6,7 +6,6 @@
[ -d $dev/$id ] || mkdir $dev/$id
echo efi >$dev/$id/method
-echo efi >$dev/$id/filesystem
>$dev/$id/format
>$dev/$id/bootable
>$dev/$id/efi_bootable
@@ -14,5 +13,8 @@
if [ -f $dev/$id/use_filesystem ]; then
rm $dev/$id/use_filesystem
fi
+if [ -f $dev/$id/filesystem ]; then
+ rm $dev/$id/filesystem
+fi
exit 0
Index: debian/partman-efi.templates
===================================================================
--- debian/partman-efi.templates (revision 21963)
+++ debian/partman-efi.templates (working copy)
@@ -25,9 +25,9 @@
# Up to 10 character positions
_Description: EFIboot
-Template: partman/filesystem_long/efi
-Type: text
-_Description: EFI boot partition (FAT16)
+#Template: partman/filesystem_long/efi
+#Type: text
+#_Description: EFI boot partition (FAT16)
Template: partman/filesystem_short/efi
Type: text
Index: debian/changelog
===================================================================
--- debian/changelog (revision 21963)
+++ debian/changelog (working copy)
@@ -1,3 +1,12 @@
+partman-efi (4) UNRELEASED; urgency=low
+
+ * Jim Lieb
+ - Get file system type displayed properly
+ - remove extra menu label
+ - Closes: #268555
+
+ -- Jim Lieb <lieb@wildopensource.com> Fri, 24 Sep 2004 12:00:00 -0700
+
partman-efi (3) UNRELEASED; urgency=low
* Joey Hess
Index: debian/rules
===================================================================
--- debian/rules (revision 21963)
+++ debian/rules (working copy)
@@ -25,7 +25,6 @@
debian/install-rc commit.d
debian/install-rc init.d
debian/install-rc update.d
- debian/install-rc valid_filesystems
dh_install parted_names lib/partman
rm -rf `find debian/$(PACKAGE) -name CVS`
rm -rf `find debian/$(PACKAGE) -name .svn`
Index: update.d/efi_sync_flag
===================================================================
--- update.d/efi_sync_flag (revision 21963)
+++ update.d/efi_sync_flag (working copy)
@@ -23,22 +23,7 @@
if [ -f $id/method ]; then
method=$(cat $id/method)
fi
-filesys=
-if [ -f $id/filesystem ]; then
- filesys=$(cat $id/filesystem)
-fi
-if [ "$method" = keep -a "$filesys" = efi -a "$filesys" != "$fs" ]; then
- method=format
-fi
-
-if [ "$method" = format -a "$filesys" = efi ]; then
- echo efi >$id/method
- method=efi
- rm $id/mountpoint
- rm $id/visual_mountpoint
-fi
-
flags=''
open_dialog GET_FLAGS $id
while { read_line flag; [ "$flag" ]; }; do
Index: update.d/efi_visuals
===================================================================
--- update.d/efi_visuals (revision 0)
+++ update.d/efi_visuals (revision 0)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. /usr/share/debconf/confmodule
+
+dev=$1
+num=$2
+id=$3
+size=$4
+type=$5
+fs=$6
+path=$7
+name=$8
+
+cd $dev
+
+[ -f $id/method ] || exit 0
+method=$(cat $id/method)
+
+case "$method" in
+ efi)
+ db_metaget partman/method_short/efi description || RET=''
+ printf "${RET:-efi}" >$id/visual_filesystem
+ >$id/visual_mountpoint
+ ;;
+esac
Property changes on: update.d/efi_visuals
___________________________________________________________________
Name: svn:executable
+ *
Index: update.d/_numbers
===================================================================
--- update.d/_numbers (revision 21963)
+++ update.d/_numbers (working copy)
@@ -1 +1,2 @@
-60 efi_sync_flag
+21 efi_sync_flag
+60 efi_visuals
Index: valid_filesystems/efi
===================================================================
--- valid_filesystems/efi (revision 21963)
+++ valid_filesystems/efi (working copy)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-dev="$1"
-id="$2"
-property="$3"
-
-case $property in
- formatable)
- echo efi
- ;;
- existing)
- [ -f $id/detected_filesystem ] || exit 0
- fs=$(cat $id/detected_filesystem)
-
- case "$fs" in
- fat16|fat32)
- echo efi
- ;;
- esac
- ;;
-esac
Index: valid_filesystems/_numbers
===================================================================
--- valid_filesystems/_numbers (revision 21963)
+++ valid_filesystems/_numbers (working copy)
@@ -1 +0,0 @@
-90 efi
Reply to: