* [gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs5.initd
@ 2011-04-03 17:55 Peter Volkov (pva)
0 siblings, 0 replies; 2+ messages in thread
From: Peter Volkov (pva) @ 2011-04-03 17:55 UTC (permalink / raw
To: gentoo-commits
pva 11/04/03 17:55:17
Modified: autofs5.initd
Log:
Use proper if-logic in autofs.initd, bug #361787, thank Piotr Mitas for report Dustin Polke for fix
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Revision Changes Path
1.2 net-fs/autofs/files/autofs5.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?r1=1.1&r2=1.2
Index: autofs5.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs5.initd 3 Apr 2011 09:49:15 -0000 1.1
+++ autofs5.initd 3 Apr 2011 17:55:17 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.1 2011/04/03 09:49:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.2 2011/04/03 17:55:17 pva Exp $
DAEMON=/usr/sbin/automount
PIDFILE=/var/run/autofs.pid
@@ -29,18 +29,20 @@
sleep 1
if [ -e "/proc/misc" ]; then
MINOR=$(awk "/${DEVICE}/ {print \$1}" /proc/misc)
- [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ] && \
+ if [ -n "${MINOR}" -a ! -c "/dev/${DEVICE}" ]; then
mknod -m 0600 "/dev/${DEVICE}" c 10 ${MINOR}
- if [ $? -ne 0 ]; then
- eend 1 "Could not create '/dev/${DEVICE}'"
- return 1
+ if [ $? -ne 0 ]; then
+ eend 1 "Could not create '/dev/${DEVICE}'"
+ return 1
+ fi
fi
fi
- [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ] && \
+ if [ -x /sbin/restorecon -a -c "/dev/${DEVICE}" ]; then
/sbin/restorecon "/dev/${DEVICE}"
- if [ $? -ne 0 ]; then
- eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'"
- return 1
+ if [ $? -ne 0 ]; then
+ eend 1 "Failed to execute '/sbin/restorecon \"/dev/${DEVICE}\"'"
+ return 1
+ fi
fi
else
[ -c "/dev/${DEVICE}" ] && rm -rf "/dev/${DEVICE}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs5.initd
@ 2013-11-10 15:53 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-11-10 15:53 UTC (permalink / raw
To: gentoo-commits
tomwij 13/11/10 15:53:29
Modified: autofs5.initd
Log:
Fix up bashism in the init script, proxied commit for Dennis 'dlan' Lan
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.4 net-fs/autofs/files/autofs5.initd
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs5.initd?r1=1.3&r2=1.4
Index: autofs5.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autofs5.initd 5 Oct 2011 14:27:26 -0000 1.3
+++ autofs5.initd 10 Nov 2013 15:53:29 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.3 2011/10/05 14:27:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.initd,v 1.4 2013/11/10 15:53:29 tomwij Exp $
DAEMON=/usr/sbin/automount
PIDFILE=/var/run/autofs.pid
@@ -64,7 +64,7 @@
if [ ! -r "${PIDFILE}" ]; then
eend 1 "automount not running"
else
- kill -HUP $(cat "${PIDFILE}") 2> /dev/null
+ kill -s HUP $(cat "${PIDFILE}") 2> /dev/null
eend $?
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-10 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-03 17:55 [gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs5.initd Peter Volkov (pva)
-- strict thread matches above, loose matches on Subject: below --
2013-11-10 15:53 Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox