diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-04 13:46:20 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-04 17:17:26 -0800 |
| commit | 936fdc7b68335a32b6c29df774044d46d46ff2ca (patch) | |
| tree | 70e1aeed1c214c904005c847ef8cca236152d79a /pkgs/servers/samba/4.x-no-persistent-install.patch | |
| parent | e15cd2375e534ae31c85962210ecb88630ff5f0a (diff) | |
| download | nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.gz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.bz2 nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.lz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.xz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.zst nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.zip | |
samba4: 4.1.17 -> 4.2.0 YOLO
Diffstat (limited to 'pkgs/servers/samba/4.x-no-persistent-install.patch')
| -rw-r--r-- | pkgs/servers/samba/4.x-no-persistent-install.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch index 68d0cf76aa55..c3e013f7862b 100644 --- a/pkgs/servers/samba/4.x-no-persistent-install.patch +++ b/pkgs/servers/samba/4.x-no-persistent-install.patch @@ -16,3 +16,45 @@ index aa4e66e..d53f433 100755 # these might be on non persistent storage - bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") + #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}") +diff --git a/ctdb/wscript b/ctdb/wscript +index 3e2a992..1b93a4d 100755 +--- a/ctdb/wscript ++++ b/ctdb/wscript +@@ -473,10 +473,10 @@ def build(bld): + for t in etc_subdirs: + files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir) + for fmode in files: +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0], ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0], + destname=fmode[0], chmod=fmode[1]) + +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions', + destname='functions') + + etc_scripts = [ +@@ -489,18 +489,18 @@ def build(bld): + ] + + for t in etc_scripts: +- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t, ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t, + destname=t, chmod=0755) + +- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers', + destname='ctdb') + +- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', ++ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README', + destname='README') + +- bld.install_dir(bld.env.CTDB_LOGDIR) +- bld.install_dir(bld.env.CTDB_RUNDIR) +- bld.install_dir(bld.env.CTDB_VARDIR) ++ #bld.install_dir(bld.env.CTDB_LOGDIR) ++ #bld.install_dir(bld.env.CTDB_RUNDIR) ++ #bld.install_dir(bld.env.CTDB_VARDIR) + + sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION + t = bld.SAMBA_GENERATOR('ctdb-pc', |