Added a second patch from John R. Graham <john_r_graham@mindspring.com> from bug...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@501 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 157386c9f9cb07edd0a0a5e7f1fa27ff287236c2..75d004344b51c8a3dfc383dd94abe58ea32a6c9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
+  genkernel.8:
+  Added a second patch from John R. Graham <john_r_graham@mindspring.com> from
+  bug #169383.
+
   27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
   ia64/modules_load, x86/modules_load, x86_64/modules_load,
   xen0/modules_load, xenU/modules_load:

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index a3222bd08418c9fab9d1d5bd2396768cffc8c6a2..7a2a0768b2f6f16ec1da02465dcbc101422d4bac 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -36,6 +36,8 @@ longusage() {
   echo "       --no-gensplash          Do not use gensplash"
   echo "       --install               Install the kernel after building"
   echo "       --no-install            Do not install the kernel after building"
+  echo "       --symlink               Manage symlinks in /boot for installed images"
+  echo "       --no-symlink            Do not manage symlinks"
   echo "       --no-initrdmodules      Don't copy any modules to the initrd"
   echo "       --no-udev               Disable udev support"
   echo "       --no-devfs              Disable devfs support"
@@ -470,6 +472,10 @@ parse_cmdline() {
                      CMD_SYMLINK=1
                      print_info 2 "CMD_SYMLINK: $CMD_SYMLINK"
              ;;
+             --no-symlink)
+                     CMD_SYMLINK=0
+                     print_info 2 "CMD_SYMLINK: $CMD_SYMLINK"
+             ;;
              --no-kernel-sources)
                      CMD_NO_KERNEL_SOURCES=1
                      print_info 2 "CMD_NO_KERNEL_SOURCES: $CMD_NO_KERNEL_SOURCES"

diff --git a/genkernel.8 b/genkernel.8
index e7a9e459caca85d7e9f674755feb8eb501e62f1b..8900b192cd4dbc5c6b86aed293f5c3a77ad5f0e1 100644 (file)
--- a/genkernel.8
+++ b/genkernel.8
@@ -101,6 +101,27 @@ then
 will be automatically mounted if it is
 not already mounted before the initrd and kernel image is copied over.
 .TP
+\fB\-\-\fR[no\-]\fBsymlink\fR
+Manages, or does not manage, symlinks in 
+.I /boot
+like the manual kernel "make install" process does. A
+.I kernel
+(or, depending on options, 
+.I kernelz\fR)
+symlink will link to the most recently built kernel image and a
+.I kernel.old
+(or
+.I kernelz.old\fR)
+symlink will link to the second most recently built image, if one exists.
+Similar symlinks (both * and *.old) are managed for
+.I initramfs\fR (or
+.I initrd\fR)
+and
+.I System.map\f.
+The corresponding work products (i.e., the actual kernel and inirtamfs images, 
+and System.map) are also managed accordingly.  NOTE:  Specifying --symlink 
+does nothing unless --install is also specified.
+.TP
 \fB\-\-no\-initrdmodules\fR
 Don't copy any modules to the initrd.
 .TP