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