[oe-commits] org.oe.dev autofs: Fix funky (and unnecessary) sort option in the auto.net script,

[mwester commit]

autofs: Fix funky (and unnecessary) sort option in the auto.net script,
 and add support for SlugOS to the init.d/autofs script.

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 76f8829bf251437359713bbc14c5fc611c381a32
ViewMTN: http://monotone.openembedded.org/revision.psp?id=76f8829bf251437359713bbc14c5fc611c381a32
Files:
1
packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch
packages/autofs/autofs-4.1.4/autofs-additional-distros.patch
packages/autofs/autofs_4.1.4.bb
Diffs:

#
# mt diff -r4a5b00f511d02ef1498484590431dfdf983ba1a0 -r76f8829bf251437359713bbc14c5fc611c381a32
#
# 
# 
# add_file "packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch"
#  content [5070e7236e1a2aa5fb95155f727c15f57101f898]
# 
# add_file "packages/autofs/autofs-4.1.4/autofs-additional-distros.patch"
#  content [de13e6445a3f363848852124d3f39c09c71e0919]
# 
# patch "packages/autofs/autofs_4.1.4.bb"
#  from [95c14e9b4061cabd8e0071b1df19b7e1f41828cd]
#    to [a424c6e4fee37df1589d0181c14420a3bc3267c2]
# 
============================================================
--- packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch	5070e7236e1a2aa5fb95155f727c15f57101f898
+++ packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch	5070e7236e1a2aa5fb95155f727c15f57101f898
@@ -0,0 +1,11 @@
+--- autofs-4.1.4/samples/auto.net~	2005-04-05 08:02:09.000000000 -0500
++++ autofs-4.1.4/samples/auto.net	2007-04-07 14:41:19.000000000 -0500
+@@ -37,7 +37,7 @@
+ # Newer distributions get this right
+ SHOWMOUNT="$SMNT --no-headers -e $key"
+ 
+-$SHOWMOUNT | LC_ALL=C sort +0 | \
++$SHOWMOUNT | LC_ALL=C sort | \
+ 	awk -v key="$key" -v opts="$opts" -- '
+ 	BEGIN	{ ORS=""; first=1 }
+ 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
============================================================
--- packages/autofs/autofs-4.1.4/autofs-additional-distros.patch	de13e6445a3f363848852124d3f39c09c71e0919
+++ packages/autofs/autofs-4.1.4/autofs-additional-distros.patch	de13e6445a3f363848852124d3f39c09c71e0919
@@ -0,0 +1,12 @@
+--- autofs-4.1.4/samples/rc.autofs.in~	2005-04-11 06:30:54.000000000 -0500
++++ autofs-4.1.4/samples/rc.autofs.in	2007-04-07 13:18:44.000000000 -0500
+@@ -43,6 +43,9 @@
+ 	system=debian
+ elif [ -f /etc/redhat-release ]; then
+ 	system=redhat
++elif [ -f /etc/issue ] && grep -q "^SlugOS" /etc/issue ; then
++	# SlugOS behaves like Debian, at least for autofs purposes.
++	system=debian
+ else
+ 	echo "$0: Unknown system, please port and contact autofs at linux.kernel.org" 1>&2
+ 	exit 1
============================================================
--- packages/autofs/autofs_4.1.4.bb	95c14e9b4061cabd8e0071b1df19b7e1f41828cd
+++ packages/autofs/autofs_4.1.4.bb	a424c6e4fee37df1589d0181c14420a3bc3267c2
@@ -1,14 +1,18 @@ LICENSE = "GPL"
 DESCRIPTION = "Kernel based automounter for linux."
 SECTION = "base"
 LICENSE = "GPL"
 
+PR = "r1"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \
            file://cross.patch;patch=1 \
            file://Makefile.rules-cross.patch;patch=1 \
-	   file://install.patch;patch=1"
+	   file://install.patch;patch=1 \
+	   file://auto.net-sort-option-fix.patch;patch=1 \
+	   file://autofs-additional-distros.patch;patch=1"
 
 inherit autotools