1From 492c65a32a4ae44c34580ed8ac5d3f50a155cfef Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 11 Apr 2012 14:36:02 +0200
4Subject: [PATCH] use own functions file instead /etc/init.d/functions
5
6* so we don't have to depend on initscripts
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9
10---
11Upstream-Status: Pending
12
13 Makefile             |  1 +
14 X11/Xinit.d/11zaurus |  2 +-
15 X11/Xinit.d/12keymap |  2 +-
16 X11/functions        | 11 +++++++++++
17 X11/xserver-common   |  2 +-
18 5 files changed, 15 insertions(+), 3 deletions(-)
19 create mode 100644 X11/functions
20
21diff --git a/Makefile b/Makefile
22index e2d9af9..caa5de1 100644
23--- a/Makefile
24+++ b/Makefile
25@@ -23,6 +23,7 @@ install-program:
26 	install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver
27 	install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession
28 	install -m 755 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common
29+	install -m 755 X11/functions $(DESTDIR)/etc/X11/functions
30 	install -d $(DESTDIR)/etc/X11/xmodmap
31 	install -m 644 X11/xmodmap/*.xmodmap $(DESTDIR)/etc/X11/xmodmap
32 	install -m 644 X11/xmodmap/xmodmap-* $(DESTDIR)/etc/X11/xmodmap
33diff --git a/X11/Xinit.d/11zaurus b/X11/Xinit.d/11zaurus
34index 54ea6f5..23e7713 100644
35--- a/X11/Xinit.d/11zaurus
36+++ b/X11/Xinit.d/11zaurus
37@@ -8,7 +8,7 @@ else
38    CHCK=chkhinge
39 fi
40
41-. /etc/init.d/functions
42+. /etc/X11/functions
43
44 $CHCK -e
45 if [ $? = 12 ]; then
46diff --git a/X11/Xinit.d/12keymap b/X11/Xinit.d/12keymap
47index 7eac296..b7a7f2d 100644
48--- a/X11/Xinit.d/12keymap
49+++ b/X11/Xinit.d/12keymap
50@@ -1,6 +1,6 @@
51 #!/bin/sh
52
53-. /etc/init.d/functions
54+. /etc/X11/functions
55
56 # since kdrive 1.4 there is no default keymap in server
57 xmodmap - </etc/X11/xmodmap/default.xmodmap
58diff --git a/X11/functions b/X11/functions
59new file mode 100644
60index 0000000..a1311ad
61--- /dev/null
62+++ b/X11/functions
63@@ -0,0 +1,11 @@
64+# -*-Shell-script-*-
65+#
66+# functions     This file contains functions shared by few X11 scripts
67+#               machine_id also exists in /etc/init.d/functions but some
68+#               people don't use initscripts anymore
69+#
70+
71+machine_id() { # return the machine ID
72+	awk 'BEGIN { FS=": " } /Hardware/ \
73+		{ gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
74+}
75diff --git a/X11/xserver-common b/X11/xserver-common
76index bb7c2ff..d622f2a 100644
77--- a/X11/xserver-common
78+++ b/X11/xserver-common
79@@ -30,7 +30,7 @@ if [ -f /etc/profile ]; then
80   . /etc/profile
81 fi
82
83-. /etc/init.d/functions
84+. /etc/X11/functions
85
86 fallback_screen_arg() {
87     geom=`fbset | grep geometry`
88