Skip to content

Commit

Permalink
Rebase boot files from ubuntu (#33)
Browse files Browse the repository at this point in the history
- Update boot creation script used by grub
- Update grub config
- Add desktop file for release upgrade
  • Loading branch information
hsbasu authored May 31, 2024
1 parent cc3ee40 commit 4b8c216
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
11 changes: 5 additions & 6 deletions etc/mamolinux/10_linux
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/mamolinux/grub
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions usr/share/applications/mamolinux-release-upgrade.desktop
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4b8c216

Please sign in to comment.