# HG changeset patch # User Hans-G?nter Theisgen # Date 1643385220 -3600 # Node ID 6f4496f6c83c2bfe757715d83b83bf18f6b02035 # Parent 21f65cda07b99dc19f0b09bc4ba0595559a94c59 updated autofs (5.1.6 -> 5.1.8) diff -r 21f65cda07b9 -r 6f4496f6c83c autofs/receipt --- a/autofs/receipt Fri Jan 28 11:07:11 2022 +0000 +++ b/autofs/receipt Fri Jan 28 16:53:40 2022 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="autofs" -VERSION="5.1.6" +VERSION="5.1.8" CATEGORY="system-tools" TAGS="filesystem" SHORT_DESC="Linux automounter." @@ -15,13 +15,15 @@ DEPENDS="linux-autofs" BUILD_DEPENDS="cyrus-sasl-dev flex krb5-dev libxml2-dev openldap-dev openssl-dev" +CONFIG_FILES="/etc/autofs.conf" + TAZPANEL_DAEMON="man|help::automount|edit::/etc/auto.misc|options::AUTOMOUNT_OPTIONS|web::$WEB_SITE" # Rules to configure and make the package. compile_rules() { - sed -i -e 's|-b --suffix=.orig||' \ - -e 's|install -v|install|' \ + sed -i -e 's|-b --suffix=.orig||' \ + -e 's|install -v|install|' \ */Makefile* ./configure \ @@ -36,15 +38,17 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { + mkdir -p $fs/etc mkdir -p $fs/usr - mkdir -p $fs/etc/init.d + cp -a $stuff/etc/* $fs/etc + # Create empty configuration file + touch $fs/etc/autofs.conf + cp -a $install/usr/lib $fs/usr cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $stuff/etc/* $fs/etc } -# Pre and post install commands for Tazpkg. +# Post install commands for Tazpkg. post_install() { mkdir -p "$1/mnt/auto" 2>/dev/null diff -r 21f65cda07b9 -r 6f4496f6c83c autofs/stuff/etc/init.d/autofs --- a/autofs/stuff/etc/init.d/autofs Fri Jan 28 11:07:11 2022 +0000 +++ b/autofs/stuff/etc/init.d/autofs Fri Jan 28 16:53:40 2022 +0100 @@ -2,55 +2,58 @@ # /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at # boot time or with the command line. # -# To start automounter at boot time, just put dropbear in the $RUN_DAEMONS -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf +# To start automounter at boot time, just put autofs in the $RUN_DAEMONS +# variable of /etc/rcS.conf and configure options in /etc/daemons.conf # . /etc/init.d/rc.functions . /etc/daemons.conf -NAME=Automount +NAME=automount DESC="$(_ '%s server' Automount)" DAEMON=/usr/sbin/automount OPTIONS=$AUTOMOUNT_OPTIONS PIDFILE=/var/run/automount.pid case "$1" in - start) - if active_pidfile $PIDFILE automount ; then - _ '%s is already running.' $NAME - exit 1 - fi - action 'Starting %s: %s...' "$DESC" $NAME - modprobe autofs4 - $DAEMON $OPTIONS - status - ;; - stop) - if ! active_pidfile $PIDFILE automount ; then - _ '%s is not running.' $NAME - exit 1 - fi - action 'Stopping %s: %s...' "$DESC" $NAME - kill $(cat $PIDFILE) - rmmod autofs4 - status - ;; - restart) - if ! active_pidfile $PIDFILE automount ; then - _ '%s is not running.' $NAME - exit 1 - fi - action 'Restarting %s: %s...' "$DESC" $NAME - kill $(cat $PIDFILE) - sleep 2 - $DAEMON $OPTIONS - status - ;; - *) - emsg "$(_ 'Usage:') $0 [start|stop|restart]" - newline - exit 1 - ;; + (start) + if active_pidfile $PIDFILE automount + then + _ '%s is already running.' $NAME + exit 1 + fi + action 'Starting %s: %s...' "$DESC" $NAME + modprobe autofs4 + $DAEMON --pid-file=$PIDFILE $OPTIONS + status + ;; + (stop) + if ! active_pidfile $PIDFILE automount + then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Stopping %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + rmmod autofs4 + status + ;; + (restart) + if ! active_pidfile $PIDFILE automount + then + _ '%s is not running.' $NAME + exit 1 + fi + action 'Restarting %s: %s...' "$DESC" $NAME + kill $(cat $PIDFILE) + sleep 2 + $DAEMON --pid-file=$PIDFILE $OPTIONS + status + ;; + (*) + emsg "$(_ 'Usage:') $0 [start|stop|restart]" + newline + exit 1 + ;; esac exit 0