Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ebd7ab36cf046960ae1938b22d80f0fa0c54aae3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ebd7ab36cf046960ae1938b22d80f0fa0c54aae3)
  • Date: Sun, 15 Nov 2009 15:22:30 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ChangeLog | 6 ++++++
disk/grub2/DETAILS | 2 +-
disk/grub2/HISTORY | 6 ++++++
disk/grub2/PREPARE | 2 +-
disk/grub2/grub-default | 8 ++++++++
gnu.gpg |binary
kernels/linux/HISTORY | 3 +++
kernels/linux/UPDATE_BOOTLOADER | 20 ++++++++++----------
8 files changed, 35 insertions(+), 12 deletions(-)

New commits:
commit ebd7ab36cf046960ae1938b22d80f0fa0c54aae3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

linux: Check for the binary along with the config file for
UPDATE_BOOTLOADER

commit 9c85657db4b35c8f0cdefbff4135f4e3a4054757
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

linux: Cleanup whitespace in UPDATE_BOOTLOADER

commit 2ade2f7e17fdcf9206e4cd3d3075e39986279bc0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Add GRUB_GFXMODE to grub-default
doesn't seem to change the menu generation

commit 1fb2ed352f6b6efeac33e1b64ae3698c38f2ef30
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Add GRUB_DEFAULT, GRUB_TIMEOUT, and GRUB_HIDDEN_TIMEOUT to
grub-default

commit e227c9c8bd2eeb927cff8c38d95b8dc75d0e39cc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

grub2: Updated to 1.97.1
SVN no longer required for x86_64, no longer default

commit 3ffa6d2ab4f8de7470627e4bf64ef9b53a89701a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnu.gpg: Add Robert Millan <rmh.gnupg AT aybabtu.com> 0x65A0A9CE
Key also posted with

http://groups.google.com/group/linux.debian.changes.devel/browse_thread/thread/b6dfaeed7e9f1a93/de5c53d9851107cc
and subkeys.pgp.net

diff --git a/ChangeLog b/ChangeLog
index b9267fe..a496510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
+ * gnu.gpg: Add Robert Millan <rmh.gnupg AT aybabtu.com> 0x65A0A9CE
+ Key also posted with
+
http://groups.google.com/group/linux.debian.changes.devel/browse_thread/thread/b6dfaeed7e9f1a93/de5c53d9851107cc
+ and subkeys.pgp.net
+
2009-11-11 Vasil Yonkov <spirtbrat AT sourcemage.org>
* wm-addons/parcellite: new spell, lightweight GTK+ clipboard manager

diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 579c150..27577af 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn://svn.savannah.gnu.org/grub/trunk/${SPELL}:${SPELL}
SOURCE_IGNORE=volatile
else
- VERSION=1.96
+ VERSION=1.97.1
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
SOURCE_URL[0]=ftp://alpha.gnu.org/gnu/grub/$SOURCE
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index a8f9ec7..d6c6546 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,9 @@
+2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.97.1
+ * PREPARE: SVN no longer required for x86_64, no longer default
+ * grub-default: Add GRUB_DEFAULT, GRUB_TIMEOUT, and
GRUB_HIDDEN_TIMEOUT
+ Add GRUB_GFXMODE, but it doesn't seem to change the menu generation
+
2009-08-09 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,, DETAILS, FINAL, INSTALL, PREPARE, PRE_BUILD, PROVIDES,
grub-default, configs, volatiles: created spell
diff --git a/disk/grub2/PREPARE b/disk/grub2/PREPARE
index e5d6518..e36fea1 100755
--- a/disk/grub2/PREPARE
+++ b/disk/grub2/PREPARE
@@ -1,4 +1,4 @@
-config_query GRUB2_SVN "Build SCM version? (say y for x86_64)" y &&
+config_query GRUB2_SVN "Build SCM version?" n &&
if [ "$GRUB2_SVN" == "y" ]; then
config_query GRUB2_SVN_AUTOUPDATE \
"Automatically update on every system update?" n
diff --git a/disk/grub2/grub-default b/disk/grub2/grub-default
index bdf7669..c77a0bd 100644
--- a/disk/grub2/grub-default
+++ b/disk/grub2/grub-default
@@ -1,3 +1,11 @@
+# Default menu entry
+GRUB_DEFAULT=0
+# Menu timeout
+GRUB_TIMEOUT=5
+# Hidden menu timeout
+GRUB_HIDDEN_TIMEOUT=0
+# Graphics mode
+GRUB_GFXMODE=640x480
# Add recovery items (single mode)
GRUB_DISABLE_LINUX_RECOVERY=
# Booting using UUID's appears broken
diff --git a/gnu.gpg b/gnu.gpg
index 3d4fd9a..9b55165 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 6c4f6e9..9a19475 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2009-11-15 Eric Sandall <sandalle AT sourcemage.org>
+ * UPDATE_BOOTLOADER: Check for the binary along with the config file
+
2009-11-12 Vlad Glagolev <stealth AT sourcemage.org>
* linux/info/patches/maintenance_patches/patch-2.6.27.39: added

diff --git a/kernels/linux/UPDATE_BOOTLOADER b/kernels/linux/UPDATE_BOOTLOADER
index a38b67b..013c90e 100755
--- a/kernels/linux/UPDATE_BOOTLOADER
+++ b/kernels/linux/UPDATE_BOOTLOADER
@@ -37,7 +37,7 @@ update_lilo() {
rm -rf /etc/lilo.conf.new
cp -a /etc/lilo.conf /etc/lilo.conf.old

- IMAGE_COUNT=0
+ IMAGE_COUNT=0
awk -F= 'BEGIN { output=0 } \
$1 ~ /image/ { output=1 } \
{ if( output == 0 ) print $0 }' /etc/lilo.conf > /etc/lilo.conf.new
@@ -45,7 +45,7 @@ update_lilo() {
awk -F= 'BEGIN { output=1 } \
$1 ~ /image/ { output=0 } \
{ if( output == 0 ) print $0 }' /etc/lilo.conf >> /etc/lilo.conf.new
- cat /etc/lilo.conf.new > /etc/lilo.conf
+ cat /etc/lilo.conf.new > /etc/lilo.conf
fi

/sbin/lilo -H
@@ -75,7 +75,7 @@ update_silo() {
if (( IMAGE_COUNT == 14 )); then
break
fi
-
+
echo $LINE >> /etc/silo.conf.new

done
@@ -135,7 +135,7 @@ update_yaboot() {
update_grub() {

local MENU=/boot/grub/menu.lst
-
+
if ! grep -q "vmlinuz-${VERSION} " $MENU; then

rm -rf $MENU.old
@@ -177,16 +177,16 @@ root_dev
case `uname -m` in
powerpc) boot_loader="yaboot" update_yaboot ;;
sparc*) boot_loader="silo" update_silo ;;
- *) if [ -f /etc/lilo.conf ]
+ *) if [ -f /etc/lilo.conf -a -x /sbin/lilo ]
then
- boot_loader="lilo"
+ boot_loader="lilo"
update_lilo
- elif [ -f /boot/grub/grub.cfg ]
+ elif [ -f /boot/grub/grub.cfg -a -x /usr/sbin/grub-mkconfig ]
then
boot_loader="grub2"
update_grub2
- else [ -f /boot/grub/menu.lst ]
- boot_loader="grub"
+ else [ -f /boot/grub/menu.lst -a -x /sbin/grub ]
+ boot_loader="grub"
update_grub
- fi;;
+ fi;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ebd7ab36cf046960ae1938b22d80f0fa0c54aae3), Eric Sandall, 11/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page