LU-85 Update some URLs and text to reflect our releases.

The text and URLs in the debian packaging metadata were old
(circa Sun Microsystems), so update them and take the opportunity
to inform about the source of the release being installed.

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I7860e8ada7757d8a991a472af293749fd4c89f5a

diff --git a/debian/control b/debian/control
index 306f7c9..7419a49 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Depends: ${kpatch:Depends}
 Recommends: kernel-package, quilt
 Description: Linux kernel patch for the Lustre Filesystem
  Lustre is a scalable, secure, robust, highly-available
- cluster file system. It is maintained by Sun Microsystems, Inc.
- and available from http://www.lustre.org
+ cluster file system. This release is maintained by Whamcloud, Inc.
+ and available from http://wiki.whamcloud.com/
  .
  Lustre servers require a number of patches to the core Linux kernel,
  mostly to export new functions, add features to ext3, and add
@@ -35,8 +35,8 @@ Priority: optional
 Depends: module-assistant, bzip2, debhelper (>= 5.0.0), libsnmp-dev, dpatch
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package contains the module source. The client kernel modules
  can be built for kernels from 2.6.18 - 2.6.26 from it using
@@ -49,8 +49,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package provides a number of userspace utilities for
  maintaining Lustre filesystems.
@@ -62,8 +62,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from 
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from 
+ http://wiki.whamcloud.com/
  .
  This package provides a number of test utilities for the Lustre filesystem.
 
@@ -74,8 +74,8 @@ Section: libs
 Depends: ${shlibs:Depends}
 Description: Runtime library for Lustre filesystem utilities
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available
- from http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available
+ http://wiki.whamcloud.com/
  .
  This package provides a shared library that is used by userspace
  applications to  work with Lustre filesystems. It gives a user application
@@ -88,7 +88,6 @@ Description: Runtime library for Lustre filesystem utilities
  Currently, liblustre is still under development and only works on Linux
  (i386 & x86_64, not tested on ia64).
  .
- Please see https://mail.clusterfs.com/wikis/lustre/LibLustreHowTo for details.
 
 Package: lustre-dev
 Section: libdevel
@@ -97,7 +96,7 @@ Architecture: i386 powerpc amd64 ia64
 Depends: lustre-utils (= ${binary:Version})
 Description: Development files for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package provides development libraries for the Lustre filesystem.

diff --git a/debian/control.main b/debian/control.main
index 81e7520..ffa3e66 100644 (file)
--- a/debian/control.main
+++ b/debian/control.main
@@ -16,8 +16,8 @@ Depends: ${kpatch:Depends}
 Recommends: kernel-package, quilt
 Description: Linux kernel patch for the Lustre Filesystem
  Lustre is a scalable, secure, robust, highly-available
- cluster file system. It is maintained by Sun Microsystems, Inc.
- and available from http://www.lustre.org
+ cluster file system. This release is maintained by Whamcloud, Inc.
+ and available from http://wiki.whamcloud.com/
  .
  Lustre servers require a number of patches to the core Linux kernel,
  mostly to export new functions, add features to ext3, and add
@@ -35,8 +35,8 @@ Priority: optional
 Depends: module-assistant, bzip2, debhelper (>= 5.0.0), libsnmp-dev, dpatch
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package contains the module source. The client kernel modules
  can be built for kernels from 2.6.18 - 2.6.26 from it using
@@ -49,8 +49,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package provides a number of userspace utilities for
  maintaining Lustre filesystems.
@@ -62,8 +62,8 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from 
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from 
+ http://wiki.whamcloud.com/
  .
  This package provides a number of test utilities for the Lustre filesystem.
 
@@ -74,8 +74,8 @@ Section: libs
 Depends: ${shlibs:Depends}
 Description: Runtime library for Lustre filesystem utilities
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available
- from http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available
+ http://wiki.whamcloud.com/
  .
  This package provides a shared library that is used by userspace
  applications to  work with Lustre filesystems. It gives a user application
@@ -88,7 +88,6 @@ Description: Runtime library for Lustre filesystem utilities
  Currently, liblustre is still under development and only works on Linux
  (i386 & x86_64, not tested on ia64).
  .
- Please see https://mail.clusterfs.com/wikis/lustre/LibLustreHowTo for details.
 
 Package: lustre-dev
 Section: libdevel
@@ -97,7 +96,7 @@ Architecture: i386 powerpc amd64 ia64
 Depends: lustre-utils (= ${binary:Version})
 Description: Development files for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
- It is maintained by Sun Microsystems, Inc. and available from
- http://www.lustre.org
+ This release is maintained by Whamcloud, Inc. and available from
+ http://wiki.whamcloud.com/
  .
  This package provides development libraries for the Lustre filesystem.

diff --git a/lustre.spec.in b/lustre.spec.in
index c81e335..ab88d85 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -55,7 +55,7 @@ Release: %{fullrelease}
 License: GPL
 Group: Utilities/System
 Source: lustre-%{version}.tar.gz
-URL: http://www.sun.com/software/products/lustre/index.xml
+URL: http://wiki.whamcloud.com/
 BuildRoot: %{_tmppath}/lustre-%{version}-root
 Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
 Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
@@ -302,13 +302,27 @@ if [ -x /sbin/weak-modules ]; then
         /sbin/weak-modules --add-modules
 fi
 
-cat <<EOF
-Congratulations on finishing your Lustre installation!  To register
-your copy of Lustre and find out more about Lustre Support, Service,
-and Training offerings please visit
-
-http://www.sun.com/software/products/lustre/lustre_reg.jsp
-EOF
+# for update from < v1.4.6
+
+for f in /etc/modules.conf /etc/modprobe.conf /etc/modprobe.conf.local ; 
+do
+       if [ -f $f ]; then
+               if grep 'lustre llite' $f >/dev/null 2>/dev/null ; then
+                       [ ! -f $f.rpmsave ] && cp $f $f.rpmsave
+                       TMPFILE=`mktemp $f.XXXXXX` && \
+                       rm -f $TMPFILE && touch $TMPFILE && \
+                       grep -v 'lustre llite' $f >> $TMPFILE && \
+                       mv $TMPFILE $f
+               fi
+               if egrep "^[^#]*(add below|install) ptlrpc" $f ; then
+                       [ ! -f $f.rpmsave ] && cp $f $f.rpmsave
+                       TMPFILE=`mktemp $f.XXXXXX` && \
+                       rm -f $TMPFILE && touch $TMPFILE && \
+                       sed -e "s/^[^#]*\(add below\|install\) ptlrpc.*/#&/" $f >> $TMPFILE && \
+                       mv $TMPFILE $f
+               fi
+       fi
+done
 
 # If the kernel was built to reject unsupported modules (e.g. not a Lustre
 # kernel), and this hasn't been overridden in /etc/modprobe.d yet, then