[SM-Commit] GIT changes to master grimoire by Eric Sandall (6f1ba523e81039886641727bb8971721ced2af23)

Eric Sandall scm at sourcemage.org
Fri Aug 27 19:01:19 EDT 2010


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

 disk/grub/HISTORY           |    5 +++++
 disk/grub/INSTALL           |    4 +++-
 net/ifupdown/HISTORY        |    3 +++
 net/ifupdown/init.d/network |    1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6f1ba523e81039886641727bb8971721ced2af23
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    ifupdown: Add RECOMMENDED=yes to init.d/network
    
    We want the network script to be enabled by default

commit 59d4eead1d38d6bd2815d5a11a1b71c2a5230de6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    grub: Copy i386-pc files to /boot/grub/
    grub> setup (device) requires the files in /boot/grub
    Fixes Bug #14634 and makes Bug #15223 not needed

diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 268ca4f..ad39c9e 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,8 @@
+2010-08-27 Eric Sandall <sandalle at sourcemage.org>
+	* INSTALL: Copy i386-pc files to /boot/grub/
+	  grub> setup (device) requires the files in /boot/grub
+	  Fixes Bug #14634 and makes Bug #15223 not needed
+
 2009-01-16 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* PRE_BUILD: Apply grub-0.97-141.1-ext4.patch
diff --git a/disk/grub/INSTALL b/disk/grub/INSTALL
index 7eab73a..6666a22 100755
--- a/disk/grub/INSTALL
+++ b/disk/grub/INSTALL
@@ -8,5 +8,7 @@ chmod  750   ${INSTALL_ROOT}/sbin/grub*  &&
 #  Sample image, replace with SMGL image
 mkdir  -p  /boot/grub/images                &&
 cp  ${SCRIPT_DIRECTORY}/smgl-splash.xpm.gz  \
-     ${INSTALL_ROOT}/boot/grub/images
+     ${INSTALL_ROOT}/boot/grub/images &&
 # this will create a sensible menu.lst.skel in the future
+
+cp -v $INSTALL_ROOT/usr/lib/grub/i386-pc/* $INSTALL_ROOT/boot/grub
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index 0a96b05..cc9b576 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,6 @@
+2010-08-27 Eric Sandall <sandalle at sourcemage.org>
+	* init.d/network: Add RECOMMENDED=yes
+
 2010-05-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.6.10; quoting paths
 
diff --git a/net/ifupdown/init.d/network b/net/ifupdown/init.d/network
index b1dbe48..6424812 100755
--- a/net/ifupdown/init.d/network
+++ b/net/ifupdown/init.d/network
@@ -3,6 +3,7 @@
 PROGRAM=/bin/false    # To get auto_init functionality
 RUNLEVEL=3
 PROVIDES=network
+RECOMMENDED=yes
 
 [ "$USE_SYSLOG" = "yes" ] && NEEDS="+syslog"
 



More information about the SM-Commit mailing list