API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 9th, 2017
126
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 71.98 KB | None | 0 0
raw download clone embed print report
  1. === modified file 'd-i/manifest'
  2. --- d-i/manifest 2009-02-25 11:05:12 +0000
  3. +++ d-i/manifest 2009-02-27 08:05:49 +0000
  4. @@ -1,4 +1,4 @@
  5. -apt-setup 1:0.37ubuntu9
  6. +apt-setup 1:0.37ubuntu10
  7. base-installer 1.98ubuntu2
  8. choose-mirror 2.27ubuntu3
  9. clock-setup 0.97ubuntu2
  10. @@ -7,7 +7,7 @@
  11. grub-installer 1.36ubuntu2
  12. hw-detect 1.71ubuntu4
  13. kboot-installer 0.0.1ubuntu8
  14. -localechooser 2.09ubuntu1
  15. +localechooser 2.09ubuntu2
  16. migration-assistant 0.6.2
  17. partconf 1.30ubuntu1
  18. partman-auto 84ubuntu1
  19. @@ -19,12 +19,12 @@
  20. partman-ext3 55ubuntu2
  21. partman-jfs 29ubuntu1
  22. partman-newworld 20ubuntu1
  23. -partman-partitioning 64ubuntu3
  24. +partman-partitioning 64ubuntu4
  25. partman-reiserfs 44ubuntu1
  26. partman-target 58ubuntu4
  27. partman-xfs 43ubuntu1
  28. preseed 1.41ubuntu1
  29. silo-installer 1.15ubuntu1
  30. tzsetup 1:0.24ubuntu1
  31. -user-setup 1.23ubuntu13
  32. +user-setup 1.23ubuntu14
  33. yaboot-installer 1.1.14ubuntu1
  34.  
  35. === modified file 'debian/changelog'
  36. --- debian/changelog 2009-02-27 06:48:28 +0000
  37. +++ debian/changelog 2009-02-27 08:05:50 +0000
  38. @@ -16,6 +16,9 @@
  39.  
  40. [ Mario Limonciello ]
  41. * Remove dead AdditionalDrivers code.
  42. + * Automatic update of included source packages: apt-setup
  43. + 1:0.37ubuntu10, localechooser 2.09ubuntu2, partman-partitioning
  44. + 64ubuntu4, user-setup 1.23ubuntu14.
  45.  
  46. -- Colin Watson <cjwatson@ubuntu.com> Wed, 25 Feb 2009 10:44:52 +0000
  47.  
  48.  
  49. === modified file 'debian/ubiquity-frontend-mythbuntu.templates'
  50. --- debian/ubiquity-frontend-mythbuntu.templates 2009-02-14 19:05:01 +0000
  51. +++ debian/ubiquity-frontend-mythbuntu.templates 2009-02-27 07:21:15 +0000
  52. @@ -184,10 +184,6 @@
  53. Type: boolean
  54. Description: for internal use; determines if vnc is enabled
  55.  
  56. -Template: mythbuntu/x11vnc_password
  57. -Type: string
  58. -Description: for internal use; stores the chosen vnc password
  59. -
  60. Template: mythbuntu/openssh-server
  61. Type: boolean
  62. Description: for internal use; determines if ssh is enabled
  63.  
  64. === modified file 'gui/glade/mythbuntu_stepPasswords.glade'
  65. --- gui/glade/mythbuntu_stepPasswords.glade 2008-09-04 07:04:44 +0000
  66. +++ gui/glade/mythbuntu_stepPasswords.glade 2009-02-27 08:41:41 +0000
  67. @@ -1,6 +1,6 @@
  68. <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  69. <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
  70. -<!--Generated with glade3 3.4.5 on Thu Sep 4 01:33:05 2008 -->
  71. +<!--Generated with glade3 3.4.5 on Fri Feb 27 01:36:54 2009 -->
  72. <glade-interface>
  73. <widget class="GtkWindow" id="dummy_window">
  74. <property name="visible">True</property>
  75. @@ -14,7 +14,7 @@
  76. <property name="visible">True</property>
  77. <property name="can_focus">True</property>
  78. <property name="xalign">0</property>
  79. - <property name="label" translatable="yes"><big><b>MythTV Related Passwords</b></big></property>
  80. + <property name="label" translatable="yes"><big><b>Master Backend Connection Information</b></big></property>
  81. <property name="use_markup">True</property>
  82. <property name="single_line_mode">True</property>
  83. </widget>
  84. @@ -35,496 +35,150 @@
  85. </packing>
  86. </child>
  87. <child>
  88. - <widget class="GtkVBox" id="vbox10">
  89. + <widget class="GtkVBox" id="vbox4">
  90. <property name="visible">True</property>
  91. - <property name="spacing">15</property>
  92. - <child>
  93. - <widget class="GtkExpander" id="master_backend_expander">
  94. - <property name="can_focus">True</property>
  95. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  96. - <property name="expanded">True</property>
  97. - <child>
  98. - <widget class="GtkVBox" id="vbox4">
  99. - <property name="visible">True</property>
  100. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  101. - <property name="spacing">5</property>
  102. - <child>
  103. - <widget class="GtkLabel" id="master_backend_expander_description">
  104. - <property name="width_request">650</property>
  105. - <property name="visible">True</property>
  106. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  107. - <property name="xalign">0</property>
  108. - <property name="label" translatable="yes">This information can be gathered from your pre-existing MythTV backend. It is typically stored in a file titled <b>mysql.txt</b>. On an Mythbuntu or Ubuntu system, this is found in <b>/etc/mythtv/mysql.txt</b>. If you have already entered it in the Live environment, this can be filled out for you.</property>
  109. - <property name="use_markup">True</property>
  110. - <property name="wrap">True</property>
  111. - </widget>
  112. - <packing>
  113. - <property name="expand">False</property>
  114. - </packing>
  115. - </child>
  116. - <child>
  117. - <placeholder/>
  118. - </child>
  119. - <child>
  120. - <widget class="GtkTable" id="master_backend_table">
  121. - <property name="visible">True</property>
  122. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  123. - <property name="n_rows">4</property>
  124. - <property name="n_columns">2</property>
  125. - <child>
  126. - <widget class="GtkLabel" id="mysql_server_label">
  127. - <property name="width_request">400</property>
  128. - <property name="visible">True</property>
  129. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  130. - <property name="xalign">0</property>
  131. - <property name="xpad">10</property>
  132. - <property name="label" translatable="yes">MySQL Server</property>
  133. - </widget>
  134. - <packing>
  135. - <property name="x_options"></property>
  136. - </packing>
  137. - </child>
  138. - <child>
  139. - <widget class="GtkLabel" id="mysql_database_label">
  140. - <property name="width_request">400</property>
  141. - <property name="visible">True</property>
  142. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  143. - <property name="xalign">0</property>
  144. - <property name="xpad">10</property>
  145. - <property name="label" translatable="yes">MySQL Database</property>
  146. - </widget>
  147. - <packing>
  148. - <property name="top_attach">1</property>
  149. - <property name="bottom_attach">2</property>
  150. - <property name="x_options"></property>
  151. - </packing>
  152. - </child>
  153. - <child>
  154. - <widget class="GtkLabel" id="mysql_user_label">
  155. - <property name="width_request">400</property>
  156. - <property name="visible">True</property>
  157. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  158. - <property name="xalign">0</property>
  159. - <property name="xpad">10</property>
  160. - <property name="label" translatable="yes">MySQL User Name </property>
  161. - </widget>
  162. - <packing>
  163. - <property name="top_attach">2</property>
  164. - <property name="bottom_attach">3</property>
  165. - <property name="x_options"></property>
  166. - </packing>
  167. - </child>
  168. - <child>
  169. - <widget class="GtkLabel" id="mysql_password_label">
  170. - <property name="width_request">400</property>
  171. - <property name="visible">True</property>
  172. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  173. - <property name="xalign">0</property>
  174. - <property name="xpad">10</property>
  175. - <property name="label" translatable="yes">MySQL Password</property>
  176. - </widget>
  177. - <packing>
  178. - <property name="top_attach">3</property>
  179. - <property name="bottom_attach">4</property>
  180. - <property name="x_options"></property>
  181. - </packing>
  182. - </child>
  183. - <child>
  184. - <widget class="GtkEntry" id="mysql_server">
  185. - <property name="width_request">200</property>
  186. - <property name="visible">True</property>
  187. - <property name="can_focus">True</property>
  188. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  189. - </widget>
  190. - <packing>
  191. - <property name="left_attach">1</property>
  192. - <property name="right_attach">2</property>
  193. - <property name="x_options"></property>
  194. - </packing>
  195. - </child>
  196. - <child>
  197. - <widget class="GtkEntry" id="mysql_user">
  198. - <property name="width_request">200</property>
  199. - <property name="visible">True</property>
  200. - <property name="can_focus">True</property>
  201. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  202. - <property name="text" translatable="yes">mythtv</property>
  203. - </widget>
  204. - <packing>
  205. - <property name="left_attach">1</property>
  206. - <property name="right_attach">2</property>
  207. - <property name="top_attach">2</property>
  208. - <property name="bottom_attach">3</property>
  209. - <property name="x_options"></property>
  210. - </packing>
  211. - </child>
  212. - <child>
  213. - <widget class="GtkEntry" id="mysql_password">
  214. - <property name="width_request">200</property>
  215. - <property name="visible">True</property>
  216. - <property name="can_focus">True</property>
  217. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  218. - <property name="visibility">False</property>
  219. - </widget>
  220. - <packing>
  221. - <property name="left_attach">1</property>
  222. - <property name="right_attach">2</property>
  223. - <property name="top_attach">3</property>
  224. - <property name="bottom_attach">4</property>
  225. - <property name="x_options"></property>
  226. - </packing>
  227. - </child>
  228. - <child>
  229. - <widget class="GtkEntry" id="mysql_database">
  230. - <property name="width_request">200</property>
  231. - <property name="visible">True</property>
  232. - <property name="can_focus">True</property>
  233. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  234. - <property name="text" translatable="yes">mythconverg</property>
  235. - </widget>
  236. - <packing>
  237. - <property name="left_attach">1</property>
  238. - <property name="right_attach">2</property>
  239. - <property name="top_attach">1</property>
  240. - <property name="bottom_attach">2</property>
  241. - <property name="x_options"></property>
  242. - </packing>
  243. - </child>
  244. - </widget>
  245. - <packing>
  246. - <property name="expand">False</property>
  247. - <property name="position">2</property>
  248. - </packing>
  249. - </child>
  250. - <child>
  251. - <widget class="GtkHBox" id="hbox1">
  252. - <property name="width_request">400</property>
  253. - <property name="visible">True</property>
  254. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  255. - <child>
  256. - <widget class="GtkAlignment" id="alignment1">
  257. - <property name="width_request">150</property>
  258. - <property name="visible">True</property>
  259. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  260. - <property name="xalign">0</property>
  261. - <property name="xscale">0.039999999105930328</property>
  262. - <child>
  263. - <widget class="GtkButton" id="connectiontest_button">
  264. - <property name="visible">True</property>
  265. - <property name="can_focus">True</property>
  266. - <property name="receives_default">True</property>
  267. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  268. - <property name="label" translatable="yes">Test Connection</property>
  269. - <property name="xalign">0</property>
  270. - <property name="response_id">0</property>
  271. - <signal name="clicked" handler="do_connection_test"/>
  272. - </widget>
  273. - </child>
  274. - </widget>
  275. - <packing>
  276. - <property name="expand">False</property>
  277. - <property name="fill">False</property>
  278. - </packing>
  279. - </child>
  280. - <child>
  281. - <widget class="GtkLabel" id="connection_results_label">
  282. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  283. - <property name="xalign">1</property>
  284. - <property name="label" translatable="yes">Connection Results:</property>
  285. - </widget>
  286. - <packing>
  287. - <property name="padding">10</property>
  288. - <property name="position">1</property>
  289. - </packing>
  290. - </child>
  291. - <child>
  292. - <widget class="GtkLabel" id="connection_results">
  293. - <property name="width_request">200</property>
  294. - <property name="visible">True</property>
  295. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  296. - <property name="xalign">0</property>
  297. - <property name="label" translatable="yes">Please <b>Test</b> your connection to proceed.</property>
  298. - <property name="use_markup">True</property>
  299. - <property name="wrap">True</property>
  300. - </widget>
  301. - <packing>
  302. - <property name="position">2</property>
  303. - </packing>
  304. - </child>
  305. - </widget>
  306. - <packing>
  307. - <property name="position">3</property>
  308. - </packing>
  309. - </child>
  310. - </widget>
  311. - </child>
  312. - <child>
  313. - <widget class="GtkLabel" id="master_backend_expander_label">
  314. - <property name="visible">True</property>
  315. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  316. - <property name="label" translatable="yes">Master Backend Connection Information</property>
  317. - </widget>
  318. - <packing>
  319. - <property name="type">label_item</property>
  320. - </packing>
  321. - </child>
  322. - </widget>
  323. - <packing>
  324. - <property name="expand">False</property>
  325. - </packing>
  326. - </child>
  327. - <child>
  328. - <widget class="GtkExpander" id="mythweb_expander">
  329. - <property name="width_request">600</property>
  330. - <property name="visible">True</property>
  331. - <property name="can_focus">True</property>
  332. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  333. - <property name="expanded">True</property>
  334. - <child>
  335. - <widget class="GtkVBox" id="vbox3">
  336. - <property name="visible">True</property>
  337. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  338. - <property name="spacing">5</property>
  339. - <child>
  340. - <widget class="GtkLabel" id="mythweb_expander_description">
  341. - <property name="width_request">650</property>
  342. - <property name="visible">True</property>
  343. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  344. - <property name="xalign">0</property>
  345. - <property name="label" translatable="yes">It is a good idea to setup security for Mythweb. This can prevent unauthorized external access.</property>
  346. - <property name="wrap">True</property>
  347. - </widget>
  348. - <packing>
  349. - <property name="expand">False</property>
  350. - <property name="fill">False</property>
  351. - </packing>
  352. - </child>
  353. - <child>
  354. - <widget class="GtkCheckButton" id="usemythwebpassword">
  355. - <property name="visible">True</property>
  356. - <property name="can_focus">True</property>
  357. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  358. - <property name="label" translatable="yes">Set Mythweb Security</property>
  359. - <property name="response_id">0</property>
  360. - <property name="draw_indicator">True</property>
  361. - <signal name="toggled" handler="usemythwebpassword_toggled"/>
  362. - </widget>
  363. - <packing>
  364. - <property name="expand">False</property>
  365. - <property name="fill">False</property>
  366. - <property name="position">1</property>
  367. - </packing>
  368. - </child>
  369. - <child>
  370. - <widget class="GtkTable" id="mythweb_table">
  371. - <property name="width_request">600</property>
  372. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  373. - <property name="n_rows">2</property>
  374. - <property name="n_columns">3</property>
  375. - <child>
  376. - <widget class="GtkImage" id="mythweb_user_error_image">
  377. - <property name="stock">gtk-dialog-error</property>
  378. - </widget>
  379. - <packing>
  380. - <property name="left_attach">2</property>
  381. - <property name="right_attach">3</property>
  382. - <property name="x_options"></property>
  383. - <property name="y_options"></property>
  384. - </packing>
  385. - </child>
  386. - <child>
  387. - <widget class="GtkEntry" id="mythweb_username">
  388. - <property name="width_request">200</property>
  389. - <property name="visible">True</property>
  390. - <property name="can_focus">True</property>
  391. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  392. - <signal name="changed" handler="mythbuntu_password"/>
  393. - </widget>
  394. - <packing>
  395. - <property name="left_attach">1</property>
  396. - <property name="right_attach">2</property>
  397. - <property name="x_options">GTK_FILL</property>
  398. - </packing>
  399. - </child>
  400. - <child>
  401. - <widget class="GtkLabel" id="mythweb_username_label">
  402. - <property name="width_request">400</property>
  403. - <property name="visible">True</property>
  404. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  405. - <property name="xalign">0</property>
  406. - <property name="xpad">10</property>
  407. - <property name="label" translatable="yes">Mythweb Username </property>
  408. - </widget>
  409. - <packing>
  410. - <property name="x_options">GTK_FILL</property>
  411. - <property name="y_options"></property>
  412. - </packing>
  413. - </child>
  414. - <child>
  415. - <widget class="GtkLabel" id="mythweb_password_label">
  416. - <property name="width_request">400</property>
  417. - <property name="visible">True</property>
  418. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  419. - <property name="xalign">0</property>
  420. - <property name="xpad">10</property>
  421. - <property name="label" translatable="yes">Mythweb Password </property>
  422. - </widget>
  423. - <packing>
  424. - <property name="top_attach">1</property>
  425. - <property name="bottom_attach">2</property>
  426. - <property name="x_options">GTK_FILL</property>
  427. - </packing>
  428. - </child>
  429. - <child>
  430. - <widget class="GtkEntry" id="mythweb_password">
  431. - <property name="width_request">200</property>
  432. - <property name="visible">True</property>
  433. - <property name="can_focus">True</property>
  434. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  435. - <property name="visibility">False</property>
  436. - <signal name="changed" handler="mythbuntu_password"/>
  437. - </widget>
  438. - <packing>
  439. - <property name="left_attach">1</property>
  440. - <property name="right_attach">2</property>
  441. - <property name="top_attach">1</property>
  442. - <property name="bottom_attach">2</property>
  443. - <property name="x_options">GTK_FILL</property>
  444. - </packing>
  445. - </child>
  446. - <child>
  447. - <widget class="GtkImage" id="mythweb_pass_error_image">
  448. - <property name="stock">gtk-dialog-error</property>
  449. - </widget>
  450. - <packing>
  451. - <property name="left_attach">2</property>
  452. - <property name="right_attach">3</property>
  453. - <property name="top_attach">1</property>
  454. - <property name="bottom_attach">2</property>
  455. - <property name="x_options"></property>
  456. - </packing>
  457. - </child>
  458. - </widget>
  459. - <packing>
  460. - <property name="expand">False</property>
  461. - <property name="fill">False</property>
  462. - <property name="position">2</property>
  463. - </packing>
  464. - </child>
  465. - </widget>
  466. - </child>
  467. - <child>
  468. - <widget class="GtkLabel" id="mythweb_expander_label">
  469. - <property name="visible">True</property>
  470. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  471. - <property name="label" translatable="yes">Mythweb Access Password</property>
  472. - </widget>
  473. - <packing>
  474. - <property name="type">label_item</property>
  475. - </packing>
  476. - </child>
  477. - </widget>
  478. - <packing>
  479. - <property name="expand">False</property>
  480. - <property name="position">1</property>
  481. - </packing>
  482. - </child>
  483. - <child>
  484. - <widget class="GtkExpander" id="mysql_server_expander">
  485. - <property name="visible">True</property>
  486. - <property name="can_focus">True</property>
  487. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  488. - <property name="expanded">True</property>
  489. - <child>
  490. - <widget class="GtkVBox" id="vbox1">
  491. - <property name="visible">True</property>
  492. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  493. - <property name="spacing">5</property>
  494. - <child>
  495. - <widget class="GtkLabel" id="mysql_server_expander_description">
  496. - <property name="width_request">650</property>
  497. - <property name="visible">True</property>
  498. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  499. - <property name="xalign">0</property>
  500. - <property name="label" translatable="yes">If you will be connecting to your backend remotely, be sure to set a password for the root user.</property>
  501. - <property name="wrap">True</property>
  502. - </widget>
  503. - <packing>
  504. - <property name="expand">False</property>
  505. - </packing>
  506. - </child>
  507. - <child>
  508. - <widget class="GtkCheckButton" id="usemysqlrootpassword">
  509. - <property name="visible">True</property>
  510. - <property name="can_focus">True</property>
  511. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  512. - <property name="label" translatable="yes">Set MySQL Database Root Password</property>
  513. - <property name="response_id">0</property>
  514. - <property name="draw_indicator">True</property>
  515. - <signal name="toggled" handler="usemysqlrootpassword_toggled"/>
  516. - </widget>
  517. - <packing>
  518. - <property name="expand">False</property>
  519. - <property name="fill">False</property>
  520. - <property name="position">1</property>
  521. - </packing>
  522. - </child>
  523. - <child>
  524. - <widget class="GtkHBox" id="mysql_server_hbox">
  525. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  526. - <child>
  527. - <widget class="GtkLabel" id="mysql_root_password_label">
  528. - <property name="width_request">400</property>
  529. - <property name="visible">True</property>
  530. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  531. - <property name="xalign">0</property>
  532. - <property name="xpad">10</property>
  533. - <property name="label" translatable="yes">MySQL Root Password</property>
  534. - </widget>
  535. - <packing>
  536. - <property name="expand">False</property>
  537. - <property name="padding">3</property>
  538. - </packing>
  539. - </child>
  540. - <child>
  541. - <widget class="GtkEntry" id="mysql_root_password">
  542. - <property name="width_request">200</property>
  543. - <property name="visible">True</property>
  544. - <property name="can_focus">True</property>
  545. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  546. - <property name="visibility">False</property>
  547. - <signal name="changed" handler="mythbuntu_password"/>
  548. - </widget>
  549. - <packing>
  550. - <property name="expand">False</property>
  551. - <property name="position">1</property>
  552. - </packing>
  553. - </child>
  554. - <child>
  555. - <widget class="GtkImage" id="mysql_root_error_image">
  556. - <property name="stock">gtk-dialog-error</property>
  557. - </widget>
  558. - <packing>
  559. - <property name="expand">False</property>
  560. - <property name="position">2</property>
  561. - </packing>
  562. - </child>
  563. - </widget>
  564. - <packing>
  565. - <property name="expand">False</property>
  566. - <property name="position">2</property>
  567. - </packing>
  568. - </child>
  569. - </widget>
  570. - </child>
  571. - <child>
  572. - <widget class="GtkLabel" id="mysql_server_expander_label">
  573. - <property name="visible">True</property>
  574. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  575. - <property name="label" translatable="yes">MySQL Server Root Password</property>
  576. - </widget>
  577. - <packing>
  578. - <property name="type">label_item</property>
  579. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  580. + <property name="spacing">5</property>
  581. + <child>
  582. + <widget class="GtkLabel" id="master_backend_expander_description">
  583. + <property name="width_request">650</property>
  584. + <property name="visible">True</property>
  585. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  586. + <property name="xalign">0</property>
  587. + <property name="label" translatable="yes">This information can be gathered from your pre-existing MythTV backend. It is typically stored in a file titled <b>mysql.txt</b>. On an Mythbuntu or Ubuntu system, this is found in <b>/etc/mythtv/mysql.txt</b>. If you have already entered it in the Live environment, this can be filled out for you.</property>
  588. + <property name="use_markup">True</property>
  589. + <property name="wrap">True</property>
  590. + </widget>
  591. + <packing>
  592. + <property name="expand">False</property>
  593. + </packing>
  594. + </child>
  595. + <child>
  596. + <placeholder/>
  597. + </child>
  598. + <child>
  599. + <widget class="GtkTable" id="master_backend_table">
  600. + <property name="visible">True</property>
  601. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  602. + <property name="n_rows">4</property>
  603. + <property name="n_columns">2</property>
  604. + <child>
  605. + <widget class="GtkEntry" id="mysql_database">
  606. + <property name="width_request">200</property>
  607. + <property name="visible">True</property>
  608. + <property name="can_focus">True</property>
  609. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  610. + <property name="text" translatable="yes">mythconverg</property>
  611. + </widget>
  612. + <packing>
  613. + <property name="left_attach">1</property>
  614. + <property name="right_attach">2</property>
  615. + <property name="top_attach">1</property>
  616. + <property name="bottom_attach">2</property>
  617. + <property name="x_options"></property>
  618. + </packing>
  619. + </child>
  620. + <child>
  621. + <widget class="GtkEntry" id="mysql_password">
  622. + <property name="width_request">200</property>
  623. + <property name="visible">True</property>
  624. + <property name="can_focus">True</property>
  625. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  626. + <property name="visibility">False</property>
  627. + </widget>
  628. + <packing>
  629. + <property name="left_attach">1</property>
  630. + <property name="right_attach">2</property>
  631. + <property name="top_attach">3</property>
  632. + <property name="bottom_attach">4</property>
  633. + <property name="x_options"></property>
  634. + </packing>
  635. + </child>
  636. + <child>
  637. + <widget class="GtkEntry" id="mysql_user">
  638. + <property name="width_request">200</property>
  639. + <property name="visible">True</property>
  640. + <property name="can_focus">True</property>
  641. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  642. + <property name="text" translatable="yes">mythtv</property>
  643. + </widget>
  644. + <packing>
  645. + <property name="left_attach">1</property>
  646. + <property name="right_attach">2</property>
  647. + <property name="top_attach">2</property>
  648. + <property name="bottom_attach">3</property>
  649. + <property name="x_options"></property>
  650. + </packing>
  651. + </child>
  652. + <child>
  653. + <widget class="GtkEntry" id="mysql_server">
  654. + <property name="width_request">200</property>
  655. + <property name="visible">True</property>
  656. + <property name="can_focus">True</property>
  657. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  658. + </widget>
  659. + <packing>
  660. + <property name="left_attach">1</property>
  661. + <property name="right_attach">2</property>
  662. + <property name="x_options"></property>
  663. + </packing>
  664. + </child>
  665. + <child>
  666. + <widget class="GtkLabel" id="mysql_password_label">
  667. + <property name="width_request">400</property>
  668. + <property name="visible">True</property>
  669. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  670. + <property name="xalign">0</property>
  671. + <property name="xpad">10</property>
  672. + <property name="label" translatable="yes">MySQL Password</property>
  673. + </widget>
  674. + <packing>
  675. + <property name="top_attach">3</property>
  676. + <property name="bottom_attach">4</property>
  677. + <property name="x_options"></property>
  678. + </packing>
  679. + </child>
  680. + <child>
  681. + <widget class="GtkLabel" id="mysql_user_label">
  682. + <property name="width_request">400</property>
  683. + <property name="visible">True</property>
  684. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  685. + <property name="xalign">0</property>
  686. + <property name="xpad">10</property>
  687. + <property name="label" translatable="yes">MySQL User Name </property>
  688. + </widget>
  689. + <packing>
  690. + <property name="top_attach">2</property>
  691. + <property name="bottom_attach">3</property>
  692. + <property name="x_options"></property>
  693. + </packing>
  694. + </child>
  695. + <child>
  696. + <widget class="GtkLabel" id="mysql_database_label">
  697. + <property name="width_request">400</property>
  698. + <property name="visible">True</property>
  699. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  700. + <property name="xalign">0</property>
  701. + <property name="xpad">10</property>
  702. + <property name="label" translatable="yes">MySQL Database</property>
  703. + </widget>
  704. + <packing>
  705. + <property name="top_attach">1</property>
  706. + <property name="bottom_attach">2</property>
  707. + <property name="x_options"></property>
  708. + </packing>
  709. + </child>
  710. + <child>
  711. + <widget class="GtkLabel" id="mysql_server_label">
  712. + <property name="width_request">400</property>
  713. + <property name="visible">True</property>
  714. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  715. + <property name="xalign">0</property>
  716. + <property name="xpad">10</property>
  717. + <property name="label" translatable="yes">MySQL Server</property>
  718. + </widget>
  719. + <packing>
  720. + <property name="x_options"></property>
  721. </packing>
  722. </child>
  723. </widget>
  724. @@ -533,10 +187,70 @@
  725. <property name="position">2</property>
  726. </packing>
  727. </child>
  728. + <child>
  729. + <widget class="GtkHBox" id="hbox1">
  730. + <property name="width_request">400</property>
  731. + <property name="visible">True</property>
  732. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  733. + <child>
  734. + <widget class="GtkAlignment" id="alignment1">
  735. + <property name="width_request">150</property>
  736. + <property name="visible">True</property>
  737. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  738. + <property name="xalign">0</property>
  739. + <property name="xscale">0.039999999105930328</property>
  740. + <child>
  741. + <widget class="GtkButton" id="connectiontest_button">
  742. + <property name="visible">True</property>
  743. + <property name="can_focus">True</property>
  744. + <property name="receives_default">True</property>
  745. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  746. + <property name="label" translatable="yes">Test Connection</property>
  747. + <property name="xalign">0</property>
  748. + <property name="response_id">0</property>
  749. + <signal name="clicked" handler="do_connection_test"/>
  750. + </widget>
  751. + </child>
  752. + </widget>
  753. + <packing>
  754. + <property name="expand">False</property>
  755. + <property name="fill">False</property>
  756. + </packing>
  757. + </child>
  758. + <child>
  759. + <widget class="GtkLabel" id="connection_results_label">
  760. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  761. + <property name="xalign">1</property>
  762. + <property name="label" translatable="yes">Connection Results:</property>
  763. + </widget>
  764. + <packing>
  765. + <property name="padding">10</property>
  766. + <property name="position">1</property>
  767. + </packing>
  768. + </child>
  769. + <child>
  770. + <widget class="GtkLabel" id="connection_results">
  771. + <property name="width_request">200</property>
  772. + <property name="visible">True</property>
  773. + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  774. + <property name="xalign">0</property>
  775. + <property name="label" translatable="yes">Please <b>Test</b> your connection to proceed.</property>
  776. + <property name="use_markup">True</property>
  777. + <property name="wrap">True</property>
  778. + </widget>
  779. + <packing>
  780. + <property name="position">2</property>
  781. + </packing>
  782. + </child>
  783. + </widget>
  784. + <packing>
  785. + <property name="position">3</property>
  786. + </packing>
  787. + </child>
  788. </widget>
  789. <packing>
  790. <property name="expand">False</property>
  791. - <property name="padding">6</property>
  792. + <property name="fill">False</property>
  793. <property name="position">2</property>
  794. </packing>
  795. </child>
  796.  
  797. === modified file 'gui/glade/mythbuntu_stepServices.glade'
  798. --- gui/glade/mythbuntu_stepServices.glade 2008-08-08 14:22:31 +0000
  799. +++ gui/glade/mythbuntu_stepServices.glade 2009-02-27 07:17:19 +0000
  800. @@ -1,6 +1,6 @@
  801. <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  802. <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
  803. -<!--Generated with glade3 3.3.3 on Thu Aug 23 23:57:49 2007 -->
  804. +<!--Generated with glade3 3.4.5 on Fri Feb 27 01:17:19 2009 -->
  805. <glade-interface>
  806. <widget class="GtkWindow" id="dummy_window">
  807. <property name="visible">True</property>
  808. @@ -53,125 +53,36 @@
  809. </packing>
  810. </child>
  811. <child>
  812. - <widget class="GtkVBox" id="vbox1">
  813. + <widget class="GtkHBox" id="vnc_option_hbox">
  814. <property name="visible">True</property>
  815. <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  816. - <property name="spacing">10</property>
  817. <child>
  818. - <widget class="GtkHBox" id="vnc_option_hbox">
  819. + <widget class="GtkCheckButton" id="enablevnc">
  820. <property name="visible">True</property>
  821. + <property name="can_focus">True</property>
  822. <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  823. - <child>
  824. - <widget class="GtkCheckButton" id="enablevnc">
  825. - <property name="visible">True</property>
  826. - <property name="can_focus">True</property>
  827. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  828. - <property name="label" translatable="yes">VNC Service</property>
  829. - <property name="response_id">0</property>
  830. - <property name="draw_indicator">True</property>
  831. - <signal name="toggled" handler="toggle_enablevnc"/>
  832. - </widget>
  833. - <packing>
  834. - <property name="expand">False</property>
  835. - </packing>
  836. - </child>
  837. - <child>
  838. - <widget class="GtkLabel" id="enablevnc_label">
  839. - <property name="width_request">500</property>
  840. - <property name="visible">True</property>
  841. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  842. - <property name="xalign">0</property>
  843. - <property name="label" translatable="yes">VNC is a very commonly used protocol for graphical remote administration and control of a machine.</property>
  844. - <property name="wrap">True</property>
  845. - </widget>
  846. - <packing>
  847. - <property name="expand">False</property>
  848. - <property name="fill">False</property>
  849. - <property name="padding">32</property>
  850. - <property name="position">1</property>
  851. - </packing>
  852. - </child>
  853. + <property name="label" translatable="yes">VNC Service</property>
  854. + <property name="response_id">0</property>
  855. + <property name="draw_indicator">True</property>
  856. + <signal name="toggled" handler="toggle_enablevnc"/>
  857. </widget>
  858. <packing>
  859. <property name="expand">False</property>
  860. - <property name="fill">False</property>
  861. </packing>
  862. </child>
  863. <child>
  864. - <widget class="GtkHBox" id="vnc_pass_hbox">
  865. + <widget class="GtkLabel" id="enablevnc_label">
  866. + <property name="width_request">500</property>
  867. <property name="visible">True</property>
  868. - <property name="sensitive">False</property>
  869. <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  870. - <child>
  871. - <widget class="GtkVBox" id="vbox2">
  872. - <property name="visible">True</property>
  873. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  874. - <child>
  875. - <widget class="GtkLabel" id="vnc_pass_label">
  876. - <property name="width_request">400</property>
  877. - <property name="visible">True</property>
  878. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  879. - <property name="xalign">0</property>
  880. - <property name="label" translatable="yes">Enter a password to be used: </property>
  881. - <property name="use_markup">True</property>
  882. - <property name="wrap">True</property>
  883. - </widget>
  884. - <packing>
  885. - <property name="expand">False</property>
  886. - </packing>
  887. - </child>
  888. - <child>
  889. - <widget class="GtkLabel" id="vnc_pass_warning">
  890. - <property name="width_request">400</property>
  891. - <property name="visible">True</property>
  892. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  893. - <property name="xalign">0</property>
  894. - <property name="label" translatable="yes"><b>Note</b>: This password must be at least 6 characters.</property>
  895. - <property name="use_markup">True</property>
  896. - <property name="wrap">True</property>
  897. - </widget>
  898. - <packing>
  899. - <property name="expand">False</property>
  900. - <property name="fill">False</property>
  901. - <property name="position">1</property>
  902. - </packing>
  903. - </child>
  904. - </widget>
  905. - <packing>
  906. - <property name="expand">False</property>
  907. - <property name="fill">False</property>
  908. - </packing>
  909. - </child>
  910. - <child>
  911. - <widget class="GtkEntry" id="vnc_password">
  912. - <property name="width_request">200</property>
  913. - <property name="visible">True</property>
  914. - <property name="can_focus">True</property>
  915. - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  916. - <property name="visibility">False</property>
  917. - <signal name="changed" handler="mythbuntu_password"/>
  918. - </widget>
  919. - <packing>
  920. - <property name="expand">False</property>
  921. - <property name="fill">False</property>
  922. - <property name="position">1</property>
  923. - </packing>
  924. - </child>
  925. - <child>
  926. - <widget class="GtkImage" id="vnc_error_image">
  927. - <property name="visible">True</property>
  928. - <property name="stock">gtk-dialog-error</property>
  929. - </widget>
  930. - <packing>
  931. - <property name="expand">False</property>
  932. - <property name="fill">False</property>
  933. - <property name="position">2</property>
  934. - </packing>
  935. - </child>
  936. + <property name="xalign">0</property>
  937. + <property name="label" translatable="yes">VNC is a very commonly used protocol for graphical remote administration and control of a machine.</property>
  938. + <property name="wrap">True</property>
  939. </widget>
  940. <packing>
  941. <property name="expand">False</property>
  942. <property name="fill">False</property>
  943. + <property name="padding">32</property>
  944. <property name="position">1</property>
  945. </packing>
  946. </child>
  947. @@ -331,7 +242,7 @@
  948. <property name="visible">True</property>
  949. <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
  950. <property name="xalign">0</property>
  951. - <property name="label" translatable="yes">If you will be using a remote Frontend or Backend, you will need to enable MythTV on your ethernet interface. Be sure to also enable a root MySQL password if you choose this option.</property>
  952. + <property name="label" translatable="yes">If you will be using a remote Frontend or Backend, you will need to enable MythTV on your ethernet interface.</property>
  953. <property name="use_markup">True</property>
  954. <property name="wrap">True</property>
  955. </widget>
  956.  
  957. === modified file 'scripts/mythbuntu/ask-mythbuntu'
  958. --- scripts/mythbuntu/ask-mythbuntu 2009-02-14 19:20:57 +0000
  959. +++ scripts/mythbuntu/ask-mythbuntu 2009-02-27 06:39:07 +0000
  960. @@ -38,8 +38,6 @@
  961. db_input high mythtv/mysql_mythtv_password || true
  962. db_input high mythtv/mysql_mythtv_dbname || true
  963. db_input high mythtv/mysql_host || true
  964. - #root password
  965. - db_input high mythtv/mysql_admin_password || true
  966. #mythweb htaccess
  967. db_input high mythweb/enable || true
  968. db_input high mythweb/username || true
  969.  
  970. === modified file 'scripts/mythbuntu/mythbuntu_install.py'
  971. --- scripts/mythbuntu/mythbuntu_install.py 2009-02-14 23:51:16 +0000
  972. +++ scripts/mythbuntu/mythbuntu_install.py 2009-02-27 15:36:25 +0000
  973. @@ -57,11 +57,18 @@
  974. def configure_user(self):
  975. """Configures by the regular user configuration stuff
  976. followed by mythbuntu specific user addons"""
  977. +
  978. + #Before beginning, set the initial root sql pass to the user pass
  979. + self.passwd=self.db.get('passwd/user-password')
  980. + self.set_debconf('mythtv/mysql_admin_password',self.passwd)
  981. + self.set_debconf('mysql-server/root_password',self.passwd)
  982. + self.set_debconf('mysql-server/root_password_again',self.passwd)
  983. +
  984. #Regular ubuntu user configuration
  985. ParentInstall.configure_user(self)
  986.  
  987. #We'll be needing the username, uid, gid
  988. - user = self.db.get('passwd/username')
  989. + self.user = self.db.get('passwd/username')
  990. self.uid = self.gid = ''
  991. try:
  992. self.uid = self.db.get('passwd/user-uid')
  993. @@ -81,7 +88,7 @@
  994. self.gid = int(self.gid)
  995.  
  996. #Create a .mythtv directory
  997. - home_mythtv_dir = self.target + '/home/' + user + '/.mythtv'
  998. + home_mythtv_dir = self.target + '/home/' + self.user + '/.mythtv'
  999. if not os.path.isdir(home_mythtv_dir):
  1000. #in case someone made a symlink or file for the directory
  1001. if os.path.islink(home_mythtv_dir) or os.path.exists(home_mythtv_dir):
  1002. @@ -102,7 +109,7 @@
  1003.  
  1004. #mythtv.desktop autostart
  1005. if 'Frontend' in self.type:
  1006. - config_dir = self.target + '/home/' + user + '/.config'
  1007. + config_dir = self.target + '/home/' + self.user + '/.config'
  1008. autostart_dir = config_dir + '/autostart'
  1009. autostart_link = autostart_dir + '/mythtv.desktop'
  1010. if not os.path.isdir(config_dir):
  1011. @@ -120,7 +127,7 @@
  1012. pass
  1013.  
  1014. #mythtv group membership
  1015. - self.chrex('adduser', user, 'mythtv')
  1016. + self.chrex('adduser', self.user, 'mythtv')
  1017.  
  1018. def configure_ma(self):
  1019. """Overrides module assistant configuration method. Mythbuntu doesn't
  1020. @@ -129,15 +136,10 @@
  1021. self.db.progress('INFO', 'ubiquity/install/mythbuntu')
  1022.  
  1023. #Copy a few debconf questions that were answered in the installer
  1024. - for question in ('mythweb/enable','mythweb/username','mythweb/password',\
  1025. - 'mythtv/mysql_mythtv_user','mythtv/mysql_mythtv_password',\
  1026. - 'mythtv/mysql_mythtv_dbname','mythtv/mysql_host',\
  1027. - 'mythtv/mysql_admin_password'):
  1028. + for question in ('mythtv/mysql_mythtv_user','mythtv/mysql_mythtv_password',\
  1029. + 'mythtv/mysql_mythtv_dbname','mythtv/mysql_host'):
  1030. answer=self.db.get(question)
  1031. self.set_debconf(question,answer)
  1032. - if question == 'mythtv/mysql_admin_password':
  1033. - self.set_debconf('mysql-server/root_password',answer)
  1034. - self.set_debconf('mysql-server/root_password_again',answer)
  1035.  
  1036. #Setup mysql.txt nicely
  1037. os.remove(self.target + '/etc/mythtv/mysql.txt')
  1038. @@ -156,8 +158,11 @@
  1039. self.chrex('invoke-rc.d','mysql','stop')
  1040. self.chrex('umount', '/proc')
  1041.  
  1042. - #Set up authentication on mythweb if necessary
  1043. - self.reconfigure('mythweb')
  1044. + #Mythweb
  1045. + self.set_debconf('mythweb/enable', 'true')
  1046. + self.set_debconf('mythweb/username', self.user)
  1047. + self.set_debconf('mythweb/password', self.passwd)
  1048. + self.reconfigure('mythweb')
  1049.  
  1050. def install_extras(self):
  1051. """Overrides main install_extras function to add in Mythbuntu
  1052. @@ -219,8 +224,8 @@
  1053. bind-address=0.0.0.0"""
  1054. f.close()
  1055. if self.db.get('mythbuntu/x11vnc') == 'true':
  1056. - self.vnc.create_password(self.db.get('mythbuntu/x11vnc_password'))
  1057. - directory = self.target + '/home/' + self.db.get('passwd/username') + '/.vnc'
  1058. + self.vnc.create_password(self.passwd)
  1059. + directory = self.target + '/home/' + self.user + '/.vnc'
  1060. if not os.path.exists(directory):
  1061. os.mkdir(directory)
  1062. shutil.move('/root/.vnc/passwd', directory + '/passwd')
  1063.  
  1064. === modified file 'ubiquity/components/mythbuntu.py'
  1065. --- ubiquity/components/mythbuntu.py 2009-02-14 19:20:57 +0000
  1066. +++ ubiquity/components/mythbuntu.py 2009-02-27 07:35:21 +0000
  1067. @@ -65,7 +65,6 @@
  1068. FilteredCommand.ok_handler(self)
  1069.  
  1070. class MythbuntuPasswords(FilteredCommand):
  1071. -#we are seeding passwords and whether to enable mythweb
  1072.  
  1073. def prepare(self):
  1074. #mythtv passwords
  1075. @@ -77,14 +76,6 @@
  1076. self.frontend.set_password(this_password,answer)
  1077. questions.append('^mythtv/' + this_password)
  1078.  
  1079. - #mythweb passwords
  1080. - passwords = self.frontend.get_mythweb_passwords()
  1081. - for this_password in passwords:
  1082. - answer = self.db.get('mythweb/' + this_password)
  1083. - if answer != '':
  1084. - self.frontend.set_password(this_password,answer)
  1085. - questions.append('^mythweb/' + this_password)
  1086. -
  1087. return (['/usr/share/ubiquity/ask-mythbuntu','passwords'], questions)
  1088.  
  1089. def ok_handler(self):
  1090. @@ -93,14 +84,6 @@
  1091. for this_password in passwords:
  1092. self.preseed('mythtv/' + this_password, passwords[this_password])
  1093.  
  1094. - #mythweb passwords
  1095. - passwords = self.frontend.get_mythweb_passwords()
  1096. - for this_password in passwords:
  1097. - if passwords[this_password] is True or passwords[this_password] is False:
  1098. - self.preseed_bool('mythweb/' + this_password, passwords[this_password])
  1099. - else:
  1100. - self.preseed('mythweb/' + this_password, passwords[this_password])
  1101. -
  1102. FilteredCommand.ok_handler(self)
  1103.  
  1104. class MythbuntuRemote(FilteredCommand):
  1105.  
  1106. === modified file 'ubiquity/frontend/mythbuntu_ui.py'
  1107. --- ubiquity/frontend/mythbuntu_ui.py 2009-02-14 17:55:55 +0000
  1108. +++ ubiquity/frontend/mythbuntu_ui.py 2009-02-27 16:52:38 +0000
  1109. @@ -150,6 +150,7 @@
  1110. self.allow_go_forward(False)
  1111. elif n == 'MythbuntuServices':
  1112. cur = self.mythbuntu_stepServices
  1113. + self.vnc_option_hbox.set_sensitive(len(self.get_password()) >= 6)
  1114. else:
  1115. ParentFrontend.Wizard.set_page(self,n)
  1116. return
  1117. @@ -206,49 +207,6 @@
  1118. new_pass_caller = subprocess.Popen(['pwgen','-s','8'],stdout=subprocess.PIPE)
  1119. self.mysql_password.set_text(string.split(new_pass_caller.communicate()[0])[0])
  1120.  
  1121. - def mythbuntu_password(self,widget):
  1122. - """Checks that certain passwords meet requirements"""
  1123. - #For the services page, the only password we have is the VNC
  1124. - if (widget is not None and widget.get_name() == 'vnc_password'):
  1125. - password= widget.get_text().split(' ')[0]
  1126. - if len(password) >= 6:
  1127. - self.allow_go_forward(True)
  1128. - self.allow_go_backward(True)
  1129. - self.vnc_error_image.hide()
  1130. - else:
  1131. - self.allow_go_forward(False)
  1132. - self.allow_go_backward(False)
  1133. - self.vnc_error_image.show()
  1134. - elif (widget is not None and widget.get_name() == 'mythweb_username'):
  1135. - username = widget.get_text().split(' ')[0]
  1136. - if len(username) >= 1:
  1137. - self.mythweb_user_error_image.hide()
  1138. - else:
  1139. - self.mythweb_user_error_image.show()
  1140. - elif (widget is not None and widget.get_name() == 'mythweb_password'):
  1141. - password = widget.get_text().split(' ')[0]
  1142. - if len(password) >= 1:
  1143. - self.mythweb_pass_error_image.hide()
  1144. - else:
  1145. - self.mythweb_pass_error_image.show()
  1146. -
  1147. - elif (widget is not None and widget.get_name() == 'mysql_root_password'):
  1148. - password = widget.get_text().split(' ')[0]
  1149. - if len(password) >= 1:
  1150. - self.mysql_root_error_image.hide()
  1151. - else:
  1152. - self.mysql_root_error_image.show()
  1153. -
  1154. - #The password check page is much more complex. Pieces have to be
  1155. - #done in a sequential order
  1156. - if (self.usemysqlrootpassword.get_active() or self.usemythwebpassword.get_active()):
  1157. - mysql_root_flag = self.mysql_root_error_image.flags() & gtk.VISIBLE
  1158. - mythweb_user_flag = self.mythweb_user_error_image.flags() & gtk.VISIBLE
  1159. - mythweb_pass_flag = self.mythweb_pass_error_image.flags() & gtk.VISIBLE
  1160. - result = not (mythweb_user_flag | mythweb_pass_flag | mysql_root_flag)
  1161. - self.allow_go_forward(result)
  1162. - self.allow_go_backward(result)
  1163. -
  1164. def do_mythtv_setup(self,widget):
  1165. """Spawn MythTV-Setup binary."""
  1166. self.live_installer.hide()
  1167. @@ -294,7 +252,7 @@
  1168.  
  1169. def set_service(self,name,value):
  1170. """Preseeds the status of a service"""
  1171. - lists = [get_services_dictionary(self),{"x11vnc_password":self.vnc_password}]
  1172. + lists = [get_services_dictionary(self)]
  1173. self._preseed_list(lists,name,value)
  1174.  
  1175. def set_driver(self,name,value):
  1176. @@ -306,14 +264,10 @@
  1177.  
  1178. def set_password(self,name,value):
  1179. """Preseeds a password"""
  1180. - lists = [{'mysql_admin_password':self.mysql_root_password,
  1181. - 'mysql_mythtv_user':self.mysql_user,
  1182. + lists = [{'mysql_mythtv_user':self.mysql_user,
  1183. 'mysql_mythtv_password':self.mysql_password,
  1184. 'mysql_mythtv_dbname':self.mysql_database,
  1185. - 'mysql_host':self.mysql_server},
  1186. - {'enable':self.usemythwebpassword,
  1187. - 'username':self.mythweb_username,
  1188. - 'password':self.mythweb_password}]
  1189. + 'mysql_host':self.mysql_server}]
  1190. self._preseed_list(lists,name,value)
  1191.  
  1192. def set_lirc(self,question,answer):
  1193. @@ -394,7 +348,7 @@
  1194.  
  1195. def get_services(self):
  1196. """Returns the status of all installable services"""
  1197. - return self._build_static_list([get_services_dictionary(self),{'x11vnc_password':self.vnc_password}])
  1198. + return self._build_static_list([get_services_dictionary(self)])
  1199.  
  1200. def get_drivers(self):
  1201. video_drivers=get_graphics_dictionary()
  1202. @@ -408,17 +362,11 @@
  1203. 'tvstandard': self.tvoutstandard}])
  1204.  
  1205. def get_mythtv_passwords(self):
  1206. - return self._build_static_list([{'mysql_admin_password':self.mysql_root_password,
  1207. - 'mysql_mythtv_user':self.mysql_user,
  1208. + return self._build_static_list([{'mysql_mythtv_user':self.mysql_user,
  1209. 'mysql_mythtv_password':self.mysql_password,
  1210. 'mysql_mythtv_dbname':self.mysql_database,
  1211. 'mysql_host':self.mysql_server}])
  1212.  
  1213. - def get_mythweb_passwords(self):
  1214. - return self._build_static_list([{'enable':self.usemythwebpassword,
  1215. - 'username':self.mythweb_username,
  1216. - 'password':self.mythweb_password}])
  1217. -
  1218. def get_lirc(self,type):
  1219. item = {"modules":"","device":"","driver":"","lircd_conf":""}
  1220. if type == "remote":
  1221. @@ -432,20 +380,6 @@
  1222. ##################
  1223. #Called when a widget changes and other GUI elements need to react
  1224.  
  1225. - def toggle_enablevnc(self,widget):
  1226. - """Called when the checkbox to turn on VNC is toggled"""
  1227. - if (self.enablevnc.get_active()):
  1228. - self.vnc_pass_hbox.set_sensitive(True)
  1229. - self.allow_go_forward(False)
  1230. - self.allow_go_backward(False)
  1231. - self.vnc_error_image.show()
  1232. - else:
  1233. - self.vnc_pass_hbox.set_sensitive(False)
  1234. - self.vnc_password.set_text("")
  1235. - self.allow_go_forward(True)
  1236. - self.allow_go_backward(True)
  1237. - self.vnc_error_image.hide()
  1238. -
  1239. def toggle_tv_out (self,widget):
  1240. """Called when the tv-out type is toggled"""
  1241. if (self.tvouttype.get_active() == 0):
  1242. @@ -482,23 +416,17 @@
  1243. """Called whenever a custom type is toggled"""
  1244.  
  1245. if "Master" in self.get_installtype():
  1246. - self.master_backend_expander.hide()
  1247. - self.mysql_server_expander.show()
  1248. self.mysql_option_hbox.show()
  1249. else:
  1250. self.enablemysql.set_active(False)
  1251. - self.master_backend_expander.show()
  1252. - self.mysql_server_expander.hide()
  1253. self.mysql_option_hbox.hide()
  1254.  
  1255. if "Backend" in self.get_installtype():
  1256. - self.mythweb_expander.show()
  1257. self.samba_option_hbox.show()
  1258. self.nfs_option_hbox.show()
  1259. else:
  1260. self.enablesamba.set_active(False)
  1261. self.enablenfs.set_active(False)
  1262. - self.mythweb_expander.hide()
  1263. self.samba_option_hbox.hide()
  1264. self.nfs_option_hbox.hide()
  1265.  
  1266. @@ -531,36 +459,3 @@
  1267. elif widget.get_name() == 'transmitter_list':
  1268. if self.transmitter_list.get_active() == 0:
  1269. self.transmittercontrol.set_active(False)
  1270. -
  1271. - def usemythwebpassword_toggled(self,widget):
  1272. - """Called when the checkbox to set a mythweb password is pressed"""
  1273. - if (self.usemythwebpassword.get_active()):
  1274. - self.mythweb_table.show()
  1275. - self.allow_go_forward(False)
  1276. - self.allow_go_backward(False)
  1277. - self.mythweb_user_error_image.show()
  1278. - self.mythweb_pass_error_image.show()
  1279. - else:
  1280. - self.mythweb_table.hide()
  1281. - self.mythweb_password.set_text("")
  1282. - self.mythweb_username.set_text("")
  1283. - self.mythweb_user_error_image.hide()
  1284. - self.mythweb_pass_error_image.hide()
  1285. - if (not self.usemysqlrootpassword.get_active() or not self.mysql_root_error_image.flags() & gtk.VISIBLE):
  1286. - self.allow_go_forward(True)
  1287. - self.allow_go_backward(True)
  1288. -
  1289. - def usemysqlrootpassword_toggled(self,widget):
  1290. - """Called when the checkbox to set a MySQL root password is pressed"""
  1291. - if (self.usemysqlrootpassword.get_active()):
  1292. - self.mysql_server_hbox.show()
  1293. - self.allow_go_forward(False)
  1294. - self.allow_go_backward(False)
  1295. - self.mysql_root_error_image.show()
  1296. - else:
  1297. - self.mysql_server_hbox.hide()
  1298. - self.mysql_root_password.set_text("")
  1299. - self.mysql_root_error_image.hide()
  1300. - if (not self.usemythwebpassword.get_active() or ((not self.mythweb_pass_error_image.flags() & gtk.VISIBLE) and (not self.mythweb_user_error_image.flags() & gtk.VISIBLE))):
  1301. - self.allow_go_forward(True)
  1302. - self.allow_go_backward(True)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!