diff options
| author |   Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-09 00:28:58 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-11-09 00:28:58 +0100 |
| commit | d71ea17ccf914e244fd1a6c11d41c3a9f5a24d08 (patch) | |
| tree | 7586c25afa99ef2fcec27c0b11abf1ace7d01f0d /x11-apps/xinit | |
| parent | x11-libs/libXfont: add missing dep on bzip2, fixes bug #265761 (diff) | |
| download | x11-d71ea17ccf914e244fd1a6c11d41c3a9f5a24d08.tar.gz x11-d71ea17ccf914e244fd1a6c11d41c3a9f5a24d08.tar.bz2 x11-d71ea17ccf914e244fd1a6c11d41c3a9f5a24d08.zip | |
[x11-apps/xinit] Fix the nox issue and detect openrc correctly.
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 4 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm-setup.initd-1 | 2 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-4 | 9 |
3 files changed, 7 insertions, 8 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 479ec125..8988fb14 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -3,9 +3,9 @@ AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 1322bb133689aa68b101f1 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 -AUX xdm-setup.initd-1 339 RMD160 8be48225ea6df9434d78981437cdbfdd29e10055 SHA1 15e723b54c27a422e9d53b98b3c5471e111817c2 SHA256 bce5865e7da9bcedeef66e8ce1b6fc7e303cf8d1f44ecb0e6347c045414a7d7d +AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0 AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a80b17a41ed4812aedf7fd1082df7e9f1335 SHA256 44042c13cbc759e2580a32f8a30b58eb2eb71c1d5f4b4cd94e9de476667862bb -AUX xdm.initd-4 6537 RMD160 faab1aa47fe46f068433eb07d0558ca4359bcf61 SHA1 7d0f0ca530bc85fa4a53461fb2d57bc462605146 SHA256 45ef1a4cb0d05aafdfd9978e1c68d7c658e8d53ce9e1f7d81cc427b6b5765d7f +AUX xdm.initd-4 6416 RMD160 d71798f2d2a0c4cb08ff4c9b21a59aabf2182c63 SHA1 2556e7fa726739fbbb3ef854c50099362acf76ca SHA256 2e12f6ad16b87b85961207213635ca1f4f7f565350b4cab8832a4c428e5c9e02 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe EBUILD xinit-9999.ebuild 1865 RMD160 e8659510c5139eda25ab68eb4c0bfb5c46a171c4 SHA1 49f84ef0628dad5a6519882aab6a199f3ca6849a SHA256 419efb238e93ec671bcd95fef69429486c088901ee9b719be87002aaaf502d05 diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1 index 79797a4f..6ed3922c 100644 --- a/x11-apps/xinit/files/xdm-setup.initd-1 +++ b/x11-apps/xinit/files/xdm-setup.initd-1 @@ -9,6 +9,6 @@ depend() { start() { if get_bootparam "nox" ; then - touch /tmp/.noxdm + touch /etc/.noxdm fi } diff --git a/x11-apps/xinit/files/xdm.initd-4 b/x11-apps/xinit/files/xdm.initd-4 index 4f27cb5f..04b4430d 100755 --- a/x11-apps/xinit/files/xdm.initd-4 +++ b/x11-apps/xinit/files/xdm.initd-4 @@ -65,8 +65,7 @@ hald_depend() { fi # baselayout-2 only - [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /libexec/rc/version ] \ - && config "${xorgconf}" + [ ! -n "${RC_UNAME}" ] && config "${xorgconf}" # process only the first existing file in the search list break @@ -170,9 +169,9 @@ start() { local EXE= NAME= PIDFILE= setup_dm - if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm ] ; then - einfo "Skipping ${EXE}, /etc/init.d/.noxdm or /tmp/.noxdm found" - rm /etc/init.d/.noxdm /tmp/.noxdm + if [ -f /etc/.noxdm ] ; then + einfo "Skipping ${EXE}, /etc/.noxdm found" + rm /etc/.noxdm return 0 fi |