[gnome-disk-utility] crypttab: Show checkbox for option 'nofail'

[David Zeuthen <davidz src gnome org>]

commit 9852c9fc7f85d0ed8851a371f723fab1ad016a3c
Author: David Zeuthen <davidz redhat com>
Date:   Tue Jan 24 17:56:22 2012 -0500

    crypttab: Show checkbox for option 'nofail'
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 data/ui/edit-crypttab-dialog.ui    |   37 +++++++++++++++++++++++++++--------
 src/palimpsest/gducrypttabdialog.c |    7 +++++-
 2 files changed, 34 insertions(+), 10 deletions(-)
---
diff --git a/data/ui/edit-crypttab-dialog.ui b/data/ui/edit-crypttab-dialog.ui
index 4949797..fc14769 100644
--- a/data/ui/edit-crypttab-dialog.ui
+++ b/data/ui/edit-crypttab-dialog.ui
@@ -195,7 +195,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -210,7 +210,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -228,7 +228,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -246,7 +246,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
@@ -264,20 +264,20 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="crypttab-noauto-checkbutton">
-                        <property name="label" translatable="yes">Don't unlock at _startup</property>
+                        <property name="label" translatable="yes">Don't unlock at startup</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">If checked, the device will not be unlocked at startup [noauto]</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
+                        <property name="use_underline">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -289,6 +289,25 @@
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkCheckButton" id="crypttab-nofail-checkbutton">
+                        <property name="label" translatable="yes">Don't wait for device at startup</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="tooltip_text" translatable="yes">If checked, the system won't wait for the device at startup [nofail]</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkCheckButton" id="crypttab-auth-checkbutton">
                         <property name="label" translatable="yes">Require additional authorization to unlock</property>
                         <property name="visible">True</property>
@@ -296,13 +315,13 @@
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">If checked, additional authorization (typically requiring the user to prove he is an administrator) is required to unlock the device [x-udisks-auth]</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
+                        <property name="use_underline">False</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">4</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
                       </packing>
diff --git a/src/palimpsest/gducrypttabdialog.c b/src/palimpsest/gducrypttabdialog.c
index 7ad6e07..f5e8596 100644
--- a/src/palimpsest/gducrypttabdialog.c
+++ b/src/palimpsest/gducrypttabdialog.c
@@ -51,6 +51,7 @@ typedef struct
   GtkWidget *name_entry;
   GtkWidget *options_entry;
   GtkWidget *noauto_checkbutton;
+  GtkWidget *nofail_checkbutton;
   GtkWidget *auth_checkbutton;
   GtkWidget *passphrase_label;
   GtkWidget *passphrase_entry;
@@ -156,6 +157,7 @@ update (CrypttabDialogData *data,
 
   g_object_freeze_notify (G_OBJECT (data->options_entry));
   gdu_options_update_check_option (data->options_entry, "noauto", widget, data->noauto_checkbutton, FALSE);
+  gdu_options_update_check_option (data->options_entry, "nofail", widget, data->nofail_checkbutton, FALSE);
   gdu_options_update_check_option (data->options_entry, "x-udisks-auth", widget, data->auth_checkbutton, FALSE);
   g_object_thaw_notify (G_OBJECT (data->options_entry));
 
@@ -210,7 +212,7 @@ crypttab_dialog_present (CrypttabDialogData *data)
     {
       configured = FALSE;
       name = g_strdup_printf ("luks-%s", udisks_block_get_id_uuid (data->block));
-      options = "";
+      options = "nofail";
       /* propose noauto if the media is removable - otherwise e.g. systemd will time out at boot */
       if (data->drive != NULL && udisks_drive_get_removable (data->drive))
         options = "noauto";
@@ -241,6 +243,8 @@ crypttab_dialog_present (CrypttabDialogData *data)
                     "notify::text", G_CALLBACK (on_property_changed), data);
   g_signal_connect (data->noauto_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), data);
+  g_signal_connect (data->nofail_checkbutton,
+                    "notify::active", G_CALLBACK (on_property_changed), data);
   g_signal_connect (data->auth_checkbutton,
                     "notify::active", G_CALLBACK (on_property_changed), data);
   g_signal_connect (data->passphrase_entry,
@@ -484,6 +488,7 @@ gdu_crypttab_dialog_show (GduWindow    *window,
   data->name_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-name-entry"));
   data->options_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-options-entry"));
   data->noauto_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-noauto-checkbutton"));
+  data->nofail_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-nofail-checkbutton"));
   data->auth_checkbutton = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-auth-checkbutton"));
   data->passphrase_label = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-label"));
   data->passphrase_entry = GTK_WIDGET (gtk_builder_get_object (data->builder, "crypttab-passphrase-entry"));