From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <D.Pynkin@sam-solutions.net>
From: Denis Pynkin <d.pynkin@sam-solutions.net>
To: ALT Linux Sisyphus discussion list <sisyphus@lists.altlinux.org>
Subject: Re: [sisyphus] =?koi8-r?b?7sHT1NLPysvBIHhvcmcuY29uZiDX?= LiveCD
Date: Mon, 30 Jan 2006 21:05:22 +0200
User-Agent: KMail/1.9
References: <43DE163C.3000401@elan.com.ua> <200601302038.59080.pv@altlinux.ru>
In-Reply-To: <200601302038.59080.pv@altlinux.ru>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_yNm3D/6vCdlQ6gf"
Message-Id: <200601302105.22261.d.pynkin@sam-solutions.net>
X-OriginalArrivalTime: 30 Jan 2006 19:07:50.0035 (UTC)
	FILETIME=[76A15E30:01C625D0]
X-BeenThere: sisyphus@lists.altlinux.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: ALT Linux Sisyphus discussion list <sisyphus@lists.altlinux.org>
List-Id: ALT Linux Sisyphus discussion list <sisyphus.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/sisyphus>
List-Post: <mailto:sisyphus@lists.altlinux.org>
List-Help: <mailto:sisyphus-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/sisyphus>,
	<mailto:sisyphus-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Jan 2006 19:08:07 -0000
Archived-At: <http://lore.altlinux.org/sisyphus/200601302105.22261.d.pynkin@sam-solutions.net/>
List-Archive: <http://lore.altlinux.org/sisyphus/>
List-Post: <mailto:sisyphus@altlinux.ru>

--Boundary-00=_yNm3D/6vCdlQ6gf
Content-Type: text/plain;
  charset="koi8-r"
Content-Transfer-Encoding: base64
Content-Disposition: inline

9yDTz8/C3cXOyckgz9QgMzAg0c7XwdLRIDIwMDYgMTk6MzggUGF2ZWwgVmFpbmVybWFuIM7B0MnT
wcwoYSk6Cgo+ID4g8NLPxM/M1sHAINDZ1MHU2NPRINPP2sTB1NggTGl2ZUNELiD11sUgz8LSwdog
08/axMHF1NPRLCDTIM7Fx88gzs/SzcHM2M7PCj4gPiDawcfS1dbBxdTT0SDTydPUxc3BLiDuzyDL
z87GyccgxMzRIMnL08/XINDV09TPyi4g8M/E08vB1snUxSwgy9TPCj4gPiDP1NfF3sHF1CDawSDF
x88gwdfUz83B1MnexdPLz8Ugx8XOxdLJ0s/Xwc7JxSDJINDPIMvBy8nNINDSwdfJzMHNIM/OCj4g
PiDHxc7F0snU09E/Cj4gCeXTzMkg0SDQ0sHXyczYzs8gz9vJwsHA09gsINTPINPF0tfJ0yBoYXJk
d2FyZS4KPiDhIM/OINXWxSDX2drZ18HF1CB4MTFjcmVhdGVjb25maWcuLi4KCtUgzsXHzyDWxSDQ
0snT1dTT1NfVxdQgx8zAyyAowSDNz9bF1CDGyd7BID8gOy0pICAtIM7BIM7Fy8/Uz9LZyCDNwdvJ
zsHIIArOwcTFxdTT0SDOwSDUzywg3tTPINDPIN7B09TJINLB2tLF28XOydEgzc/OydTP0iDJINfJ
xMnNz8vB0tTBIM3F1sTVINPPws/KIArEz8fP18/S0dTT0SAtIM7FIMTPwsHXzNHF1CDQz8zFICJN
b2RlcyIuIPTPzNjLzyDSwcLP1MHF1CDOxSDX08XHxMEsIM7B0NLJzcXSIArVIM3FztEg19PU0s/F
zsHRIGF0aSAozc/ExczYIM3Px9Ug0M/Qz9rWxSDHzNHO1dTYIMXTzMkgzsHEzykgySDNz87J1M/S
IEFPQyAKMTUiIM7FICLEz8fP18HSydfBwNTT0SIuIPPPz9TXxdTT1NfFzs7PINfJxMnNz8vB0tTB
INfZ09TB18zRxdQgzcHL08nNwczYzs/FIArQz8TExdLWydfBxc3PxSDSwdrSxdvFzsnFLCDLz9TP
0s/FIM7BIM3PzsnUz9LFIM7F18/azc/Wzs8gz9TPwtLB2snU2C4g9MHLz8UgCtDP18XExc7JxSDO
wcLMwMTBzCDF3cUgzsEgzsXTy8/M2MvPyCDLz87GycfV0sHDydHILgoK8M/Ty8/M2MvVIM3OxSDO
wSBMaXZlQ0Qg0sHa0sXbxc7JxSDX2dvFLCDexc0gMTAyNHg3NjggzsUgzsHEzyAtINDB1N7VINPL
0snQ1CAKaGFyZHdhcmUgItDPxCDTxcLRIiAoxd3FINfLzMDewcXUINDF0sXLzMDexc7JxSDX18/E
wSDQzyBjdHJsLXNoaWZ0LCDe1M/CIM7FIArOwdPU0sHJ18HU2CDexdLF2iDQz8zY2s/XwdTFzNjT
y8nFINDSz8fJKSDXIM3PzcXO1CBwb3N0aW5zdGFsbCfBLgoK7sEg19PRy8nKINPM1d7ByiDQ0snB
1NTB3tUgLSDSwdrNxdIgzcHMxc7Yy8nKLCDBINfE0tXHIMvPzdUg0M/OwcTPwsnU09EgOy0pCmhh
cmR3YXJlIC0g2sHLyc7V1Ngg1yBwcm9maWxlL3Bvc3RpbnN0YWxsL3NldHVwLmQvCmhhcmR3YXJl
LnBhdGNoIC0gINcgcHJvZmlsZS9wYXRjaGVzLwoKLS0gCldCUiwgZDRzCg==

--Boundary-00=_yNm3D/6vCdlQ6gf
Content-Type: text/plain;
  charset="koi8-r";
  name="hardware"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="hardware"

patch $ROOT/etc/init.d/hardware $PROFILE/patches/hardware.patch

--Boundary-00=_yNm3D/6vCdlQ6gf
Content-Type: text/x-diff;
  charset="koi8-r";
  name="hardware.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="hardware.patch"

--- hardware.orig	2005-08-17 16:54:16 +0300
+++ hardware	2005-11-09 23:07:23 +0200
@@ -15,14 +15,31 @@ LOCKFILE=/var/lock/subsys/x11createconfi
 RETVAL=0
 
 start() {
+
 	if [ ! -f /etc/X11/xorg.conf ];then
 	    local STRING="Setting up Xorg ..."
 	    echo -n "$STRING "
 	    /usr/bin/x11createconfig >/etc/X11/xorg.conf.auto
 	    local rc=$?
-	    [ $rc -eq 0 ] && success "$STRING" || failure "$STRING"
+	    if [ $rc -eq 0 ]
+	    then
+		success "$STRING" 
+		echo test
+    		/usr/bin/x11createconfig | grep "Modes" >/dev/null 2>&1
+		if [ "$?" == "1" ]
+		then
+		    local MODES="\\\"1024x768\\\" \\\"800x600\\\" \\\"640x480\\\""
+                    x11createconfig | sed s/.*"Subsection \"Display\""\$/\&\\\n\\\t\\\t"Modes   $MODES"/g  > /etc/X11/xorg.conf.auto
+		fi
+	    else	
+		failure "$STRING"
+	    fi
 	    echo
-	    ln -s xorg.conf.auto /etc/X11/xorg.conf
+	    cat /etc/X11/xorg.conf.auto |sed s/.*"Identifier \"Keyboard1\""/\&\
+\\\n\\\t\\\tOption\ \"XkbLayout\"\ \"us,ru\"\
+\\\n\\\t\\\tOption\ \"XkbVariant\"\ \"winkeys\"\
+\\\n\\\t\\\tOption\ \"XkbOptions\"\ \"grp:alt_shift_toggle,grp_led:scroll\"\
+/ > /etc/X11/xorg.conf 
 	    touch $LOCKFILE
 	fi
         [ -x "$SETGL" ] && $SETGL ||:

--Boundary-00=_yNm3D/6vCdlQ6gf--