projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3415605
)
Adjust grub variable in boot/isolinux/{addons,grub}.cfg
author
Michael Prokop
<mika@grml.org>
Sat, 24 Oct 2009 22:12:38 +0000
(
00:12
+0200)
committer
Michael Prokop
<mika@grml.org>
Sat, 24 Oct 2009 22:12:38 +0000
(
00:12
+0200)
debian/changelog
patch
|
blob
|
history
grml-live
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
41f2e8a
..
084ed97
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,3
+1,9
@@
+grml-live (0.9.27) unstable; urgency=low
+
+ * Adjust grub variable in boot/isolinux/{addons,grub}.cfg as well.
+
+ -- Michael Prokop <mika@grml.org> Sun, 25 Oct 2009 00:11:24 +0200
+
grml-live (0.9.26) unstable; urgency=low
[ Michael Prokop ]
grml-live (0.9.26) unstable; urgency=low
[ Michael Prokop ]
diff --git
a/grml-live
b/grml-live
index
5f235e7
..
5f04f87
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-763,14
+763,19
@@
if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
"$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
for file in "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6 \
"$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.cfg \
+ "$BUILD_OUTPUT"/boot/isolinux/addons.cfg \
"$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg \
"$BUILD_OUTPUT"/boot/isolinux/syslinux.cfg \
+ "$BUILD_OUTPUT"/boot/grub/grub.cfg \
"$BUILD_OUTPUT"/boot/grub/menu.lst ; do
"$BUILD_OUTPUT"/boot/grub/menu.lst ; do
- sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
- -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
+ if [ -e "$file" ] ; then
+ sed -i -e "s!%GRUB_VERSION%!$GRUB_VERSION!g" \
+ -e "s!%GRUB_LEGACY%!$GRUB_LEGACY!g" "$file"
+ fi
done
sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
fi
done
sed -i "s/%RELEASE_INFO%/$GRML_NAME $VERSION - $RELEASENAME/" "$BUILD_OUTPUT"/boot/addons/bsd4grml/boot.6
fi
+
if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg
if [ -e "$BUILD_OUTPUT"/boot/grub/$GRUB_LEGACY ]; then
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/menu.lst
sed -i "s/%GRUB_LEGACY%/$GRUB_LEGACY/g" "$BUILD_OUTPUT"/boot/grub/grub.cfg