diff options
| author | Carsten Schlote <c.schlote@konzeptpark.de> | 2010-04-26 13:42:45 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-05-03 16:33:16 +0200 |
| commit | 0d9d6d6fadc9436a22bb45d04542810043357479 (patch) | |
| tree | 44457d8aa748cd43822a85a1e56bf5e4d5472501 | |
| parent | ee3add0b1030016c9e0f77231eba424ae15dfbcc (diff) | |
| download | ptxdist-0d9d6d6fadc9436a22bb45d04542810043357479.tar.gz ptxdist-0d9d6d6fadc9436a22bb45d04542810043357479.tar.xz | |
[sudo] removed __ from kconfig options and use better names for them
Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
[mkl: split into several patches, add migration helper]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/sudo.in | 4 | ||||
| -rw-r--r-- | rules/sudo.make | 4 | ||||
| -rwxr-xr-x | scripts/migrate/migrate_ptx | 8 |
3 files changed, 12 insertions, 4 deletions
diff --git a/rules/sudo.in b/rules/sudo.in index 1e9033caf..58a3c1a37 100644 --- a/rules/sudo.in +++ b/rules/sudo.in @@ -11,13 +11,13 @@ menuconfig SUDO if SUDO -config SUDO__SENDMAIL +config SUDO_USE_SENDMAIL bool # FIXME: sendmail support is buggy and searches for # /sbin/sendmail on the host #prompt "sendmail support" -config SUDO__ETC_SUDOERS +config SUDO_INSTALL_ETC_SUDOERS bool "Install sudoers file into /etc" default y help diff --git a/rules/sudo.make b/rules/sudo.make index fe59d4328..4947d0db4 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -61,7 +61,7 @@ SUDO_AUTOCONF = \ --with-ignore-dot \ --without-pam -ifdef PTXCONF_SUDO__SENDMAIL +ifdef PTXCONF_SUDO_USE_SENDMAIL SUDO_AUTOCONF += --with-sendmail else SUDO_AUTOCONF += --without-sendmail @@ -137,7 +137,7 @@ $(STATEDIR)/sudo.targetinstall: @$(call install_copy, sudo, 0, 0, 0755, -, \ /usr/libexec/sudo_noexec.so) -ifdef PTXCONF_SUDO__ETC_SUDOERS +ifdef PTXCONF_SUDO_INSTALL_ETC_SUDOERS @$(call install_alternative, sudo, 0, 0, 0440, /etc/sudoers, n) endif @$(call install_finish, sudo) diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx index 737f1fd3a..c6ac3e1da 100755 --- a/scripts/migrate/migrate_ptx +++ b/scripts/migrate/migrate_ptx @@ -91,3 +91,11 @@ s/^\(\(# \)\?PTXCONF_LIBPCRE_\)_\(.*$\)/\1\3/ # reason : typo # s/^\(\(# \)\?PTXCONF_INETUTILS_SYSLOGD\)\(_STARTSRCIPT$\)/\1_STARTSCRIPT + +# +# symbol : SUDO__SENDMAIL -> SUDO_USE_SENDMAIL +# symbol : SUDO__ETC_SUDOERS -> SUDO_INSTALL_ETC_SUDOERS +# reason : consolidation of config symbols +# +s/^\(\(# \)\?PTXCONF_SUDO_\)_\(SENDMAIL\)/\1USE_\3/ +s/^\(\(# \)\?PTXCONF_SUDO_\)_\(ETC_SUDOERS\)/\1INSTALL_\3/ |