Change the order of the function library check/load. #3464
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FransUrbo
force-pushed
the
fixes.initscripts
branch
8 times, most recently
from
f2afd0e
to
c31e7ff
Compare
* Change the order of the function library check/load. Redhat based system _can_ have a /lib/lsb/init-functions file (from the redhat-lsb-core package), but it's only partially what we can use. Instead, look for that file last, giving the script a chance to catch the 'real' distribution file. * Filter out dashes and dots in dataset name in read_mtab(). * Get rid of 'awk' entirely. This is usually in /usr, which might not be availible. * Get rid of the 'find /dev/disk/by-*' (find is on /usr, which might not be availible). Instead use echo in a for loop. * Rebuild scripts if any of the *.in files changed. * Move the sed part that filters out duplicates inside the check fo valid variable. Signed-off-by: Turbo Fredriksson turbo@bayour.com Closes openzfs#3463 Closes openzfs#3457
|
Merged as: 4f38c25 SYSV init script fixes. |
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Nov 4, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Nov 6, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Nov 12, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Nov 21, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Dec 10, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Conflicts during rebase on December 9th 2015 in include/sys/dsl_dataset.h due to openzfs@241b541 (Illumos 5959 - clean up per-dataset feature count code) Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Dec 11, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Conflicts during rebase on December 9th 2015 in include/sys/dsl_dataset.h due to openzfs@241b541 (Illumos 5959 - clean up per-dataset feature count code) Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Dec 12, 2015
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Conflicts during rebase on December 9th 2015 in include/sys/dsl_dataset.h due to openzfs@241b541 (Illumos 5959 - clean up per-dataset feature count code) Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Jan 6, 2016
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Conflicts during rebase on December 9th 2015 in include/sys/dsl_dataset.h due to openzfs@241b541 (Illumos 5959 - clean up per-dataset feature count code) Ported-by: kernelOfTruth kerneloftruth@gmail.com
kernelOfTruth
pushed a commit
to kernelOfTruth/zfs
that referenced
this pull request
Jan 10, 2016
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 dsl_prop_unregister() slows down dataset eviction. illumos/illumos-gate@03bad06#diff-832418f8bef771ab321cc8bca7235e4dL297 Porting notes: Notable changes from upstream are caused by the following commits: openzfs@3558fd7 Prototype/structure update for Linux openzfs@2cf7f52 Linux compat 2.6.39: mount_nodev() openzfs@13fe019 Illumos openzfs#3464 Fix compilation error: dsl_prop.c:1211:15: error: ‘dsl_prop_unregister’ undeclared here (not in a function) EXPORT_SYMBOL(dsl_prop_unregister); Replacing EXPORT_SYMBOL(dsl_prop_unregister); with EXPORT_SYMBOL(dsl_prop_unregister_all); Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Conflicts during rebase on December 9th 2015 in include/sys/dsl_dataset.h due to openzfs@241b541 (Illumos 5959 - clean up per-dataset feature count code) Ported-by: kernelOfTruth kerneloftruth@gmail.com
behlendorf
pushed a commit
to behlendorf/zfs
that referenced
this pull request
Jan 12, 2016
6171 dsl_prop_unregister() slows down dataset eviction. Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 illumos/illumos-gate@03bad06 Porting notes: - Conflicts - 3558fd7 Prototype/structure update for Linux - 2cf7f52 Linux compat 2.6.39: mount_nodev() - 13fe019 Illumos openzfs#3464 - 241b541 Illumos 5959 - clean up per-dataset feature count code - dsl_prop_unregister() preserved until out of tree consumers like Lustre can transition to dsl_prop_unregister_all(). - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
goulvenriou
pushed a commit
to Alyseo/zfs
that referenced
this pull request
Jan 17, 2016
6171 dsl_prop_unregister() slows down dataset eviction. Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 illumos/illumos-gate@03bad06 Porting notes: - Conflicts - 3558fd7 Prototype/structure update for Linux - 2cf7f52 Linux compat 2.6.39: mount_nodev() - 13fe019 Illumos openzfs#3464 - 241b541 Illumos 5959 - clean up per-dataset feature count code - dsl_prop_unregister() preserved until out of tree consumers like Lustre can transition to dsl_prop_unregister_all(). - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
goulvenriou
pushed a commit
to Alyseo/zfs
that referenced
this pull request
Feb 4, 2016
6171 dsl_prop_unregister() slows down dataset eviction. Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/6171 illumos/illumos-gate@03bad06 Porting notes: - Conflicts - 3558fd7 Prototype/structure update for Linux - 2cf7f52 Linux compat 2.6.39: mount_nodev() - 13fe019 Illumos openzfs#3464 - 241b541 Illumos 5959 - clean up per-dataset feature count code - dsl_prop_unregister() preserved until out of tree consumers like Lustre can transition to dsl_prop_unregister_all(). - Fixing 'space or tab at end of line' in include/sys/dsl_dataset.h Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Redhat based system can have a /lib/lsb/init-functions file (from
the redhat-lsb-core package), but it's only partially what we can use.
Instead, look for that file last, giving the script a chance to catch
the 'real' distribution file.
Signed-off-by: Turbo Fredriksson turbo@bayour.com
Closes #3463