Linaro

Merge lp:~tom-gall/linaro/fix-746065.live-helper.config.natty.alip into lp:~linaro-maintainers/linaro/live-helper.config.natty.alip

  1. fix-746065.live-helper.config.natty.alip
  2. Merge into live-helper.config.natty.alip
Proposed by Tom Gall
Status: Rejected
Rejected by: Loïc Minier
Proposed branch: lp:~tom-gall/linaro/fix-746065.live-helper.config.natty.alip
Merge into: lp:~linaro-maintainers/linaro/live-helper.config.natty.alip
Diff against target: 269 lines (+259/-0)
2 files modified
chroot_local-hooks/06_linaro-xscreensaver.sh (+5/-0)
chroot_local-includes/home/.xscreensaver (+254/-0)
To merge this branch: bzr merge lp:~tom-gall/linaro/fix-746065.live-helper.config.natty.alip
Reviewer Review Type Date Requested Status
Loïc Minier (community) Needs Fixing
Steve Langasek (community) Needs Information
Review via email: mp+56362@code.launchpad.net

Description of the change

In order to fix but 746065, there must be sane defaults for xscreensaver in place so it doesn't fire up immediately on log in.

In order to do that, we add a default xscreensaver file into chroot_local-includes/home and then we add a script into chroot_local-hooks that will run after the linaro account is create to move the file into the linaro directory and then chown to linaro.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Why does this need to be set in the user homedir, rather than somewhere under /etc (or /usr/share)? (Can this be installed as /etc/X11/Xresources/XScreensaver, for instance?) Moreover, why are the defaults in the xscreensaver package itself not sensible?

It's a rather large preferences file, too... which of the many settings are needed to fix this bug?

(I'm not keen on the temporary installation to /home + hook, would really prefer a cleaner fix)

review: Needs Information
Revision history for this message
Loïc Minier (lool) wrote :

According to last review this seems to need fixing

review: Needs Fixing

Unmerged revisions

65. By Tom Gall

Install .xscreensaver file so defaults are sane

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'chroot_local-hooks/06_linaro-xscreensaver.sh'
2--- chroot_local-hooks/06_linaro-xscreensaver.sh 1970-01-01 00:00:00 +0000
3+++ chroot_local-hooks/06_linaro-xscreensaver.sh 2011-04-05 13:47:55 +0000
4@@ -0,0 +1,5 @@
5+#!/bin/sh -x
6+
7+echo "I: setup linaro xscreensaver defaults"
8+mv /home/.xscreensaver /home/linaro
9+chown linaro:linaro /home/linaro/.xscreensaver
10
11=== added directory 'chroot_local-includes/home'
12=== added file 'chroot_local-includes/home/.xscreensaver'
13--- chroot_local-includes/home/.xscreensaver 1970-01-01 00:00:00 +0000
14+++ chroot_local-includes/home/.xscreensaver 2011-04-05 13:47:55 +0000
15@@ -0,0 +1,254 @@
16+# XScreenSaver Preferences File
17+# Written by xscreensaver-demo 5.12 for linaro on Fri Apr 1 16:34:33 2011.
18+# http://www.jwz.org/xscreensaver/
19+
20+timeout: 0:13:00
21+cycle: 0:10:00
22+lock: False
23+lockTimeout: 0:00:00
24+passwdTimeout: 0:00:30
25+visualID: default
26+installColormap: True
27+verbose: False
28+timestamp: True
29+splash: True
30+splashDuration: 0:00:05
31+demoCommand: xscreensaver-demo
32+prefsCommand: xscreensaver-demo -prefs
33+nice: 10
34+memoryLimit: 0
35+fade: True
36+unfade: False
37+fadeSeconds: 0:00:03
38+fadeTicks: 20
39+captureStderr: True
40+ignoreUninstalledPrograms:False
41+font: *-medium-r-*-140-*-m-*
42+dpmsEnabled: False
43+dpmsStandby: 2:00:00
44+dpmsSuspend: 2:00:00
45+dpmsOff: 4:00:00
46+grabDesktopImages: True
47+grabVideoFrames: False
48+chooseRandomImages: True
49+imageDirectory: /usr/share/backgrounds
50+
51+mode: random
52+selected: -1
53+
54+textMode: url
55+textLiteral: XScreenSaver
56+textFile:
57+textProgram: fortune
58+textURL: http://fridge.ubuntu.com/node/feed
59+
60+programs: \
61+ maze -root \n\
62+- GL: superquadrics -root \n\
63+ attraction -root \n\
64+ blitspin -root \n\
65+ greynetic -root \n\
66+ helix -root \n\
67+ hopalong -root \n\
68+ imsmap -root \n\
69+- noseguy -root \n\
70+- pyro -root \n\
71+ qix -root \n\
72+- rocks -root \n\
73+ rorschach -root \n\
74+ decayscreen -root \n\
75+ flame -root \n\
76+ halo -root \n\
77+ slidescreen -root \n\
78+ pedal -root \n\
79+ bouboule -root \n\
80+- braid -root \n\
81+ coral -root \n\
82+ deco -root \n\
83+ drift -root \n\
84+- fadeplot -root \n\
85+ galaxy -root \n\
86+ goop -root \n\
87+ grav -root \n\
88+ ifs -root \n\
89+- GL: jigsaw -root \n\
90+ julia -root \n\
91+- kaleidescope -root \n\
92+- GL: moebius -root \n\
93+ moire -root \n\
94+- GL: morph3d -root \n\
95+ mountain -root \n\
96+ munch -root \n\
97+ penrose -root \n\
98+- GL: pipes -root \n\
99+ rd-bomb -root \n\
100+- GL: rubik -root \n\
101+- sierpinski -root \n\
102+ slip -root \n\
103+- GL: sproingies -root \n\
104+ starfish -root \n\
105+ strange -root \n\
106+ swirl -root \n\
107+ triangle -root \n\
108+ xjack -root \n\
109+ xlyap -root \n\
110+- GL: atlantis -root \n\
111+ bsod -root \n\
112+- GL: bubble3d -root \n\
113+- GL: cage -root \n\
114+- crystal -root \n\
115+ cynosure -root \n\
116+ discrete -root \n\
117+ distort -root \n\
118+ epicycle -root \n\
119+ flow -root \n\
120+- GL: glplanet -root \n\
121+ interference -root \n\
122+ kumppa -root \n\
123+- GL: lament -root \n\
124+ moire2 -root \n\
125+- GL: sonar -root \n\
126+- GL: stairs -root \n\
127+ truchet -root \n\
128+- vidwhacker -root \n\
129+ blaster -root \n\
130+ bumps -root \n\
131+ ccurve -root \n\
132+ compass -root \n\
133+ deluxe -root \n\
134+- demon -root \n\
135+- GL: extrusion -root \n\
136+- loop -root \n\
137+ penetrate -root \n\
138+ petri -root \n\
139+ phosphor -root \n\
140+- GL: pulsar -root \n\
141+ ripples -root \n\
142+ shadebobs -root \n\
143+- GL: sierpinski3d -root \n\
144+ spotlight -root \n\
145+ squiral -root \n\
146+ wander -root \n\
147+- webcollage -root \n\
148+ xflame -root \n\
149+ xmatrix -root \n\
150+- GL: gflux -root \n\
151+- nerverot -root \n\
152+ xrayswarm -root \n\
153+ xspirograph -root \n\
154+- GL: circuit -root \n\
155+- GL: dangerball -root \n\
156+- GL: engine -root \n\
157+- GL: flipscreen3d -root \n\
158+- GL: gltext -root \n\
159+- GL: menger -root \n\
160+- GL: molecule -root \n\
161+ rotzoomer -root \n\
162+ speedmine -root \n\
163+- GL: starwars -root \n\
164+- GL: stonerview -root \n\
165+ vermiculate -root \n\
166+ whirlwindwarp -root \n\
167+ zoom -root \n\
168+ anemone -root \n\
169+ apollonian -root \n\
170+- GL: boxed -root \n\
171+- GL: cubenetic -root \n\
172+- GL: endgame -root \n\
173+ euler2d -root \n\
174+ fluidballs -root \n\
175+- GL: flurry -root \n\
176+- GL: glblur -root \n\
177+- GL: glsnake -root \n\
178+ halftone -root \n\
179+- GL: juggler3d -root \n\
180+- GL: lavalite -root \n\
181+- polyominoes -root \n\
182+- GL: queens -root \n\
183+- GL: sballs -root \n\
184+- GL: spheremonics -root \n\
185+- thornbird -root \n\
186+ twang -root \n\
187+- GL: antspotlight -root \n\
188+ apple2 -root \n\
189+- GL: atunnel -root \n\
190+ barcode -root \n\
191+- GL: blinkbox -root \n\
192+- GL: blocktube -root \n\
193+- GL: bouncingcow -root \n\
194+ cloudlife -root \n\
195+- GL: cubestorm -root \n\
196+ eruption -root \n\
197+- GL: flipflop -root \n\
198+- GL: flyingtoasters -root \n\
199+ fontglide -root \n\
200+- GL: gleidescope -root \n\
201+- GL: glknots -root \n\
202+- GL: glmatrix -root \n\
203+- GL: glslideshow -root \n\
204+- GL: hypertorus -root \n\
205+- GL: jigglypuff -root \n\
206+ metaballs -root \n\
207+- GL: mirrorblob -root \n\
208+ piecewise -root \n\
209+- GL: polytopes -root \n\
210+ pong -root \n\
211+ popsquares -root \n\
212+- GL: surfaces -root \n\
213+ xanalogtv -root \n\
214+- abstractile -root \n\
215+ anemotaxis -root \n\
216+- GL: antinspect -root \n\
217+ fireworkx -root \n\
218+ fuzzyflakes -root \n\
219+ interaggregate -root \n\
220+ intermomentary -root \n\
221+ memscroller -root \n\
222+- GL: noof -root \n\
223+ pacman -root \n\
224+- GL: pinion -root \n\
225+- GL: polyhedra -root \n\
226+- GL: providence -root \n\
227+ substrate -root \n\
228+ wormhole -root \n\
229+- GL: antmaze -root \n\
230+- GL: boing -root \n\
231+ boxfit -root \n\
232+- GL: carousel -root \n\
233+ celtic -root \n\
234+- GL: crackberg -root \n\
235+- GL: cube21 -root \n\
236+ fiberlamp -root \n\
237+- GL: fliptext -root \n\
238+- GL: glhanoi -root \n\
239+- GL: tangram -root \n\
240+- GL: timetunnel -root \n\
241+- GL: glschool -root \n\
242+- GL: topblock -root \n\
243+- GL: cubicgrid -root \n\
244+ cwaves -root \n\
245+- GL: gears -root \n\
246+- GL: glcells -root \n\
247+- GL: lockward -root \n\
248+ m6502 -root \n\
249+- GL: moebiusgears -root \n\
250+- GL: voronoi -root \n\
251+- GL: hypnowheel -root \n\
252+- GL: klein -root \n\
253+- lcdscrub -root \n\
254+- GL: photopile -root \n\
255+- GL: skytentacles -root \n\
256+- GL: rubikblocks -root \n\
257+
258+
259+pointerPollTime: 0:00:05
260+pointerHysteresis: 10
261+windowCreationTimeout:0:00:30
262+initialDelay: 0:00:00
263+sgiSaverExtension: True
264+xidleExtension: True
265+GetViewPortIsFullOfLies:False
266+procInterrupts: True
267+xinputExtensionDev: True
268+overlayStderr: True
269+

Subscribers

People subscribed via source and target branches

to all changes: