From 14e33241ab6665b90f1abd6df72cbbdaddf46c67 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Mon, 17 Jun 2013 13:36:08 +0300 Subject: [PATCH] port-ipa-client-automount.diff: Patch i-c-a so it works on Debian. --- debian/changelog | 1 + debian/patches/port-ipa-client-automount.diff | 26 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/port-ipa-client-automount.diff diff --git a/debian/changelog b/debian/changelog index 7010bca4e..7bd8f69bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ freeipa (3.2.0-1) UNRELEASED; urgency=low * fix-ntpdate-opts.diff: Drop -U from nptdate opts, we don't have that. * Add support for Debian platform. + * port-ipa-client-automount.diff: Patch i-c-a so it works on Debian. [ Nick Hatch ] * Added three patches diff --git a/debian/patches/port-ipa-client-automount.diff b/debian/patches/port-ipa-client-automount.diff new file mode 100644 index 000000000..e4ca2f913 --- /dev/null +++ b/debian/patches/port-ipa-client-automount.diff @@ -0,0 +1,26 @@ +diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount +index 3952642..e7b843e 100755 +--- a/ipa-client/ipa-install/ipa-client-automount ++++ b/ipa-client/ipa-install/ipa-client-automount +@@ -39,10 +39,10 @@ from ipapython.ipa_log_manager import * + from ipapython.dn import DN + from ipapython import services as ipaservices + +-AUTOFS_CONF = '/etc/sysconfig/autofs' ++AUTOFS_CONF = '/etc/default/autofs' + NSSWITCH_CONF = '/etc/nsswitch.conf' + AUTOFS_LDAP_AUTH = '/etc/autofs_ldap_auth.conf' +-NFS_CONF = '/etc/sysconfig/nfs' ++NFS_CONF = '/etc/default/nfs-common' + IDMAPD_CONF = '/etc/idmapd.conf' + + def parse_options(): +@@ -309,7 +309,7 @@ def configure_nfs(fstore, statestore): + Configure secure NFS + """ + replacevars = { +- 'SECURE_NFS': 'yes', ++ 'NEED_GSSD': 'yes', + } + ipautil.backup_config_and_replace_variables(fstore, + NFS_CONF, replacevars=replacevars) diff --git a/debian/patches/series b/debian/patches/series index 74629e6c2..78391ee61 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ fix-symlink-exclusion.diff fix-ldap-conf-path.diff check-dbus-before-starting.diff add-debian-platform.diff +port-ipa-client-automount.diff