From 4b8c216a261c4f207209af8ae1117d3bc20adc5c Mon Sep 17 00:00:00 2001
From: Himadri Sekhar Basu <41947504+hsbasu@users.noreply.github.com>
Date: Fri, 31 May 2024 21:39:06 +0530
Subject: [PATCH] Rebase boot files from ubuntu (#33)

- Update boot creation script used by grub
- Update grub config
- Add desktop file for release upgrade
---
 etc/mamolinux/10_linux                                | 11 +++++------
 etc/mamolinux/grub                                    |  2 +-
 .../applications/mamolinux-release-upgrade.desktop    | 11 +++++++++++
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 usr/share/applications/mamolinux-release-upgrade.desktop

diff --git a/etc/mamolinux/10_linux b/etc/mamolinux/10_linux
index bbbcafe..0030324 100755
--- a/etc/mamolinux/10_linux
+++ b/etc/mamolinux/10_linux
@@ -60,7 +60,11 @@ case ${GRUB_DEVICE} in
   ;;
 esac
 
-: ${GRUB_CMDLINE_LINUX_RECOVERY:=single}
+if [ -x /lib/recovery-mode/recovery-menu ]; then
+    : ${GRUB_CMDLINE_LINUX_RECOVERY:=recovery}
+else
+    : ${GRUB_CMDLINE_LINUX_RECOVERY:=single}
+fi
 
 # Default to disabling partition uuid support to maintian compatibility with
 # older kernels.
@@ -143,11 +147,6 @@ esac
 
 title_correction_code=
 
-if [ -x /lib/recovery-mode/recovery-menu ]; then
-    GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} recovery"
-else
-    GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} single"
-fi
 if [ "$ubuntu_recovery" = 1 ]; then
     GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY nomodeset"
 fi
diff --git a/etc/mamolinux/grub b/etc/mamolinux/grub
index e10caad..107f365 100644
--- a/etc/mamolinux/grub
+++ b/etc/mamolinux/grub
@@ -6,7 +6,7 @@
 GRUB_DEFAULT=0
 GRUB_TIMEOUT_STYLE=hidden
 GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=`lsb_release -d -s | cut -d " " -f1 2>/dev/null || echo Debian`
+GRUB_DISTRIBUTOR=`( . /etc/os-release; echo ${NAME:-Ubuntu} ) 2>/dev/null || echo Debian`
 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
 GRUB_CMDLINE_LINUX=""
 GRUB_BACKGROUND="/usr/share/backgrounds/grub/comet.jpg"
diff --git a/usr/share/applications/mamolinux-release-upgrade.desktop b/usr/share/applications/mamolinux-release-upgrade.desktop
new file mode 100644
index 0000000..72517f9
--- /dev/null
+++ b/usr/share/applications/mamolinux-release-upgrade.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=MamoLinux Release Upgrader
+GenericName=MamoLinux Release Upgrader
+Comment=Upgrade MamoLinux to next availavle release
+Exec=do-release-upgrade --allow-third-party --frontend=DistUpgradeViewGtk3
+Icon=system-software-update
+Terminal=false
+Type=Application
+Categories=System;Settings;
+X-Ubuntu-Gettext-Domain=update-manager
+X-Unity-IconBackgroundColor=#4c9e39