Fix typo in service config page.

With the typo fix, improve, slightly, the output of sgdisk failing to help track issue with Mac deploy failing on gpt layout.
FOGProject · Jan 11, 2017 · a13f2dd · a13f2dd
1 parent 5644629
commit a13f2dd
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 18 deletions.
diff --git a/packages/web/lib/pages/serviceconfigurationpage.class.php b/packages/web/lib/pages/serviceconfigurationpage.class.php
@@ -131,7 +131,7 @@ public function index()
                 '%s %s. %s. %s, %s. %s.',
                 _('This will allow you to configure how services'),
                 _('function on client computers'),
-                _('The settings tend to be glboal settings which affect all hosts'),
+                _('The settings tend to be global settings which affect all hosts'),
                 _('If you are looking to configure settings for a specific host'),
                 _('please see the hosts service setttings section'),
                 _('To get started please select an item from the left hand menu')

diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fog-project-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-23 07:36-0400\n"
 "Last-Translator: vspushbullet <vspushbullet@gmail.com>\n"
 "Language-Team: German\n"
@@ -3049,7 +3049,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3038,7 +3038,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3048,7 +3048,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3054,7 +3054,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3044,7 +3044,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-11 06:05-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2897,7 +2897,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3042,7 +3042,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-09 15:20-0500\n"
+"POT-Creation-Date: 2017-01-11 15:15-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -3032,7 +3032,7 @@ msgid "function on client computers"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:134
-msgid "The settings tend to be glboal settings which affect all hosts"
+msgid "The settings tend to be global settings which affect all hosts"
 msgstr ""
 
 #: /var/www/fog/lib/pages/serviceconfigurationpage.class.php:135

diff --git a/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh b/src/buildroot/package/fog/scripts/usr/share/fog/lib/funcs.sh
@@ -1898,7 +1898,11 @@ restorePartitionTablesAndBootLoaders() {
         dots "Restoring Partition Tables (GPT)"
         restoreGRUB "$disk" "$disk_number" "$imagePath" "true"
         sgdisk -gel $tmpMBR $disk >/dev/null 2>&1
-        [[ ! $? -eq 0 ]] && handleError "Error trying to restore GPT partition tables (${FUNCNAME[0]})\n   Args Passed: $*"
+        if [[ ! $? -eq 0 ]]; then
+            echo "Failed"
+            debugPause
+            handleError "Error trying to restore GPT partition tables (${FUNCNAME[0]})\n   Args Passed: $*\n    CMD Tried: sgdisk -gel $tmpMBR $disk"
+        fi
         global_gptcheck="yes"
         echo "Done"
     else