diff options
| author | Thomas Orgis | 2007-01-25 21:58:09 +0100 |
|---|---|---|
| committer | Jeremy Blosser | 2007-01-27 19:10:02 -0600 |
| commit | 1c817af4d60990104cba71919ca46c3c6350c987 (patch) | |
| tree | 4d9dfccfdfe71cfda05eeab0cc3b2ee4cd3a8814 | |
| parent | c5776d1b5f53aab1c360ac102a2506754a1f0a05 (diff) | |
Badly needed fixing for autofs - it crapped up /etc (including overwriting configs!!!!!) and the depend on openldap didn't work as opt-out.stable-rc-0.6
| -rwxr-xr-x | disk/autofs/BUILD | 4 | ||||
| -rwxr-xr-x | disk/autofs/DEPENDS | 4 | ||||
| -rw-r--r-- | disk/autofs/HISTORY | 8 | ||||
| -rwxr-xr-x | disk/autofs/INSTALL | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/disk/autofs/BUILD b/disk/autofs/BUILD index cb8f5063b5..339362814c 100755 --- a/disk/autofs/BUILD +++ b/disk/autofs/BUILD @@ -2,7 +2,9 @@ DEFAULT_CFLAGS="CFLAGS = -O3 -fomit-frame-pointer -Wall" && 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 16469f4aee..17f6d87a0c 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 2f101fb37a..28e7956648 100644 --- a/disk/autofs/HISTORY +++ b/disk/autofs/HISTORY @@ -1,3 +1,11 @@ +2007-01-25 Thomas Orgis <sobukus@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@gmail.com> * DETAILS: used gpg verification and version bump 4.1.4 diff --git a/disk/autofs/INSTALL b/disk/autofs/INSTALL index c7831242ae..9f862b4089 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 |