diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2009-06-04 07:31:26 +0000 |
|---|---|---|
| committer | Luotao Fu <l.fu@pengutronix.de> | 2009-06-04 07:31:26 +0000 |
| commit | b6556d85e17b7c8a8975d19530537a6a6b9a5fcd (patch) | |
| tree | be2c1783ea9d38323a2aa9ba371dd9a6a6262377 /rules | |
| parent | a8e8172c339d22eefe4c6e6110b94f542c4c5bb4 (diff) | |
| download | ptxdist-b6556d85e17b7c8a8975d19530537a6a6b9a5fcd.tar.gz ptxdist-b6556d85e17b7c8a8975d19530537a6a6b9a5fcd.tar.xz | |
* add default sudoer file
* use install_alternative now for targetinstall sudoer and remove
obsolete choice options
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10633 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/sudo.in | 21 | ||||
| -rw-r--r-- | rules/sudo.make | 11 |
2 files changed, 1 insertions, 31 deletions
diff --git a/rules/sudo.in b/rules/sudo.in index a29661907..1e9033caf 100644 --- a/rules/sudo.in +++ b/rules/sudo.in @@ -23,25 +23,4 @@ config SUDO__ETC_SUDOERS help Installs /etc/sudoers from a selectable source - choice - prompt "Kind of sudoers" - default SUDO__ETC_SUDOERS_DEFAULT - depends on SUDO__ETC_SUDOERS - - config SUDO__ETC_SUDOERS_DEFAULT - bool - prompt "Use generic" - help - Installs a generic /etc/sudoers file from the - sources. - - config SUDO__ETC_SUDOERS_USER - bool - prompt "User defined" - help - This uses a user defined /etc/sudoers file. PTXdist - uses file projectroot/etc/sudoers in your local project. - - endchoice - endif diff --git a/rules/sudo.make b/rules/sudo.make index 5fcbe733f..211098d77 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -191,16 +191,7 @@ $(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default) /usr/libexec/sudo_noexec.so) ifdef PTXCONF_SUDO__ETC_SUDOERS -ifdef PTXCONF_SUDO__ETC_SUDOERS_DEFAULT - @$(call install_copy, sudo, 0, 0, 0440, \ - $(SUDO_DIR)/sudoers, \ - /etc/sudoers, n) -endif -ifdef PTXCONF_SUDO__ETC_SUDOERS_USER - @$(call install_copy, sudo, 0, 0, 0440, \ - ${PTXDIST_WORKSPACE}/projectroot/etc/sudoers, \ - /etc/sudoers, n) -endif + @$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n) endif @$(call install_finish, sudo) |