Author: glen Date: Thu Jul 14 11:03:57 2005 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- grubby: include kernel feature into boot menu (grsec/omosix/vserver/... etc)
- fix smp grubby install/deinstall
---- Files affected:
SPECS:
kernel.spec (1.441.2.1136 -> 1.441.2.1137)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1136 SPECS/kernel.spec:1.441.2.1137
--- SPECS/kernel.spec:1.441.2.1136 Fri Jul 1 12:01:33 2005
+++ SPECS/kernel.spec Thu Jul 14 13:03:51 2005
@@ -1020,7 +1020,18 @@
ln -sf initrd-%{version}-%{release}.gz %{initrd_dir}/initrd
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{version}-%{release}.gz --install
%{version}-%{release}
+ if [ -f /etc/pld-release ]; then
+ title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
+ else
+ title='PLD Linux'
+ fi
+
+
ext='%{?with_grsecurity:grsecurity}%{?with_omosix:openMosix}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
+ if [ "$ext" ]; then
+ title="$title $ext"
+ fi
+
+ /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{version}-%{release}.gz --install
%{version}-%{release} --banner "$title"
elif [ -x /sbin/rc-boot ]; then
/sbin/rc-boot 1>&2 || :
fi
@@ -1052,7 +1063,7 @@
%preun smp
rm -f /lib/modules/%{version}-%{release}smp/modules.*
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg --remove %{version}-%{release}
+ /sbin/new-kernel-pkg --remove %{version}-%{release}smp
fi
%post smp
@@ -1074,7 +1085,18 @@
ln -sf initrd-%{version}-%{release}smp.gz %{initrd_dir}/initrd
if [ -x /sbin/new-kernel-pkg ]; then
- /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{version}-%{release}.gz --install
%{version}-%{release}
+ if [ -f /etc/pld-release ]; then
+ title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
+ else
+ title='PLD Linux'
+ fi
+
+
ext='%{?with_grsecurity:grsecurity}%{?with_omosix:openMosix}%{?with_vserver:vserver}%{?with_xen0:Xen0}%{?with_xenU:XenU}'
+ if [ "$ext" ]; then
+ title="$title $ext"
+ fi
+
+ /sbin/new-kernel-pkg
--initrdfile=%{initrd_dir}/initrd-%{version}-%{release}smp.gz --install
%{version}-%{release}smp --banner "$title"
elif [ -x /sbin/rc-boot ]; then
/sbin/rc-boot 1>&2 || :
fi
@@ -1356,6 +1378,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1137 2005/07/14 11:03:51 glen
+- grubby: include kernel feature into boot menu (grsec/omosix/vserver/... etc)
+- fix smp grubby install/deinstall
+
Revision 1.441.2.1136 2005/07/01 10:01:33 cieciwa
- version 2.6.12.2,
- _rel 0.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1136&r2=1.441.2.1137&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
