wok-current rev 24335

updated autofs (5.1.6 -> 5.1.8)
author Hans-G?nter Theisgen
date Fri Jan 28 16:53:40 2022 +0100 (2022-01-28)
parents 21f65cda07b9
children 71360a13cd94
files autofs/receipt autofs/stuff/etc/init.d/autofs
line diff
     1.1 --- a/autofs/receipt	Fri Jan 28 11:07:11 2022 +0000
     1.2 +++ b/autofs/receipt	Fri Jan 28 16:53:40 2022 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="autofs"
     1.7 -VERSION="5.1.6"
     1.8 +VERSION="5.1.8"
     1.9  CATEGORY="system-tools"
    1.10  TAGS="filesystem"
    1.11  SHORT_DESC="Linux automounter."
    1.12 @@ -15,13 +15,15 @@
    1.13  DEPENDS="linux-autofs"
    1.14  BUILD_DEPENDS="cyrus-sasl-dev flex krb5-dev libxml2-dev openldap-dev openssl-dev"
    1.15  
    1.16 +CONFIG_FILES="/etc/autofs.conf"
    1.17 +
    1.18  TAZPANEL_DAEMON="man|help::automount|edit::/etc/auto.misc|options::AUTOMOUNT_OPTIONS|web::$WEB_SITE"
    1.19  
    1.20  # Rules to configure and make the package.
    1.21  compile_rules()
    1.22  {
    1.23 -	sed -i	-e 's|-b --suffix=.orig||' \
    1.24 -		-e 's|install -v|install|' \
    1.25 +	sed -i	-e 's|-b --suffix=.orig||'	\
    1.26 +		-e 's|install -v|install|'	\
    1.27  		*/Makefile*
    1.28  
    1.29  	./configure				\
    1.30 @@ -36,15 +38,17 @@
    1.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.32  genpkg_rules()
    1.33  {
    1.34 +	mkdir -p $fs/etc
    1.35  	mkdir -p $fs/usr
    1.36 -	mkdir -p $fs/etc/init.d
    1.37  
    1.38 +	cp -a $stuff/etc/*	$fs/etc
    1.39 +	# Create empty configuration file
    1.40 +	touch 			$fs/etc/autofs.conf
    1.41 +	cp -a $install/usr/lib	$fs/usr
    1.42  	cp -a $install/usr/sbin	$fs/usr
    1.43 -	cp -a $install/usr/lib	$fs/usr
    1.44 -	cp -a $stuff/etc/*	$fs/etc
    1.45  }
    1.46  
    1.47 -# Pre and post install commands for Tazpkg.
    1.48 +# Post install commands for Tazpkg.
    1.49  post_install()
    1.50  {
    1.51  	mkdir -p "$1/mnt/auto" 2>/dev/null
     2.1 --- a/autofs/stuff/etc/init.d/autofs	Fri Jan 28 11:07:11 2022 +0000
     2.2 +++ b/autofs/stuff/etc/init.d/autofs	Fri Jan 28 16:53:40 2022 +0100
     2.3 @@ -2,55 +2,58 @@
     2.4  # /etc/init.d/autofs : Start, stop and restart automounter on SliTaz, at
     2.5  # boot time or with the command line.
     2.6  #
     2.7 -# To start automounter at boot time, just put dropbear in the $RUN_DAEMONS
     2.8 -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf
     2.9 +# To start automounter at boot time, just put autofs in the $RUN_DAEMONS
    2.10 +# variable of /etc/rcS.conf and configure options in /etc/daemons.conf
    2.11  #
    2.12  . /etc/init.d/rc.functions
    2.13  . /etc/daemons.conf
    2.14  
    2.15 -NAME=Automount
    2.16 +NAME=automount
    2.17  DESC="$(_ '%s server' Automount)"
    2.18  DAEMON=/usr/sbin/automount
    2.19  OPTIONS=$AUTOMOUNT_OPTIONS
    2.20  PIDFILE=/var/run/automount.pid
    2.21  
    2.22  case "$1" in
    2.23 -  start)
    2.24 -    if active_pidfile $PIDFILE automount ; then
    2.25 -      _ '%s is already running.' $NAME
    2.26 -      exit 1
    2.27 -    fi
    2.28 -    action 'Starting %s: %s...' "$DESC" $NAME
    2.29 -    modprobe autofs4
    2.30 -    $DAEMON $OPTIONS
    2.31 -    status
    2.32 -    ;;
    2.33 -  stop)
    2.34 -    if ! active_pidfile $PIDFILE automount ; then
    2.35 -      _ '%s is not running.' $NAME
    2.36 -      exit 1
    2.37 -    fi
    2.38 -    action 'Stopping %s: %s...' "$DESC" $NAME
    2.39 -    kill $(cat $PIDFILE)
    2.40 -    rmmod autofs4
    2.41 -    status
    2.42 -    ;;
    2.43 -  restart)
    2.44 -    if ! active_pidfile $PIDFILE automount ; then
    2.45 -      _ '%s is not running.' $NAME
    2.46 -      exit 1
    2.47 -    fi
    2.48 -    action 'Restarting %s: %s...' "$DESC" $NAME
    2.49 -    kill $(cat $PIDFILE)
    2.50 -    sleep 2
    2.51 -    $DAEMON $OPTIONS
    2.52 -    status
    2.53 -    ;;
    2.54 -  *)
    2.55 -    emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    2.56 -    newline
    2.57 -    exit 1
    2.58 -    ;;
    2.59 +	(start)
    2.60 +		if active_pidfile $PIDFILE automount
    2.61 +		  then
    2.62 +			_ '%s is already running.' $NAME
    2.63 +			exit 1
    2.64 +		fi
    2.65 +		action 'Starting %s: %s...' "$DESC" $NAME
    2.66 +		modprobe autofs4
    2.67 +		$DAEMON --pid-file=$PIDFILE $OPTIONS
    2.68 +		status
    2.69 +		;;
    2.70 +	(stop)
    2.71 +		if ! active_pidfile $PIDFILE automount
    2.72 +		  then
    2.73 +			_ '%s is not running.' $NAME
    2.74 +			exit 1
    2.75 +		fi
    2.76 +		action 'Stopping %s: %s...' "$DESC" $NAME
    2.77 +		kill $(cat $PIDFILE)
    2.78 +		rmmod autofs4
    2.79 +		status
    2.80 +		;;
    2.81 +	(restart)
    2.82 +		if ! active_pidfile $PIDFILE automount
    2.83 +		  then
    2.84 +			_ '%s is not running.' $NAME
    2.85 +			exit 1
    2.86 +		fi
    2.87 +		action 'Restarting %s: %s...' "$DESC" $NAME
    2.88 +		kill $(cat $PIDFILE)
    2.89 +		sleep 2
    2.90 +		$DAEMON --pid-file=$PIDFILE $OPTIONS
    2.91 +		status
    2.92 +		;;
    2.93 +	(*)
    2.94 +		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
    2.95 +		newline
    2.96 +		exit 1
    2.97 +		;;
    2.98  esac
    2.99  
   2.100  exit 0