Mailinglist Archive: yast-commit (595 mails)

< Previous Next >
[yast-commit] r53957 - in /trunk/bootloader: package/ scripts/ src/generic/ src/grub/ src/modules/ src/routines/
  • From: juhliarik@xxxxxxxxxxxxxxxx
  • Date: Sun, 07 Dec 2008 13:43:38 -0000
  • Message-id: <20081207134339.4C54427B61@xxxxxxxxxxxxxxxx>
Author: juhliarik
Date: Sun Dec 7 14:43:38 2008
New Revision: 53957

URL: http://svn.opensuse.org/viewcvs/yast?rev=53957&view=rev
Log:
deleted support of details settings for trustedgrub it is not supported
in trustedgrub package

Removed:
trunk/bootloader/src/grub/trusted_grub_edit.ycp
Modified:
trunk/bootloader/package/yast2-bootloader.changes
trunk/bootloader/scripts/tp_mbr
trunk/bootloader/src/generic/wizards.ycp
trunk/bootloader/src/grub/Makefile.am
trunk/bootloader/src/modules/BootGRUB.ycp
trunk/bootloader/src/routines/section_widgets.ycp

Modified: trunk/bootloader/package/yast2-bootloader.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/package/yast2-bootloader.changes (original)
+++ trunk/bootloader/package/yast2-bootloader.changes Sun Dec 7 14:43:38 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sun Dec 7 14:45:22 CET 2008 - juhliarik@xxxxxxx
+
+- deleted support of detail settings for trustedgrub because it is
+ not supporeted by trustedgrub package
+
+-------------------------------------------------------------------
Thu Dec 4 09:34:22 CET 2008 - juhliarik@xxxxxxx

- 2.17.45

Modified: trunk/bootloader/scripts/tp_mbr
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/tp_mbr?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/scripts/tp_mbr (original)
+++ trunk/bootloader/scripts/tp_mbr Sun Dec 7 14:43:38 2008
@@ -57,6 +57,7 @@

$old_mbr_sec = $mbr[7];

+=cut
# just a quick check
die "$disk: np tp mbr\n" unless
$mbr[0x17b] == 0x50 &&
@@ -64,11 +65,12 @@
$mbr[0x17d] == 0x61 &&
$mbr[0x17e] == 0x24 &&
$old_mbr_sec > 1;
-
+=cut

# read original mbr

seek F, ($old_mbr_sec - 1) << 9, 0 or die "$disk: $!\n";
+print "number $old_mbr_sec : seek ".(($old_mbr_sec-1)<<9);

sysread F, $old_mbr, 0x200;

@@ -88,7 +90,6 @@
die "$disk: orig mbr crc failure\n" unless crc(\@old_mbr) == $mbr[6];
}

-
# store new mbr & update crc

substr($old_mbr, 0, length $new_mbr) = $new_mbr;

Modified: trunk/bootloader/src/generic/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/wizards.ycp?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/src/generic/wizards.ycp (original)
+++ trunk/bootloader/src/generic/wizards.ycp Sun Dec 7 14:43:38 2008
@@ -77,7 +77,6 @@
`HSpacing (2)
)
),
- "trusted",

`VStretch ()
),
@@ -86,7 +85,7 @@

return CWM::ShowAndRun ($[
"widget_descr" : widget_descr,
- "widget_names" : ["name", "trusted", se_type],
+ "widget_names" : ["name", se_type],
"contents" : contents,
"caption" : _("Boot Loader Settings: Section Management"),
"back_button" : Label::BackButton (),
@@ -142,7 +141,6 @@
"main" : ``(MainDialog ()),
"installation_details" : ``(DetailsDialog ("installation")),
"loader_details" : ``(DetailsDialog ("loader")),
- "t_grub" : ``(DetailsDialog ("trusted_grub")),
"add_new_section" : ``(AddNewSectionDialog ()),
"store_section" : [``(GenericStoreSection ()), true],
"manual_edit" : ``(runEditFilesDialog ()),
@@ -186,12 +184,6 @@
],
"section_edit" : $[
`next : "store_section",
- `trusted_details : "t_grub",
- `abort : `abort,
- ],
- "t_grub" : $[
- `next : "section_edit",
- //FIXME kokso: it is good idea handle abort via "section_edit" not
`abort
`abort : `abort,
],


Modified: trunk/bootloader/src/grub/Makefile.am
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/Makefile.am?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/src/grub/Makefile.am (original)
+++ trunk/bootloader/src/grub/Makefile.am Sun Dec 7 14:43:38 2008
@@ -6,8 +6,7 @@

ynclude_DATA = \
helps.ycp \
- misc.ycp \
- trusted_grub_edit.ycp
+ misc.ycp

EXTRA_DIST = \
$(ynclude_DATA)

Modified: trunk/bootloader/src/modules/BootGRUB.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootGRUB.ycp (original)
+++ trunk/bootloader/src/modules/BootGRUB.ycp Sun Dec 7 14:43:38 2008
@@ -63,7 +63,6 @@
include "bootloader/grub/helps.ycp";
include "bootloader/generic/device_map_edit_widget.ycp";
include "bootloader/generic/dialogs.ycp";
-include "bootloader/grub/trusted_grub_edit.ycp";

// end of mandatory functions
//----------------------------------------------------------------------------
@@ -771,7 +770,6 @@
return $[
"installation" : i386InstallDetailsDialog,
"loader" : genericBootLoaderOptionsDialog,
- "trusted_grub" : TrustedGrubDetails,
];
}


Modified: trunk/bootloader/src/routines/section_widgets.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_widgets.ycp?rev=53957&r1=53956&r2=53957&view=diff
==============================================================================
--- trunk/bootloader/src/routines/section_widgets.ycp (original)
+++ trunk/bootloader/src/routines/section_widgets.ycp Sun Dec 7 14:43:38 2008
@@ -331,45 +331,7 @@
}


-/**
- * Init function of widget
- * @param widget any id of the widget
- */
-void InitTrustedDetails (string widget) {
-
- if (BootCommon::globals["trusted_grub"]:"" != "true")
- UI::ChangeWidget (`id ("trusted"), `Enabled, false);
-
-}
-
-
-
-/**
- * Handle function of a widget
- * @param widget string widget key
- * @param event map event description of event that occured
- * @return symbol to return to wizard sequencer, or nil
- */
-symbol TrustedDetailsButtonHandle (string widget, map event) {

- string lt = Bootloader::getLoaderType ();
- if (lt == "none" || lt == "default")
- {
- NoLoaderAvailable ();
- return nil;
- }
-
- return `trusted_details;
-}
-/**
- * Store function of the root device widget
- * @param widget any widget key
- * @param event map event description of event that occured
- */
-void StoreTrustedDetails (string widget, map event) {
- y2debug("Fake store function for trusted GRUB");
-
-}
/**
* Cache for CommonSectionWidgets
*/
@@ -492,17 +454,6 @@
];
}

- _common_section_widgets["trusted"] = $[
- "widget" : `push_button,
- // push button
- "label" : _("&Trusted GRUB Details"),
- "init" : InitTrustedDetails,
- "handle" : TrustedDetailsButtonHandle,
- "handle_events" : [ "trusted" ],
- "store" : StoreTrustedDetails,
- "help" : TrustedGrubHelp (),
- ];
-
return _common_section_widgets;
}


--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages