Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0ac651efc1d7f20e182c8dfd117249370a09fc41)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <jblosser-smgl AT firinn.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0ac651efc1d7f20e182c8dfd117249370a09fc41)
  • Date: Thu, 25 Jan 2007 19:02:06 -0600

On Jan 25, Thomas Orgis [scm AT mail.sourcemage.org] wrote:
> GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
>
> disk/autofs/BUILD | 4 +++-
> disk/autofs/DEPENDS | 4 ++--
> disk/autofs/HISTORY | 8 ++++++++
> disk/autofs/INSTALL | 4 +++-
> 4 files changed, 16 insertions(+), 4 deletions(-)
>
> New commits:
> commit 16474ae0488712dce54017b5f89db1489111f5e3
> Author: Thomas Orgis <sobukus AT sourcemage.org>
> Commit: Thomas Orgis <sobukus AT sourcemage.org>
>
> Badly needed fixing for autofs - it crapped up /etc (including
> overwriting configs!!!!!) and the depend on openldap didn't work as opt-out.

Does this need to make it into 0.6?

> diff --git a/disk/autofs/BUILD b/disk/autofs/BUILD
> index cb8f506..3393628 100755
> --- a/disk/autofs/BUILD
> +++ b/disk/autofs/BUILD
> @@ -2,7 +2,9 @@ DEFAULT_CFLAGS="CFLAGS = -O3 -fomit-f
> SA_CFLAGS="CFLAGS = $CFLAGS -Wall" &&
>
> sedit "s/$DEFAULT_CFLAGS/$SA_CFLAGS/" Makefile.rules &&
> -
> +# skip the samples that clobber up /etc
> +#rm -rf samples &&
> +sedit 's/\(SUBDIRS = lib daemon modules man\) samples/\1/' Makefile.rules
> &&
> default_build
> #./configure --build=$BUILD \
> # --prefix=/usr \
> diff --git a/disk/autofs/DEPENDS b/disk/autofs/DEPENDS
> index 16469f4..17f6d87 100755
> --- a/disk/autofs/DEPENDS
> +++ b/disk/autofs/DEPENDS
> @@ -1,6 +1,6 @@
> depends mktemp &&
>
> optional_depends openldap \
> - "" \
> - "" \
> + "--with-openldap" \
> + "--without-openldap" \
> "for ldap support"
> diff --git a/disk/autofs/HISTORY b/disk/autofs/HISTORY
> index 2f101fb..28e7956 100644
> --- a/disk/autofs/HISTORY
> +++ b/disk/autofs/HISTORY
> @@ -1,3 +1,11 @@
> +2007-01-25 Thomas Orgis <sobukus AT sourcemage.org>
> + * BUILD,INSTALL: What happened to this spell?
> + Or better, what didn't? Everything...
> + Now installing some examples as config files and
> + preventing the make install from writing into /etc
> + itself. That also removes the useless /etc/init.d/autofs .
> + * DEPENDS: also be able to _disable_ the openldap dep
> +
> 2006-09-12 David Brown <dmlb2000 AT gmail.com>
> * DETAILS: used gpg verification and version bump 4.1.4
>
> diff --git a/disk/autofs/INSTALL b/disk/autofs/INSTALL
> index c783124..9f862b4 100755
> --- a/disk/autofs/INSTALL
> +++ b/disk/autofs/INSTALL
> @@ -12,6 +12,8 @@ INC="include /etc/modules.d/autofs" &&
> grep -q "$INC" $MOD ||
> echo "$INC" >> $MOD &&
>
> +# together with disabling the samples subdir, we should now
> +# _not_ delete the admin's config on every cast
> for FILE in auto.home auto.master auto.misc
> -do [ -f /etc/$FILE ] || cp $SCRIPT_DIRECTORY/$FILE /etc
> +do install_config_file "$SCRIPT_DIRECTORY/$FILE" "$INSTALL_ROOT/etc/$FILE"
> done
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit

Attachment: pgpw0HFxl5sYA.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page