Compare commits
6 Commits
11_0_0-5_e
...
master
Author | SHA1 | Date | |
---|---|---|---|
8851cf012d | |||
b70e793de0 | |||
f9603d6896 | |||
0187e6beeb | |||
0dfef122f9 | |||
79be203838 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
|||||||
*.log
|
*.log
|
||||||
*spec-20*
|
*spec-20*
|
||||||
*.tar.xz
|
*.tar.xz
|
||||||
|
*.bak
|
||||||
|
@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-grub smeserver
|
|||||||
<br />https://wiki.koozali.org/
|
<br />https://wiki.koozali.org/
|
||||||
|
|
||||||
## Bugzilla
|
## Bugzilla
|
||||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-grub&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
|
Show list of outstanding bugs:
|
||||||
|
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-grub&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
|
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-grub&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||||
And a list of outstanding Legacy bugs: (e-smith-grub) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-grub&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
And a list of outstanding Legacy bugs: (e-smith-grub) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-grub&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
sme10
|
|
@@ -24,4 +24,5 @@ use esmith::Build::CreateLinks qw(:all);
|
|||||||
))
|
))
|
||||||
{
|
{
|
||||||
event_actions ( $event , 'update-grub'=>'10');
|
event_actions ( $event , 'update-grub'=>'10');
|
||||||
|
event_actions ( $event , 'grub-fix-entries'=>'11');
|
||||||
}
|
}
|
||||||
|
15
root/etc/e-smith/events/actions/grub-fix-entries
Normal file
15
root/etc/e-smith/events/actions/grub-fix-entries
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
#get version
|
||||||
|
version=$(/usr/sbin/e-smith/config getprop sysconfig ReleaseVersion)
|
||||||
|
if [ -z "${version}" ]; then
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
for filename in /boot/loader/entries/*; do
|
||||||
|
#title Rocky Linux (0-rescue-077544bab95c4f258bba4fa6bdcc9167) 8.10 (Green Obsidian)
|
||||||
|
#title Koozali SME Server (4.18.0-553.36.1.el8_10.x86_64) 11.0alpha1
|
||||||
|
#title Koozali SME Server (4.18.0-553.37.1.el8_10.x86_64) 11.0alpha1
|
||||||
|
#title Koozali SME Server (4.18.0-553.40.1.el8_10.x86_64) 11.0alpha1
|
||||||
|
sed -i -E -e 's/^title Rocky Linux (\(.*\)) [0-9.]+ \([a-zA-Z ]*\)$/title Koozali SME Server \1 '$version'/' $filename
|
||||||
|
done
|
||||||
|
|
@@ -16,7 +16,7 @@ if ( ! defined $ENV{LANG}|| $ENV{LANG}eq "" || $ENV{LANG} eq "C") {
|
|||||||
my $grubpath;
|
my $grubpath;
|
||||||
|
|
||||||
if (-e "/sys/firmware/efi") {
|
if (-e "/sys/firmware/efi") {
|
||||||
$grubpath = "/boot/efi/EFI/centos/grub.cfg";
|
$grubpath = "/boot/efi/EFI/rocky/grub.cfg";
|
||||||
} else {
|
} else {
|
||||||
$grubpath = "/boot/grub2/grub.cfg";
|
$grubpath = "/boot/grub2/grub.cfg";
|
||||||
}
|
}
|
||||||
|
@@ -4,7 +4,7 @@ Summary: smeserver module to configure grub2
|
|||||||
%define name smeserver-grub
|
%define name smeserver-grub
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 11.0.0
|
%define version 11.0.0
|
||||||
%define release 5
|
%define release 7
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
@@ -25,6 +25,12 @@ AutoReqProv: no
|
|||||||
Provides: e-smith-grub
|
Provides: e-smith-grub
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 21 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
|
||||||
|
- fix grub loader entries from Rocky to Koozali [SME: 12898]
|
||||||
|
|
||||||
|
* Wed Jan 08 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
|
||||||
|
- fix path for EFI grub /boot/efi/EFI/rocky [SME: 12867]
|
||||||
|
|
||||||
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
|
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
|
||||||
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user