c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-27 04:32:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

SYSV init script fixes.

Browse Source 
* 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
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3463
Closes #3457
This commit is contained in:
Turbo Fredriksson
2015-06-02 16:02:31 +02:00
committed by Brian Behlendorf
parent 2a34db1bdb
commit 4f38c25910
4 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/init.d/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@ EXTRA_DIST = \
$(top_srcdir)/etc/init.d/zfs-zed.in \
$(top_srcdir)/etc/init.d/zfs.in
$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):
$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
-(if [ -e /etc/debian_version ]; then \
NFS_SRV=nfs-kernel-server; \
else \