Changeset 1914


Ignore:
Timestamp:
Jun 21, 2011, 5:24:37 PM (11 years ago)
Author:
achernya
Message:
Restore openafs-localcsdb.patch

Mitch points out that the localcsdb patch was just Scripts
configuration, and not actually relevant to the Scripts AFS patch.
Therefore, the patch has been brought back, split out into a separte
file as it was before.
Location:
branches/fc15-dev/server
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/common/patches/openafs-localcsdb.patch

  • branches/fc15-dev/server/common/patches/openafs-scripts.patch

    r1913 r1914  
    270270     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
    271271        return EIO;             /* Inappropriate ioctl for device */
    272 diff --git a/src/packaging/RedHat/openafs-client.init b/src/packaging/RedHat/openafs-client.init
    273 index 10ec647..a4ecbc8 100644
    274 --- a/src/packaging/RedHat/openafs-client.init
    275 +++ b/src/packaging/RedHat/openafs-client.init
    276 @@ -14,7 +14,7 @@
    277  
    278  start() {
    279          echo -n $"Updating CellServDB: "
    280 -        cat /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist > \
    281 +        cat /usr/vice/etc/CellServDB.local > \
    282                 /usr/vice/etc/CellServDB
    283          chmod 644 /usr/vice/etc/CellServDB
    284          echo
  • branches/fc15-dev/server/fedora/specs/openafs.spec.patch

    r1913 r1914  
    11--- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
    2 +++ openafs.spec        2011-06-20 17:45:49.000000000 -0400
     2+++ openafs.spec        2011-06-21 17:15:24.000000000 -0400
    33@@ -4,7 +4,7 @@
    44 %define pkgvers 1.6.0
     
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -247,6 +247,8 @@
     12@@ -247,6 +247,9 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
     17+Patch1001: openafs-localcsdb.patch
    1718+
    1819 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    1920 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2021 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    21 @@ -326,6 +328,7 @@
     22@@ -326,6 +329,7 @@
    2223 %if %{build_userspace}
    2324 
     
    2728 
    2829 %if %{fedorakmod}
    29 @@ -386,6 +389,7 @@
     30@@ -386,6 +390,7 @@
    3031 
    3132 %if %{build_authlibs}
     
    3536 Group: Networking/Filesystems
    3637 
    37 @@ -402,6 +406,7 @@
     38@@ -402,6 +407,7 @@
    3839 %endif
    3940 
     
    4344 Requires: openafs-authlibs = %{version}
    4445 %endif
    45 @@ -420,6 +425,7 @@
     46@@ -420,6 +426,7 @@
    4647 libraries.
    4748 
     
    5152 Group: Development/Filesystems
    5253 
    53 @@ -448,6 +454,7 @@
     54@@ -448,6 +455,7 @@
    5455 administrators.
    5556 
     
    5960 Group: Networking/Filesystems
    6061 Provides: openafs-kernel = %{version}
    61 @@ -497,6 +504,7 @@
     62@@ -497,6 +505,7 @@
    6263 
    6364 %if %{krb5support}
     
    6768 Requires: openafs = %{version}
    6869 Group: Networking/Filesystems
    69 @@ -523,7 +531,7 @@
     70@@ -523,7 +532,7 @@
    7071 %if %{build_modules}
    7172 
     
    7677 %else
    7778 
    78 @@ -680,6 +688,9 @@
     79@@ -680,6 +689,10 @@
    7980 #%setup -q -n %{srcdir}
    8081 %setup -q -b 1 -n %{srcdir}
     
    8283+# Apply the Scripts patch
    8384+%patch1000 -p1 -b .scripts
     85+%patch1001 -p1 -b .localcsdb
    8486+
    8587 ##############################################################################
    8688 #
    8789 # building
    88 @@ -1215,6 +1226,13 @@
     90@@ -1215,6 +1228,13 @@
    8991 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    9092 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset for help on using the changeset viewer.