Import Debian changes 2.02+dfsg1-16parrot2

grub2 (2.02+dfsg1-16parrot2) testing; urgency=medium

  * Import failsafe options patch from precedent parrot version.
Signed-off-by: Lorenzo Palinuro Faletra <palinuro@parrotsec.org>

debian/changelog

+grub2 (2.02+dfsg1-16parrot2) testing; urgency=medium
+
+  * Import failsafe options patch from precedent parrot version.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sat, 13 Apr 2019 19:31:31 +0200
+
 grub2 (2.02+dfsg1-16parrot1) testing; urgency=medium
 
   * Import new Debian release.

debian/patches/add-failsafe-boot-options.patch

+Description: Add failsafe options for acpi and nouveau on boot screen
+Author: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
+Last-Update: 2019-03-20
+
+--- grub2-2.02+dfsg1.orig/util/grub.d/10_linux.in
++++ grub2-2.02+dfsg1/util/grub.d/10_linux.in
+@@ -17,6 +17,8 @@ set -e
+ # You should have received a copy of the GNU General Public License
+ # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ 
++
++
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+@@ -120,6 +122,10 @@ linux_entry ()
+ 	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
+ 	  init-*)
+ 	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "${type#init-}")" ;;
++	  nouveau-off)
++	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "Nouveau/Nvidia Off")")" ;;
++          acpi-off)
++              title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "ACPI Off")")" ;;
+ 	  *)
+ 	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+       esac
+@@ -334,6 +340,11 @@ while [ "x$list" != "x" ] ; do
+   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+     linux_entry "${OS}" "${version}" simple \
+     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++    
++  linux_entry "${OS}" "${version}" nouveau-off \
++              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} nouveau.modeset=0"
++  linux_entry "${OS}" "${version}" acpi-off \
++              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} acpi=off"
+ 
+     submenu_indentation="$grub_tab"
+     
+

debian/patches/series

@@ -134,3 +134,4 @@ util-check-errors.patch
 xfs-sparse-inodes.patch
 vsnprintf-upper-case-hex.patch
 efi-variable-storage-minimise-writes.patch
+add-failsafe-boot-options.patch