Merge lp:~superm1/ubiquity/mythbuntu-plugin-enhance into lp:ubiquity

[Mario Limonciello]

[Mario Limonciello (superm1)]

This converts the mythbuntu frontend entirely into plugins for the gtk frontend. Later on those plugins may be moved out of the ubiquity tree.

[lp:~superm1/ubiquity/mythbuntu-plugin-enhance]

3710. By Mario Limonciello on 2010-01-27

Fix unmount command in chroot_cleanup to actually release /target/dev.

=== modified file 'bin/ubiquity'
--- bin/ubiquity	2010-01-21 09:03:10 +0000
+++ bin/ubiquity	2010-01-27 01:47:13 +0000
@@ -205,11 +205,11 @@
     '''install(frontend=None) -> none
     
     Get the type of frontend to use and load the module for that.
-    If frontend is None, defaults to the first of mythbuntu_ui, 
+    If frontend is None, defaults to the first of 
     gtk_ui, kde_ui, and debconf_ui that exists.
     '''
     if frontend is None:
-        frontends = ['mythbuntu_ui', 'gtk_ui', 'kde_ui', 'debconf_ui']
+        frontends = ['gtk_ui', 'kde_ui', 'debconf_ui']
     else:
         frontends = [frontend]
     chosen = None
@@ -428,7 +428,7 @@
             os.environ['UBIQUITY_DEBUG_CORE'] = '1'
 
     # Clean up old state.
-    for name in ('apt-installed', 'apt-install-direct', 'remove-kernels'):
+    for name in ('apt-installed', 'apt-install-direct', 'remove-kernels', 'apt-removed'):
         osextras.unlink_force(os.path.join('/var/lib/ubiquity', name))
     shutil.rmtree("/var/lib/partman", ignore_errors=True)
 

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2010-01-22 09:17:02 +0000
+++ bin/ubiquity-dm	2010-01-27 01:47:13 +0000
@@ -45,7 +45,7 @@
         # this lets us find out which window manager etc. to launch. Be
         # careful that importing this here will cause the underlying library
         # to try to talk to the X server, which won't go well.
-        frontend_names = ['mythbuntu_ui', 'gtk_ui', 'kde_ui']
+        frontend_names = ['gtk_ui', 'kde_ui']
         self.frontend = None
         for f in frontend_names:
             try:
@@ -108,9 +108,6 @@
             servercommand.append('-nr')
 
         servercommand.extend([self.vt, self.display])
-        if self.frontend == 'mythbuntu_ui':
-            servercommand.append('-dpi')
-            servercommand.append('100')
 
         server = subprocess.Popen(servercommand, stdin=null, stdout=logfile, stderr=logfile, preexec_fn=self.server_preexec)
 
@@ -154,7 +151,7 @@
             dbus_subp.wait()
 
         gconfd_running = False
-        if ((self.frontend == 'gtk_ui' or self.frontend == 'mythbuntu_ui') and
+        if (self.frontend == 'gtk_ui' and
             osextras.find_on_path('gconftool-2')):
             subprocess.call(['gconftool-2', '--spawn'],
                             stdin=null, stdout=logfile, stderr=logfile,
@@ -162,7 +159,7 @@
             gconfd_running = True
 
         extras = []
-        if self.frontend == 'gtk_ui' or self.frontend == 'mythbuntu_ui':
+        if self.frontend == 'gtk_ui':
             gconf_dir = ('xml:readwrite:%s' %
                 os.path.expanduser('~%s/.gconf' %
                 self.username))
@@ -206,7 +203,7 @@
                 gtk.gdk.flush()
             fp.close()
 
-        if self.frontend in ('gtk_ui', 'mythbuntu_ui'):
+        if self.frontend == 'gtk_ui':
             if gconfd_running and osextras.find_on_path('metacity'):
                 wm = subprocess.Popen(['metacity', '--sm-disable'],
                     stdin=null, stdout=logfile, stderr=logfile,
@@ -301,7 +298,7 @@
 except XStartupError:
     sys.exit(1)
 proc = None
-if dm.frontend == 'gtk_ui' or dm.frontend == 'mythbuntu_ui':
+if dm.frontend == 'gtk_ui':
     proc = ['/etc/init.d/gdm', 'start']
 elif dm.frontend == 'kde_ui':
     proc = ['/etc/init.d/kdm', 'start']

=== modified file 'bin/ubiquity-wrapper'
--- bin/ubiquity-wrapper	2010-01-06 07:31:36 +0000
+++ bin/ubiquity-wrapper	2010-01-27 01:47:13 +0000
@@ -53,7 +53,7 @@
             # frontend module.
             import imp
             import ubiquity.frontend
-            frontend_names = ['mythbuntu_ui', 'gtk_ui', 'kde_ui']
+            frontend_names = ['gtk_ui', 'kde_ui']
             for f in frontend_names:
                 try:
                     imp.find_module(f, ubiquity.frontend.__path__)
@@ -62,7 +62,7 @@
                 except ImportError:
                     pass
 
-        if frontend in ('gtk_ui', 'mythbuntu_ui'):
+        if frontend == 'gtk_ui':
             toexec = ['gksudo', '--preserve-env']
             if desktop:
                 toexec.extend(['--desktop', desktop])

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-26 12:10:57 +0000
+++ debian/changelog	2010-01-27 01:47:14 +0000
@@ -4,6 +4,24 @@
   * Add a new template, ubiquity/only-show-installable-languages for modifying
     the behavior of what languages to offer on an invokation based upon
     what's installed or "available" to install according to an apt cache.
+  * Expose extra functions get and substitute to plugins via it's
+    second argument (currently called Progress).
+  * Drop extraneous handlers from Mythbuntu pages.
+  * Move all handlers from mythbuntu_ui directly into plugins themselves.
+  * Move some functions from the install.py script into a new file,
+    install_misc.  The intention here is that they can then be used more
+    directly by ubiquity plugins.
+  * Add a new method for package removals to install_misc to allow
+    plugins to mark packages to be removed later in remove_extras.
+  * Modify the Mythbuntu services plugin to not even offer VNC if a short
+    pw. (LP: #469312)
+  * Convert most of the functions from mythbuntu_install.py into plugin
+    type Install methods.
+  * Support using pkgsel/install-language-support preseeded to false to
+    ignore installation of language packs (just like alternates).
+  * Drop mythbuntu_ui and all references to it.  The (former) Mythbuntu 
+    frontend is now fully pluggable into ubiquity's gtk_ui on it's own.
+  * Fix unmount command in chroot_cleanup to actually release /target/dev.
 
   [ Evan Dandrea ]
   * Support getting the timezone from a geoip server (LP: #229884).
@@ -43,6 +61,8 @@
   [ Mario Limonciello ]
   * Remove another reference to a long dead xserver-xorg debconf question.
   * Don't try reconfiguring LRM, it's been superceded by DKMS based packages.
+  * Add a new top function to the Controller to allow toggling the
+    visibility of the live installer from a plugin.
 
  -- Evan Dandrea <[e-mail]>  Fri, 22 Jan 2010 09:24:12 +0000
 

=== modified file 'debian/rules'
--- debian/rules	2010-01-21 08:49:32 +0000
+++ debian/rules	2010-01-27 01:47:14 +0000
@@ -111,7 +111,6 @@
 	# Bits of manual installation that can't be done by dh_install
 	
 	# Get rid of duplicate mythbuntu scripts and move some mythbuntu stuff around
-	mv debian/ubiquity-frontend-mythbuntu/usr/share/applications/ubiquity-mythbuntu.desktop debian/ubiquity-frontend-mythbuntu/usr/share/applications/ubiquity-gtkui.desktop
 	mv debian/ubiquity-frontend-mythbuntu/usr/share/pixmaps/ubiquity-mythbuntu.png debian/ubiquity-frontend-mythbuntu/usr/share/pixmaps/ubiquity.png
 	rm -rf debian/ubiquity/usr/share/ubiquity/mythbuntu
 

=== modified file 'debian/ubiquity-frontend-mythbuntu.install'
--- debian/ubiquity-frontend-mythbuntu.install	2009-09-01 15:22:02 +0000
+++ debian/ubiquity-frontend-mythbuntu.install	2010-01-27 01:47:14 +0000
@@ -1,16 +1,16 @@
 #install scripts
 scripts/mythbuntu/* usr/share/ubiquity
 
+#target config
+scripts/mythbuntu/60mythbuntu_user usr/lib/ubiquity/target-config
+
 #individual python components
 #Summary generation Page
 #GTK->Final installer glue
 ubiquity/components/myth-*.py usr/lib/ubiquity/plugins
-ubiquity/components/mythbuntu_install.py usr/lib/ubiquity/ubiquity/components
 
 #GTK
-ubiquity/frontend/mythbuntu_ui.py usr/lib/ubiquity/ubiquity/frontend
 gui/gtk/mythbuntu*.ui usr/share/ubiquity/gtk
 
 #Desktop install file
-desktop/ubiquity-mythbuntu.desktop usr/share/applications
 desktop/ubiquity-mythbuntu.png usr/share/pixmaps

=== modified file 'debian/ubiquity-frontend-mythbuntu.preinst'
--- debian/ubiquity-frontend-mythbuntu.preinst	2009-05-29 09:46:13 +0000
+++ debian/ubiquity-frontend-mythbuntu.preinst	2010-01-27 01:47:14 +0000
@@ -7,9 +7,11 @@
 case "$1" in
     install|upgrade)
         dpkg-divert --package ubiquity-frontend-mythbuntu --add --rename \
-                    --divert /usr/share/ubiquity/ubiquity-gtkui.desktop.diverted /usr/share/applications/ubiquity-gtkui.desktop
-        dpkg-divert --package ubiquity-frontend-mythbuntu --add --rename \
                     --divert /usr/share/pixmaps/ubiquity-diverted.png /usr/share/pixmaps/ubiquity.png
         ;;
+    upgrade)
+        dpkg-divert --package ubiquity-frontend-mythbuntu --remove \
+                    --rename --divert /usr/share/ubiquity/ubiquity-gtkui.desktop.diverted /usr/share/applications/ubiquity-gtkui.desktop
+        ;;
 esac
 

=== modified file 'desktop/Makefile.am'
--- desktop/Makefile.am	2009-06-24 13:57:01 +0000
+++ desktop/Makefile.am	2010-01-27 01:47:14 +0000
@@ -6,8 +6,7 @@
 	oem-config-prepare-gtk.desktop.in \
 	oem-config-prepare-kde.desktop.in \
 	ubiquity-gtkui.desktop.in \
-	ubiquity-kdeui.desktop.in \
-	ubiquity-mythbuntu.desktop.in
+	ubiquity-kdeui.desktop.in
 
 EXTRA_DIST = $(desktop_in_files)
 

=== modified file 'desktop/Makefile.in'
--- desktop/Makefile.in	2009-08-25 12:37:56 +0000
+++ desktop/Makefile.in	2010-01-27 01:47:14 +0000
@@ -197,8 +197,7 @@
 	oem-config-prepare-gtk.desktop.in \
 	oem-config-prepare-kde.desktop.in \
 	ubiquity-gtkui.desktop.in \
-	ubiquity-kdeui.desktop.in \
-	ubiquity-mythbuntu.desktop.in
+	ubiquity-kdeui.desktop.in
 
 EXTRA_DIST = $(desktop_in_files)
 CLEANFILES = $(desktop_DATA)

=== removed file 'desktop/ubiquity-mythbuntu.desktop.in'
--- desktop/ubiquity-mythbuntu.desktop.in	2009-07-15 10:49:32 +0000
+++ desktop/ubiquity-mythbuntu.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-# Do not translate the word "RELEASE".  It is used as a marker by casper.
-_Name=Install RELEASE
-_Comment=Install this system permanently to your hard disk
-Exec=ubiquity mythbuntu_ui
-Icon=ubiquity.png
-Terminal=false
-Categories=GTK;System;Settings;
-OnlyShowIn=GNOME;XFCE;
-#X-Ubuntu-Gettext-Domain=ubiquity

=== modified file 'gui/gtk/mythbuntu_stepCustomInstallType.ui'
--- gui/gtk/mythbuntu_stepCustomInstallType.ui	2009-08-14 15:22:14 +0000
+++ gui/gtk/mythbuntu_stepCustomInstallType.ui	2010-01-27 01:47:14 +0000
@@ -63,7 +63,6 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_customtype"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -94,7 +93,6 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">master_be_fe</property>
-                <signal name="toggled" handler="toggle_customtype"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -126,7 +124,6 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">master_be_fe</property>
-                <signal name="toggled" handler="toggle_customtype"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -157,7 +154,6 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">master_be_fe</property>
-                <signal name="toggled" handler="toggle_customtype"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -188,7 +184,6 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">master_be_fe</property>
-                <signal name="toggled" handler="toggle_customtype"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'gui/gtk/mythbuntu_stepServices.ui'
--- gui/gtk/mythbuntu_stepServices.ui	2009-08-14 15:22:14 +0000
+++ gui/gtk/mythbuntu_stepServices.ui	2010-01-27 01:47:14 +0000
@@ -64,7 +64,6 @@
                 <property name="receives_default">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="draw_indicator">True</property>
-                <signal name="toggled" handler="toggle_enablevnc"/>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'scripts/install.py'
--- scripts/install.py	2010-01-26 13:18:36 +0000
+++ scripts/install.py	2010-01-27 01:47:14 +0000
@@ -46,6 +46,7 @@
 sys.path.insert(0, '/usr/lib/ubiquity')
 
 from ubiquity import misc
+from ubiquity import install_misc
 from ubiquity import osextras
 from ubiquity import plugin_manager
 from ubiquity.casper import get_casper
@@ -53,15 +54,6 @@
                                 hw_detect, check_kernels, \
                                 migrationassistant_apply
 
-def debconf_disconnect():
-    """Disconnect from debconf. This is only to be used as a subprocess
-    preexec_fn helper."""
-    os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
-    if 'DEBIAN_HAS_FRONTEND' in os.environ:
-        del os.environ['DEBIAN_HAS_FRONTEND']
-    if 'DEBCONF_USE_CDEBCONF' in os.environ:
-        # Probably not a good idea to use this in /target too ...
-        del os.environ['DEBCONF_USE_CDEBCONF']
 
 class DebconfFetchProgress(FetchProgress):
     """An object that reports apt's fetching progress using debconf."""
@@ -608,7 +600,7 @@
                     difference.add(pkg)
 
         # Keep packages we explicitly installed.
-        keep = self.query_recorded_installed()
+        keep = install_misc.query_recorded_installed()
         arch, subarch = self.archdetect()
 
         # Less than ideal.  Since we cannot know which bootloader we'll need
@@ -1002,97 +994,6 @@
                 raise InstallStepError(
                     "Failed to detach loopback device %s" % dev)
 
-
-    def chroot_setup(self, x11=False):
-        """Set up /target for safe package management operations."""
-        if self.target == '/':
-            return
-
-        policy_rc_d = os.path.join(self.target, 'usr/sbin/policy-rc.d')
-        f = open(policy_rc_d, 'w')
-        print >>f, """\
-#!/bin/sh
-exit 101"""
-        f.close()
-        os.chmod(policy_rc_d, 0755)
-
-        start_stop_daemon = os.path.join(self.target, 'sbin/start-stop-daemon')
-        if os.path.exists(start_stop_daemon):
-            os.rename(start_stop_daemon, '%s.REAL' % start_stop_daemon)
-        f = open(start_stop_daemon, 'w')
-        print >>f, """\
-#!/bin/sh
-echo 1>&2
-echo 'Warning: Fake start-stop-daemon called, doing nothing.' 1>&2
-exit 0"""
-        f.close()
-        os.chmod(start_stop_daemon, 0755)
-
-        initctl = os.path.join(self.target, 'sbin/initctl')
-        if os.path.exists(initctl):
-            os.rename(initctl, '%s.REAL' % initctl)
-            f = open(initctl, 'w')
-            print >>f, """\
-#!/bin/sh
-echo 1>&2
-echo 'Warning: Fake initctl called, doing nothing.' 1>&2
-exit 0"""
-            f.close()
-            os.chmod(initctl, 0755)
-
-        if not os.path.exists(os.path.join(self.target, 'proc/cmdline')):
-            self.chrex('mount', '-t', 'proc', 'proc', '/proc')
-        if not os.path.exists(os.path.join(self.target, 'sys/devices')):
-            self.chrex('mount', '-t', 'sysfs', 'sysfs', '/sys')
-        misc.execute('mount', '--bind', '/dev', os.path.join(self.target, 'dev'))
-
-        if x11 and 'DISPLAY' in os.environ:
-            if 'SUDO_USER' in os.environ:
-                xauthority = os.path.expanduser('~%s/.Xauthority' %
-                                                os.environ['SUDO_USER'])
-            else:
-                xauthority = os.path.expanduser('~/.Xauthority')
-            if os.path.exists(xauthority):
-                shutil.copy(xauthority,
-                            os.path.join(self.target, 'root/.Xauthority'))
-
-            if not os.path.isdir(os.path.join(self.target, 'tmp/.X11-unix')):
-                os.mkdir(os.path.join(self.target, 'tmp/.X11-unix'))
-            misc.execute('mount', '--bind', '/tmp/.X11-unix',
-                         os.path.join(self.target, 'tmp/.X11-unix'))
-
-    def chroot_cleanup(self, x11=False):
-        """Undo the work done by chroot_setup."""
-        if self.target == '/':
-            return
-
-        if x11 and 'DISPLAY' in os.environ:
-            misc.execute('umount', os.path.join(self.target, 'tmp/.X11-unix'))
-            try:
-                os.rmdir(os.path.join(self.target, 'tmp/.X11-unix'))
-            except OSError:
-                pass
-            osextras.unlink_force(os.path.join(self.target,
-                                               'root/.Xauthority'))
-
-        self.chrex('umount', '/dev')
-        self.chrex('umount', '/sys')
-        self.chrex('umount', '/proc')
-
-        initctl = os.path.join(self.target, 'sbin/initctl')
-        if os.path.exists('%s.REAL' % initctl):
-            os.rename('%s.REAL' % initctl, initctl)
-
-        start_stop_daemon = os.path.join(self.target, 'sbin/start-stop-daemon')
-        if os.path.exists('%s.REAL' % start_stop_daemon):
-            os.rename('%s.REAL' % start_stop_daemon, start_stop_daemon)
-        else:
-            osextras.unlink_force(start_stop_daemon)
-
-        policy_rc_d = os.path.join(self.target, 'usr/sbin/policy-rc.d')
-        osextras.unlink_force(policy_rc_d)
-
-
     def run_target_config_hooks(self):
         """Run hook scripts from /usr/lib/ubiquity/target-config. This allows
         casper to hook into us and repeat bits of its configuration in the
@@ -1127,6 +1028,10 @@
                 self._db = db
             def info(self, title):
                 self._db.progress('INFO', title)
+            def get(self, question):
+                return self._db.get(question)
+            def substitute(self, template, substr, data):
+                self._db.subst(template, substr, data)
 
         for plugin in self.plugins:
             self.db.progress('SET', count)
@@ -1222,32 +1127,6 @@
         except KeyError:
             return None
 
-
-    def record_installed(self, pkgs):
-        """Record which packages we've explicitly installed so that we don't
-        try to remove them later."""
-
-        record_file = "/var/lib/ubiquity/apt-installed"
-        if not os.path.exists(os.path.dirname(record_file)):
-            os.makedirs(os.path.dirname(record_file))
-        record = open(record_file, "a")
-
-        for pkg in pkgs:
-            print >>record, pkg
-
-        record.close()
-
-
-    def query_recorded_installed(self):
-        apt_installed = set()
-        if os.path.exists("/var/lib/ubiquity/apt-installed"):
-            record_file = open("/var/lib/ubiquity/apt-installed")
-            for line in record_file:
-                apt_installed.add(line.strip())
-            record_file.close()
-        return apt_installed
-
-
     def mark_install(self, cache, pkg):
         cachedpkg = self.get_cache_pkg(cache, pkg)
         if cachedpkg is not None and not cachedpkg.isInstalled:
@@ -1270,11 +1149,17 @@
 
     def select_language_packs(self):
         try:
+            master_disable = self.db.get('pkgsel/install-language-support')
+            if master_disable != '' and not misc.create_bool(master_disable):
+                return
+        except debconf.DebconfError:
+            pass
+        try:
             keep_packages = self.db.get('ubiquity/keep-installed')
             keep_packages = keep_packages.replace(',', '').split()
             syslog.syslog('keeping packages due to preseeding: %s' %
                           ' '.join(keep_packages))
-            self.record_installed(keep_packages)
+            install_misc.record_installed(keep_packages)
         except debconf.DebconfError:
             pass
 
@@ -1359,7 +1244,7 @@
 
         del cache
 
-        self.record_installed(to_install)
+        install_misc.record_installed(to_install)
         self.langpacks = to_install
 
     def install_language_packs(self):
@@ -1416,7 +1301,7 @@
                 if os.path.isdir(os.path.join(home, homedir, '.ecryptfs')):
                     syslog.syslog('ecryptfs already in use in %s' %
                                   os.path.join(home, homedir))
-                    self.record_installed(['ecryptfs-utils'])
+                    install_misc.record_installed(['ecryptfs-utils'])
                     break
 
 
@@ -1466,14 +1351,14 @@
         hardware system in which has been installed on and need some
         automatic configurations to get work."""
 
-        self.chroot_setup()
+        install_misc.chroot_setup(self.target)
         try:
             dbfilter = hw_detect.HwDetect(None, self.db)
             ret = dbfilter.run_command(auto_process=True)
             if ret != 0:
                 raise InstallStepError("HwDetect failed with code %d" % ret)
         finally:
-            self.chroot_cleanup()
+            install_misc.chroot_cleanup(self.target)
 
         self.db.progress('INFO', 'ubiquity/install/hardware')
 
@@ -1514,16 +1399,16 @@
                                            'etc/popularity-contest.conf'))
         try:
             participate = self.db.get('popularity-contest/participate')
-            self.set_debconf('popularity-contest/participate', participate)
+            install_misc.set_debconf(self.target, 'popularity-contest/participate', participate, self.db)
         except debconf.DebconfError:
             pass
 
         osextras.unlink_force(os.path.join(self.target, 'etc/papersize'))
         subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', self.target,
                          'ucf', '--purge', '/etc/papersize'],
-                        preexec_fn=debconf_disconnect, close_fds=True)
+                        preexec_fn=install_misc.debconf_disconnect, close_fds=True)
         try:
-            self.set_debconf('libpaper/defaultpaper', '')
+            install_misc.set_debconf(self.target, 'libpaper/defaultpaper', '', self.db)
         except debconf.DebconfError:
             pass
 
@@ -1532,8 +1417,8 @@
         osextras.unlink_force(os.path.join(
             self.target, 'etc/ssl/private/ssl-cert-snakeoil.key'))
 
-        self.chroot_setup(x11=True)
-        self.chrex('dpkg-divert', '--package', 'ubiquity', '--rename',
+        install_misc.chroot_setup(self.target, x11=True)
+        install_misc.chrex(self.target,'dpkg-divert', '--package', 'ubiquity', '--rename',
                    '--quiet', '--add', '/usr/sbin/update-initramfs')
         try:
             os.symlink('/bin/true', os.path.join(self.target,
@@ -1550,14 +1435,14 @@
 
         try:
             for package in packages:
-                self.reconfigure(package)
+                install_misc.reconfigure(self.target, package)
         finally:
             osextras.unlink_force(os.path.join(self.target,
                                                'usr/sbin/update-initramfs'))
-            self.chrex('dpkg-divert', '--package', 'ubiquity', '--rename',
+            install_misc.chrex(self.target,'dpkg-divert', '--package', 'ubiquity', '--rename',
                        '--quiet', '--remove', '/usr/sbin/update-initramfs')
-            self.chrex('update-initramfs', '-c', '-k', self.kernel_version)
-            self.chroot_cleanup(x11=True)
+            install_misc.chrex(self.target,'update-initramfs', '-c', '-k', self.kernel_version)
+            install_misc.chroot_cleanup(self.target, x11=True)
 
         # Fix up kernel symlinks now that the initrd exists. Depending on
         # the architecture, these may be in / or in /boot.
@@ -1603,25 +1488,6 @@
                         continue
                 os.symlink(linksrc, linkdst)
 
-
-    def get_all_interfaces(self):
-        """Get all non-local network interfaces."""
-        ifs = []
-        ifs_file = open('/proc/net/dev')
-        # eat header
-        ifs_file.readline()
-        ifs_file.readline()
-
-        for line in ifs_file:
-            name = re.match('(.*?(?::\d+)?):', line.strip()).group(1)
-            if name == 'lo':
-                continue
-            ifs.append(name)
-
-        ifs_file.close()
-        return ifs
-
-
     def configure_network(self):
         """Automatically configure the network.
 
@@ -1695,7 +1561,7 @@
 
             if_names = {}
             sock = socket.socket(socket.SOCK_DGRAM)
-            interfaces = self.get_all_interfaces()
+            interfaces = install_misc.get_all_interfaces()
             for i in range(len(interfaces)):
                 if_names[interfaces[i]] = struct.unpack('H6s',
                     fcntl.ioctl(sock.fileno(), SIOCGIFHWADDR,
@@ -1868,7 +1734,7 @@
                 self.db, 'ubiquity/install/title',
                 'ubiquity/install/apt_info',
                 'ubiquity/install/apt_error_install')
-        self.chroot_setup()
+        install_misc.chroot_setup(self.target)
         commit_error = None
         try:
             try:
@@ -1889,7 +1755,7 @@
                     syslog.syslog(syslog.LOG_ERR, line)
                 commit_error = str(e)
         finally:
-            self.chroot_cleanup()
+            install_misc.chroot_cleanup(self.target)
         self.db.progress('SET', 10)
 
         cache.open(None)
@@ -2040,7 +1906,7 @@
         installprogress = DebconfInstallProgress(
             self.db, 'ubiquity/install/title', 'ubiquity/install/apt_info',
             'ubiquity/install/apt_error_remove')
-        self.chroot_setup()
+        install_misc.chroot_setup(self.target)
         commit_error = None
         try:
             try:
@@ -2054,7 +1920,7 @@
                     syslog.syslog(syslog.LOG_ERR, line)
                 commit_error = str(e)
         finally:
-            self.chroot_cleanup()
+            install_misc.chroot_cleanup(self.target)
         self.db.progress('SET', 5)
 
         cache.open(None)
@@ -2160,7 +2026,7 @@
         self.db.progress('REGION', 2, 5)
         try:
             if remove_kernels:
-                self.do_remove(remove_kernels, recursive=True)
+                install_misc.record_removed(remove_kernels, recursive=True)
         except:
             self.db.progress('STOP')
             raise
@@ -2226,7 +2092,7 @@
         if not found_cdrom:
             os.rename("%s.apt-setup" % sources_list, sources_list)
 
-        self.do_install(self.query_recorded_installed())
+        self.do_install(install_misc.query_recorded_installed())
 
         if found_cdrom:
             os.rename("%s.apt-setup" % sources_list, sources_list)
@@ -2247,10 +2113,10 @@
                         if os.path.exists(os.path.join(self.target,
                                                        desktop_file)):
                             desktop_base = os.path.basename(desktop_file)
-                            self.chrex('install', '-d',
+                            install_misc.chrex(self.target,'install', '-d',
                                        '-o', 'oem', '-g', 'oem',
                                        '/home/oem/Desktop')
-                            self.chrex('install', '-o', 'oem', '-g', 'oem',
+                            install_misc.chrex(self.target,'install', '-o', 'oem', '-g', 'oem',
                                        '/%s' % desktop_file,
                                        '/home/oem/Desktop/%s' % desktop_base)
                             break
@@ -2259,13 +2125,16 @@
                 # This mimics the behavior in 01oem-config-udeb.
                 di_locale = self.db.get('debian-installer/locale')
                 if di_locale:
-                    self.set_debconf('debian-installer/locale', di_locale)
-
+                    install_misc.set_debconf(self.target, 'debian-installer/locale', di_locale, self.db)
                 #in an automated install, this key needs to carry over
                 installable_lang = self.db.get('ubiquity/only-show-installable-languages')
                 if installable_lang:
+<<<<<<< TREE
                     self.set_debconf('ubiquity/only-show-installable-languages',
                                      installable_lang)
+=======
+                    install_misc.set_debconf(self.target, 'ubiquity/only-show-installable-languages', self.db)
+>>>>>>> MERGE-SOURCE
         except debconf.DebconfError:
             pass
 
@@ -2303,7 +2172,7 @@
             difference = set()
 
         # Keep packages we explicitly installed.
-        keep = self.query_recorded_installed()
+        keep = install_misc.query_recorded_installed()
 
         arch, subarch = self.archdetect()
 
@@ -2336,11 +2205,15 @@
                     difference.add(pkg)
             del cache
 
+        install_misc.record_removed(difference)
+
         # Don't worry about failures removing packages; it will be easier
         # for the user to sort them out with a graphical package manager (or
         # whatever) after installation than it will be to try to deal with
         # them automatically here.
-        self.do_remove(difference)
+        (regular, recursive) = install_misc.query_recorded_removed()
+        self.do_remove(regular)
+        self.do_remove(recursive, recursive=True)
 
     def remove_broken_cdrom(self):
         if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
@@ -2494,14 +2367,14 @@
         if not os.path.exists(os.path.join(self.target, 'etc/init.d/apparmor')):
             syslog.syslog('Apparmor is not installed, so not generating cache.')
             return
-        self.chrex('mount', '-t', 'proc', 'proc', '/proc')
-        self.chrex('mount', '-t', 'sysfs', 'sysfs', '/sys')
-        self.chrex('mount', '-t', 'securityfs',
+        install_misc.chrex(self.target,'mount', '-t', 'proc', 'proc', '/proc')
+        install_misc.chrex(self.target,'mount', '-t', 'sysfs', 'sysfs', '/sys')
+        install_misc.chrex(self.target,'mount', '-t', 'securityfs',
                    'securityfs', '/sys/kernel/security')
-        self.chrex('/etc/init.d/apparmor', 'recache')
-        self.chrex('umount', '/proc')
-        self.chrex('umount', '/sys/kernel/security')
-        self.chrex('umount', '/sys')
+        install_misc.chrex(self.target,'/etc/init.d/apparmor', 'recache')
+        install_misc.chrex(self.target,'umount', '/proc')
+        install_misc.chrex(self.target,'umount', '/sys/kernel/security')
+        install_misc.chrex(self.target,'umount', '/sys')
 
     def cleanup(self):
         """Miscellaneous cleanup tasks."""
@@ -2522,11 +2395,6 @@
             self.umount_source()
 
 
-    def chrex(self, *args):
-        """executes commands on chroot system (provided by *args)."""
-        return misc.execute('chroot', self.target, *args)
-
-
     def copy_debconf(self, package):
         """setting debconf database into installed system."""
 
@@ -2541,39 +2409,6 @@
                      '--config=Driver:File','--config=Filename:' + targetdb)
 
 
-    def set_debconf(self, question, value):
-        try:
-            if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
-                dccomm = None
-                dc = self.db
-            else:
-                dccomm = subprocess.Popen(['log-output', '-t', 'ubiquity',
-                                           '--pass-stdout',
-                                           'chroot', self.target,
-                                           'debconf-communicate',
-                                           '-fnoninteractive', 'ubiquity'],
-                                          stdin=subprocess.PIPE,
-                                          stdout=subprocess.PIPE, close_fds=True)
-                dc = debconf.Debconf(read=dccomm.stdout, write=dccomm.stdin)
-            dc.set(question, value)
-            dc.fset(question, 'seen', 'true')
-        finally:
-            if dccomm:
-                dccomm.stdin.close()
-                dccomm.wait()
-
-
-    def reconfigure_preexec(self):
-        debconf_disconnect()
-        os.environ['XAUTHORITY'] = '/root/.Xauthority'
-
-    def reconfigure(self, package):
-        """executes a dpkg-reconfigure into installed system to each
-        package which provided by args."""
-        subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', self.target,
-                         'dpkg-reconfigure', '-fnoninteractive', package],
-                        preexec_fn=self.reconfigure_preexec, close_fds=True)
-
 
 if __name__ == '__main__':
     if not os.path.exists('/var/lib/ubiquity'):

=== added file 'scripts/mythbuntu/60mythbuntu_user'
--- scripts/mythbuntu/60mythbuntu_user	1970-01-01 00:00:00 +0000
+++ scripts/mythbuntu/60mythbuntu_user	2010-01-27 01:47:14 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+. /usr/share/debconf/confmodule
+
+# The mythbuntu plugins make changes in the HOME of the new user before
+# it's made, so some things need to be cleaned up
+
+#TODO 01-10: remove me.  I'm a hack, mostly because usersetup is still not a
+#ubiquity plugin.  That appears to be a pretty big task though, so i'll
+#get by for now.
+
+db_get passwd/username
+CHROOT="chroot /target"
+TARGET_USERNAME="$RET"
+TARGET_HOME=$($CHROOT getent passwd $TARGET_USERNAME | cut -d : -f6)
+
+$CHROOT adduser $TARGET_USERNAME mythtv
+$CHROOT adduser $TARGET_USERNAME video
+$CHROOT chown 1000:1000 $TARGET_HOME -R

=== modified file 'scripts/mythbuntu/mythbuntu-setup'
--- scripts/mythbuntu/mythbuntu-setup	2009-12-10 15:32:58 +0000
+++ scripts/mythbuntu/mythbuntu-setup	2010-01-27 01:47:14 +0000
@@ -38,6 +38,6 @@
 
 #Stop MySQL if we started it
 if [ -f $ROOT/etc/mysql/debian.cnf ]; then
-    $log unmount /var/run/mysqld
+    $log umount $ROOT/var/run/mysqld
     $log $chroot $ROOT mysqladmin --defaults-file=/etc/mysql/debian.cnf shutdown
 fi

=== removed file 'scripts/mythbuntu/mythbuntu_install.py'
--- scripts/mythbuntu/mythbuntu_install.py	2010-01-18 07:14:22 +0000
+++ scripts/mythbuntu/mythbuntu_install.py	1970-01-01 00:00:00 +0000
@@ -1,389 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
-
-# Copyright (C) 2005 Javier Carranza and others for Guadalinex
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd.
-# Copyright (C) 2007-2009 Mario Limonciello
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import sys
-import os
-import errno
-import re
-import syslog
-import debconf
-import shutil
-import XKit.xutils
-import subprocess
-
-import string
-
-sys.path.insert(0, '/usr/lib/ubiquity')
-
-from ubiquity import osextras
-from install import Install as ParentInstall
-from install import InstallStepError
-from ubiquity.components import mythbuntu_install
-
-from mythbuntu_common.lirc import LircHandler
-from mythbuntu_common.vnc import VNCHandler
-
-class Install(ParentInstall):
-
-    def __init__(self):
-        """Initializes the Mythbuntu installer extra objects"""
-
-        #Configure Parent cclass First so we can override things
-        ParentInstall.__init__(self)
-
-        self.lirc=LircHandler()
-        self.vnc=VNCHandler()
-        self.type = self.db.get('mythbuntu/install_type')
-
-        #This forces install_langpacks to do Nothing
-        self.langpacks={}
-
-    def configure_user(self):
-        """Configures by the regular user configuration stuff
-        followed by mythbuntu specific user addons"""
-
-        #Before beginning, set the initial root sql pass to the user pass
-        self.passwd=self.db.get('passwd/user-password')
-        self.set_debconf('mythtv/mysql_admin_password',self.passwd)
-        self.set_debconf('mysql-server/root_password',self.passwd)
-        self.set_debconf('mysql-server/root_password_again',self.passwd)
-
-        #Regular ubuntu user configuration
-        ParentInstall.configure_user(self)
-
-        #We'll be needing the username, uid, gid
-        self.user = self.db.get('passwd/username')
-        self.uid = self.gid = ''
-        try:
-            self.uid = self.db.get('passwd/user-uid')
-        except debconf.DebconfError:
-            pass
-        try:
-            self.gid = self.db.get('passwd/user-gid')
-        except debconf.DebconfError:
-            pass
-        if self.uid == '':
-            self.uid = 1000
-        else:
-            self.uid = int(self.uid)
-        if self.gid == '':
-            self.gid = 1000
-        else:
-            self.gid = int(self.gid)
-
-        #Create a .mythtv directory
-        home_mythtv_dir = self.target + '/home/' + self.user + '/.mythtv'
-        if not os.path.isdir(home_mythtv_dir):
-            #in case someone made a symlink or file for the directory
-            if os.path.islink(home_mythtv_dir) or os.path.exists(home_mythtv_dir):
-                os.remove(home_mythtv_dir)
-            os.mkdir(home_mythtv_dir)
-            os.chown(home_mythtv_dir,self.uid,self.gid)
-
-        #Remove mysql.txt from home directory if it's there, then make one
-        sql_txt= home_mythtv_dir + '/mysql.txt'
-        if os.path.islink(sql_txt) or os.path.exists(sql_txt):
-            os.remove(sql_txt)
-        try:
-            os.symlink('/etc/mythtv/mysql.txt',sql_txt)
-        except OSError:
-            #on a live disk there is a chance this was a broken link
-            #depending on what the user did in the livefs
-            pass
-
-        #mythtv.desktop autostart
-        if 'Frontend' in self.type:
-            config_dir = self.target + '/home/' + self.user + '/.config'
-            autostart_dir =  config_dir + '/autostart'
-            autostart_link = autostart_dir + '/mythtv.desktop'
-            if not os.path.isdir(config_dir):
-                os.makedirs(config_dir)
-                os.chown(config_dir,self.uid,self.gid)
-            if not os.path.isdir(autostart_dir):
-                os.makedirs(autostart_dir)
-                os.chown(autostart_dir,self.uid,self.gid)
-            elif os.path.islink(autostart_link) or os.path.exists(autostart_link):
-                os.remove(autostart_link)
-            try:
-                os.symlink('/usr/share/applications/mythtv.desktop',autostart_link)
-            except OSError:
-                #on a live disk, this will appear a broken link, but it works
-                pass
-
-        #group membership
-        self.chrex('adduser', self.user, 'mythtv')
-        self.chrex('adduser', self.user, 'video')
-
-    def configure_ma(self):
-        """Overrides module assistant configuration method.  Mythbuntu doesn't
-           use module assistant, but we can instead run MySQL and mythweb config
-           here"""
-        self.db.progress('INFO', 'ubiquity/install/mythbuntu')
-
-        #Copy a few debconf questions that were answered in the installer
-        for question in ('mythtv/mysql_mythtv_user','mythtv/mysql_mythtv_password',\
-                         'mythtv/mysql_mythtv_dbname','mythtv/mysql_host'):
-            answer=self.db.get(question)
-            self.set_debconf(question,answer)
-
-        #Setup mysql.txt nicely
-        os.remove(self.target + '/etc/mythtv/mysql.txt')
-        self.reconfigure('mythtv-common')
-
-        #only reconfigure database if appropriate
-        if 'Master' in self.type:
-            #Prepare
-
-            #Setup database
-            self.reconfigure('mysql-server-5.1')
-            proc=subprocess.Popen(['chroot',self.target,'mysqld'])
-            self.reconfigure('mythtv-database')
-
-            #Cleanup
-            self.chrex('mysqladmin','--defaults-file=/etc/mysql/debian.cnf','shutdown')
-            proc.communicate()
-
-            #Mythweb
-            self.set_debconf('mythweb/enable', 'true')
-            self.set_debconf('mythweb/username', self.user)
-            self.set_debconf('mythweb/password', self.passwd)
-            self.reconfigure('mythweb')
-
-    def install_extras(self):
-        """Overrides main install_extras function to add in Mythbuntu
-           drivers and services, and then call the parent function"""
-        video_driver = self.db.get('mythbuntu/video_driver')
-        vnc = self.db.get('mythbuntu/x11vnc')
-        nfs = self.db.get('mythbuntu/nfs-kernel-server')
-        to_install = []
-        to_remove = set()
-        if video_driver != "Open Source Driver":
-            to_install.append(video_driver)
-        if vnc == 'true':
-            to_install.append('x11vnc')
-        if nfs == 'true':
-            to_install.append('nfs-kernel-server')
-            to_install.append('portmap')
-
-        #Remove any conflicts before installing new items
-        if to_remove != []:
-            self.do_remove(to_remove)
-        #Mark new items
-        self.record_installed(to_install)
-
-        #Actually install extras
-        ParentInstall.install_extras(self)
-
-        #Run depmod if we might be using a DKMS enabled driver
-        if video_driver != "Open Source Driver":
-            self.chrex('/sbin/depmod','-a')
-
-    def configure_hardware(self):
-        """Overrides parent function to add in hooks for configuring
-           drivers and services"""
-
-        #Drivers
-        self.db.progress('INFO', 'ubiquity/install/drivers')
-        video_driver = self.db.get('mythbuntu/video_driver')
-        out = self.db.get('mythbuntu/tvout')
-        standard = self.db.get('mythbuntu/tvstandard')
-        if 'nvidia' in video_driver:
-            self.enable_nvidia(out,standard)
-        elif 'fglrx' in video_driver:
-            self.enable_amd(out,standard)
-
-        #Services
-        self.db.progress('INFO', 'ubiquity/install/services')
-        if self.db.get('mythbuntu/samba') == 'true':
-            shutil.copy('/usr/share/mythbuntu/examples/smb.conf.dist',self.target + '/etc/samba/smb.conf')
-        if self.db.get('mythbuntu/nfs-kernel-server') == 'true':
-            shutil.copy('/usr/share/mythbuntu/examples/exports.dist',self.target + '/etc/exports')
-        if self.db.get('mythbuntu/openssh-server') == 'true':
-            for file in ['ssh_host_dsa_key','ssh_host_dsa_key.pub','ssh_host_rsa_key','ssh_host_rsa_key.pub']:
-                os.remove(self.target + '/etc/ssh/' + file)
-            self.reconfigure('openssh-server')
-        if self.db.get('mythbuntu/mysql-server') == 'true':
-            f=open(self.target + '/etc/mysql/conf.d/mythtv.cnf','w')
-            print >>f, """\
-[mysqld]
-bind-address=0.0.0.0"""
-            f.close()
-        if self.db.get('mythbuntu/x11vnc') == 'true':
-            self.vnc.create_password(self.passwd)
-            directory = self.target + '/home/' + self.user + '/.vnc'
-            if not os.path.exists(directory):
-                os.mkdir(directory)
-            shutil.move('/root/.vnc/passwd', directory + '/passwd')
-            os.system('chown ' + str(self.uid) + ':' + str(self.gid) + ' -R ' + directory)
-
-        #Remotes & Transmitters
-        self.db.progress('INFO', 'ubiquity/install/ir')
-        self.configure_ir()
-
-        #Regular parent hardware configure f/n
-        self.db.progress('INFO', 'ubiquity/install/hardware')
-        ParentInstall.configure_hardware(self)
-
-    def configure_ir(self):
-        """Configures the remote & transmitter per user choices"""
-        #configure lircd for remote and transmitter
-        ir_device={"modules":"","driver":"","device":"","lircd_conf":"","remote":"","transmitter":""}
-        self.chroot_setup()
-        self.chrex('dpkg-divert', '--package', 'ubiquity', '--rename',
-                   '--quiet', '--add', '/sbin/udevd')
-        try:
-            os.symlink('/bin/true', '/target/sbin/udevd')
-        except OSError:
-            pass
-
-        try:
-            ir_device["remote"] = self.db.get('lirc/remote')
-            self.set_debconf('lirc/remote',ir_device["remote"])
-            ir_device["modules"] = ""
-            ir_device["driver"] = ""
-            ir_device["device"] = ""
-            ir_device["lircd_conf"] = ""
-            self.lirc.set_device(ir_device,"remote")
-        except debconf.DebconfError:
-            pass
-
-        try:
-            ir_device["transmitter"] = self.db.get('lirc/transmitter')
-            self.set_debconf('lirc/transmitter',ir_device["transmitter"])
-            ir_device["modules"] = ""
-            ir_device["driver"] = ""
-            ir_device["device"] = ""
-            ir_device["lircd_conf"] = ""
-            self.lirc.set_device(ir_device,"transmitter")
-        except debconf.DebconfError:
-            pass
-
-        self.lirc.write_hardware_conf(self.target + '/etc/lirc/hardware.conf')
-
-        try:
-            self.reconfigure('lirc')
-        finally:
-            osextras.unlink_force('/target/sbin/udevd')
-            self.chrex('dpkg-divert', '--package', 'ubiquity', '--rename',
-                       '--quiet', '--remove', '/sbin/udevd')
-        self.chroot_cleanup()
-
-        #configure lircrc
-        home = '/target/home/' + self.db.get('passwd/username')
-        os.putenv('HOME',home)
-        self.lirc.create_lircrc(self.target + "/etc/lirc/lircd.conf",False)
-        os.system('chown ' + str(self.uid) + ':' + str(self.gid) + ' -R ' + home + '/.lirc*')
-
-    def enable_amd(self, type, fmt):
-        if type == 'Composite Video Output':
-            self.chrex('/usr/bin/aticonfig','--tvs VIDEO', '--tvf ' + fmt)
-        elif type == 'S-Video Video Output':
-            self.chrex('/usr/bin/aticonfig','--tvs VIDEO', '--tvf ' + fmt)
-        elif type == 'Component Video Output':
-            self.chrex('/usr/bin/aticonfig','--tvs YUV', '--tvf ' + fmt)
-        else:
-            self.chrex('/usr/bin/aticonfig')
-
-    def enable_nvidia(self, type, fmt):
-        """Enables an NVIDIA graphics driver using XKit"""
-        xorg_conf=XKit.xutils.XUtils()
-
-        extra_conf_options={'NoLogo': '1',
-                           'DPI': '100x100'}
-
-        if type == 'Composite Video Output':
-            extra_conf_options["ConnectedMonitor"]="TV"
-            extra_conf_options["TVOutFormat"]="COMPOSITE"
-            extra_conf_options["TVStandard"]=fmt
-        elif type == 'S-Video Video Output':
-            extra_conf_options["ConnectedMonitor"]="TV"
-            extra_conf_options["TVOutFormat"]="SVIDEO"
-            extra_conf_options["TVStandard"]=fmt
-        elif type == 'Component Video Output':
-            extra_conf_options["ConnectedMonitor"]="TV"
-            extra_conf_options["TVOutFormat"]="COMPONENT"
-            extra_conf_options["TVStandard"]=fmt
-
-        #Set up device section
-        relevant_devices = []
-        if len(xorg_conf.globaldict['Device']) == 0:
-            device = xorg_conf.makeSection('Device', identifier='Default Device')
-            relevant_devices.append(device)
-            xorg_conf.setDriver('Device', 'nvidia', device)
-        else:
-            devices = xorg_conf.getDevicesInUse()
-            if len(devices) > 0:
-                relevant_devices = devices
-            else:
-                relevant_devices = xorg_conf.globaldict['Device'].keys()
-            for device in relevant_devices:
-                xorg_conf.setDriver('Device', 'nvidia', device)
-
-        for device_section in relevant_devices:
-            for k, v in extra_conf_options.iteritems():
-                xorg_conf.addOption('Device', k, v, optiontype='Option', position=device_section)
-
-        #Set up screen section
-        if len(xorg_conf.globaldict['Screen']) == 0:
-            screen = xorg_conf.makeSection('Screen', identifier='Default Screen')
-
-        xorg_conf.addOption('Screen', 'DefaultDepth', '24', position=0, prefix='')
-
-        xorg_conf.writeFile(self.target + "/etc/X11/xorg.conf")
-
-    def remove_extras(self):
-        """Try to remove packages that are installed on the live CD but not on
-        the installed system."""
-        #First remove normal live-desktop packages
-        ParentInstall.remove_extras(self)
-
-        #now take care of mythbuntu specifics
-        packages=set()
-        ## system role
-        if 'Backend' not in self.type:
-            packages.add('libnet-upnp-perl') #causes mythtv-backend to be removed
-            packages.add('php5-common')      #causes mythweb to be removed
-            packages.add('libaprutil1')      #causes apache2 to be removed
-        if 'Slave' in self.type or self.type == 'Frontend':
-            packages.add('ntp')              #causes mythtv-backend-master to go
-            packages.add('mythtv-database')
-            packages.add('mysql-server-core-5.1')
-        if 'Frontend' not in self.type:
-            packages.add('mythtv-frontend')
-        ## services that are installed by default
-        for service in ['samba','openssh-server']:
-            if self.db.get('mythbuntu/' + service) == "false":
-                packages.add(service)
-
-        if len(packages) >= 0:
-            #recursively remove to make sure we get plugins and services that
-            #aren't necessary anymore
-            self.do_remove(packages,True)
-
-if __name__ == '__main__':
-    if not os.path.exists('/var/lib/ubiquity'):
-        os.makedirs('/var/lib/ubiquity')
-    osextras.unlink_force('/var/lib/ubiquity/install.trace')
-
-    install = Install()
-    sys.excepthook = install.excepthook
-    install.run()
-    sys.exit(0)

=== modified file 'ubiquity/components/myth-backend-setup.py'
--- ubiquity/components/myth-backend-setup.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-backend-setup.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -19,17 +19,27 @@
 # You should have received a copy of the GNU General Public License
 # along with Ubiquity.  If not, see <http://www.gnu.org/licenses/>.
 
+from ubiquity.misc import execute_root
+from mythbuntu_common.installer import MythPageGtk
+from ubiquity.plugin import *
 import os
-from ubiquity.plugin import *
 
 NAME = 'myth-backend-setup'
 AFTER = 'myth-summary'
 WEIGHT = 10
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_optional_widgets = 'mythbuntu_stepBackendSetup'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        self.ui_file='mythbuntu_stepBackendSetup'
+        MythPageGtk.__init__(self,controller, *args, **kwargs)
 
     def plugin_get_current_page(self):
-        return None
+        if not os.path.exists('/target/usr/bin/mythtv-setup'):
+            self.controller.go_forward()
+        return self.plugin_widgets
+
+    def do_mythtv_setup(self,widget):
+        """Spawn MythTV-Setup binary."""
+        self.controller.toggle_top_level()
+        execute_root("/usr/share/ubiquity/mythbuntu-setup")
+        self.controller.toggle_top_level()

=== modified file 'ubiquity/components/myth-drivers.py'
--- ubiquity/components/myth-drivers.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-drivers.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -21,32 +21,104 @@
 
 from ubiquity.plugin import *
 from mythbuntu_common.dictionaries import get_graphics_dictionary
+from mythbuntu_common.installer import *
+from ubiquity import install_misc
+import XKit.xutils
 import os
 
 NAME = 'myth-drivers'
 AFTER = 'myth-remote'
 WEIGHT = 10
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui' and \
-           len(get_graphics_dictionary()) > 0:
-            self.plugin_widgets = 'mythbuntu_stepDrivers'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        if len(get_graphics_dictionary()) > 0:
+            self.ui_file = 'mythbuntu_stepDrivers'
+            MythPageGtk.__init__(self, controller, *args, **kwargs)
+            self.populate_video()
+
+    def populate_video(self):
+        """Finds the currently active video driver"""
+        dictionary=get_graphics_dictionary()
+        if len(dictionary) > 0:
+            for driver in dictionary:
+                self.video_driver.append_text(driver)
+            self.video_driver.append_text("Open Source Driver")
+            self.video_driver.set_active(len(dictionary))
+            self.tvoutstandard.set_active(0)
+            self.tvouttype.set_active(0)
+
+    def toggle_tv_out (self,widget):
+        """Called when the tv-out type is toggled"""
+        if (self.tvouttype.get_active() == 0):
+            self.tvoutstandard.set_active(0)
+        elif ((self.tvouttype.get_active() == 1 or self.tvouttype.get_active() == 2) and (self.tvoutstandard.get_active() == 0 or self.tvoutstandard.get_active() >= 11 )):
+            self.tvoutstandard.set_active(10)
+        elif self.tvouttype.get_active() == 3:
+            self.tvoutstandard.set_active(11)
+
+    def toggle_tv_standard(self,widget):
+        """Called when the tv standard is toggled"""
+        if (self.tvoutstandard.get_active() >= 11):
+            self.tvouttype.set_active(3)
+        elif (self.tvoutstandard.get_active() < 11 and self.tvoutstandard.get_active() > 0 and self.tvouttype.get_active() == 0):
+            self.tvouttype.set_active(1)
+        elif (self.tvoutstandard.get_active() < 11 and self.tvouttype.get_active() ==3):
+            self.tvouttype.set_active(1)
+        elif (self.tvoutstandard.get_active() == 0):
+            self.tvouttype.set_active(0)
+
+    def video_changed (self,widget):
+        """Called whenever the modify video driver option is toggled or its kids"""
+        drivers=get_graphics_dictionary()
+        if (widget is not None and widget.get_name() == 'video_driver'):
+            try:
+                self.controller.allow_go_forward(True)
+            except AttributeError:
+                #depends on when video_changed got called
+                #the UI might not be ready yet
+                pass
+            type = widget.get_active()
+            if (type < len(drivers)):
+                self.tvout_vbox.set_sensitive(True)
+            else:
+                self.tvout_vbox.set_sensitive(False)
+                self.tvoutstandard.set_active(0)
+                self.tvouttype.set_active(0)
+
+
+    def set_driver(self,name,value):
+        """Preseeds the status of a driver"""
+        lists = [{'video_driver': self.video_driver,
+                  'tvout': self.tvouttype,
+                  'tvstandard': self.tvoutstandard}]
+        preseed_list(lists,name,value)
+
+    def get_drivers(self):
+        video_drivers=get_graphics_dictionary()
+        active_video_driver=self.video_driver.get_active_text()
+        for item in video_drivers:
+            if (active_video_driver == item):
+                active_video_driver=video_drivers[item]
+                break
+        return build_static_list([{'video_driver': active_video_driver,
+                                         'tvout': self.tvouttype,
+                                         'tvstandard': self.tvoutstandard}])
 
 class Page(Plugin):
     def prepare(self):
         #drivers
-        drivers = self.frontend.get_drivers()
+        drivers = self.ui.get_drivers()
         questions = []
         for this_driver in drivers:
             answer = self.db.get('mythbuntu/' + this_driver)
             if answer != '':
-                self.frontend.set_driver(this_driver,answer)
+                self.ui.set_driver(this_driver,answer)
         questions.append('^mythbuntu/' + this_driver)
         return (['/usr/share/ubiquity/ask-mythbuntu','drivers'], questions)
 
     def ok_handler(self):
-        drivers = self.frontend.get_drivers()
+        drivers = self.ui.get_drivers()
 
         for this_driver in drivers:
             if drivers[this_driver] is True or drivers[this_driver] is False:
@@ -54,3 +126,102 @@
             else:
                 self.preseed('mythbuntu/' + this_driver, drivers[this_driver])
         Plugin.ok_handler(self)
+
+class Install(InstallPlugin):
+
+    def enable_nvidia(self, type, fmt):
+        """Enables an NVIDIA graphics driver using XKit"""
+        xorg_conf=XKit.xutils.XUtils()
+
+        extra_conf_options={'NoLogo': '1',
+                           'DPI': '100x100'}
+
+        if type == 'Composite Video Output':
+            extra_conf_options["ConnectedMonitor"]="TV"
+            extra_conf_options["TVOutFormat"]="COMPOSITE"
+            extra_conf_options["TVStandard"]=fmt
+        elif type == 'S-Video Video Output':
+            extra_conf_options["ConnectedMonitor"]="TV"
+            extra_conf_options["TVOutFormat"]="SVIDEO"
+            extra_conf_options["TVStandard"]=fmt
+        elif type == 'Component Video Output':
+            extra_conf_options["ConnectedMonitor"]="TV"
+            extra_conf_options["TVOutFormat"]="COMPONENT"
+            extra_conf_options["TVStandard"]=fmt
+
+        #Set up device section
+        relevant_devices = []
+        if len(xorg_conf.globaldict['Device']) == 0:
+            device = xorg_conf.makeSection('Device', identifier='Default Device')
+            relevant_devices.append(device)
+            xorg_conf.setDriver('Device', 'nvidia', device)
+        else:
+            devices = xorg_conf.getDevicesInUse()
+            if len(devices) > 0:
+                relevant_devices = devices
+            else:
+                relevant_devices = xorg_conf.globaldict['Device'].keys()
+            for device in relevant_devices:
+                xorg_conf.setDriver('Device', 'nvidia', device)
+
+        for device_section in relevant_devices:
+            for k, v in extra_conf_options.iteritems():
+                xorg_conf.addOption('Device', k, v, optiontype='Option', position=device_section)
+
+        #Set up screen section
+        if len(xorg_conf.globaldict['Screen']) == 0:
+            screen = xorg_conf.makeSection('Screen', identifier='Default Screen')
+
+        xorg_conf.addOption('Screen', 'DefaultDepth', '24', position=0, prefix='')
+
+        xorg_conf.writeFile(self.target + "/etc/X11/xorg.conf")
+
+    def enable_amd(self):
+        """Enables an AMD graphics driver using XKit"""
+        xorg_conf=XKit.xutils.XUtils()
+
+        #Set up device section
+        relevant_devices = []
+        if len(xorg_conf.globaldict['Device']) == 0:
+            device = xorg_conf.makeSection('Device', identifier='Default Device')
+            relevant_devices.append(device)
+            xorg_conf.setDriver('Device', 'fglrx', device)
+        else:
+            devices = xorg_conf.getDevicesInUse()
+            if len(devices) > 0:
+                relevant_devices = devices
+            else:
+                relevant_devices = xorg_conf.globaldict['Device'].keys()
+            for device in relevant_devices:
+                xorg_conf.setDriver('Device', 'fglrx', device)
+
+        #Set up screen section
+        if len(xorg_conf.globaldict['Screen']) == 0:
+            screen = xorg_conf.makeSection('Screen', identifier='Default Screen')
+
+        xorg_conf.addOption('Screen', 'DefaultDepth', '24', position=0, prefix='')
+
+        xorg_conf.writeFile(self.target + "/etc/X11/xorg.conf")
+
+    def install(self, target, progress, *args, **kwargs):
+        progress.info('ubiquity/install/drivers')
+        self.target = target
+        to_install = []
+        video_driver = progress.get('mythbuntu/video_driver')
+        if video_driver != "Open Source Driver":
+            #Install driver
+            to_install.append(video_driver)
+
+            #Build tvout/tvstandard
+            out = progress.get('mythbuntu/tvout')
+            standard = progress.get('mythbuntu/tvstandard')
+            #Enabling xorg.conf stuff
+            if 'nvidia' in video_driver:
+                self.enable_nvidia(out,standard)
+            else:
+                self.enable_amd()
+
+        #Mark new items
+        install_misc.record_installed(to_install)
+
+        return InstallPlugin.install(self, target, progress, *args, **kwargs)

=== modified file 'ubiquity/components/myth-install-type.py'
--- ubiquity/components/myth-install-type.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-install-type.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -20,30 +20,127 @@
 # along with Ubiquity.  If not, see <http://www.gnu.org/licenses/>.
 
 from ubiquity.plugin import *
+from mythbuntu_common.installer import MythPageGtk
+from ubiquity import install_misc
+from ubiquity import misc
 import os
+import subprocess
 
 NAME = 'myth-installtype'
-AFTER = 'usersetup'
+AFTER = ['usersetup', None]
 WEIGHT = 12
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_widgets = 'mythbuntu_stepCustomInstallType'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        self.ui_file='mythbuntu_stepCustomInstallType'
+        MythPageGtk.__init__(self,controller,*args,**kwargs)
+
+    def set_installtype(self,type):
+        """Preseeds the type of custom install"""
+        #if type == "Set Top Box":
+        #    self.stb.set_active(True)
+        if type == "Frontend":
+            self.fe.set_active(True)
+        elif type == "Slave Backend":
+            self.slave_be.set_active(True)
+        elif type == "Master Backend":
+            self.master_be.set_active(True)
+        elif type == "Slave Backend/Frontend":
+            self.slave_be_fe.set_active(True)
+        else:
+            self.master_be_fe.set_active(True)
+
+    def get_installtype(self):
+        """Returns the current custom installation type"""
+        if self.master_be_fe.get_active():
+            return "Master Backend/Frontend"
+        elif self.slave_be_fe.get_active():
+            return "Slave Backend/Frontend"
+        elif self.master_be.get_active():
+            return "Master Backend"
+        elif self.slave_be.get_active():
+            return "Slave Backend"
+        elif self.fe.get_active():
+            return "Frontend"
+        elif self.stb.get_active():
+            return "Set Top Box"
 
 class Page(Plugin):
-#we are seeding one of the possible install types
-
     def prepare(self):
         self.questions = ['install_type']
         questions = []
         for question in self.questions:
             answer = self.db.get('mythbuntu/' + question)
             if answer != '':
-                self.frontend.set_installtype(answer)
+                self.ui.set_installtype(answer)
             questions.append('^mythbuntu/' + question)
         return (['/usr/share/ubiquity/ask-mythbuntu','type'], questions)
 
     def ok_handler(self):
-        self.preseed('mythbuntu/' + self.questions[0],self.frontend.get_installtype())
+        self.preseed('mythbuntu/' + self.questions[0],self.ui.get_installtype())
         Plugin.ok_handler(self)
+
+class Install(InstallPlugin):
+    def process_package_removals(self):
+        packages=set()
+        ## system role
+        if 'Backend' not in self.type:
+            packages.add('libnet-upnp-perl') #causes mythtv-backend to be removed
+            packages.add('php5-common')      #causes mythweb to be removed
+            packages.add('libaprutil1')      #causes apache2 to be removed
+        if 'Slave' in self.type or self.type == 'Frontend':
+            packages.add('ntp')              #causes mythtv-backend-master to go
+            packages.add('mythtv-database')
+            packages.add('mysql-server-core-5.1')
+        if 'Frontend' not in self.type:
+            packages.add('mythtv-frontend')
+        ## services that are installed by default
+        for service in ['samba','openssh-server']:
+            if not misc.create_bool(self.db.get('mythbuntu/' + service)):
+                packages.add(service)
+        if len(packages) >= 0:
+            #recursively remove to make sure we get plugins and services that
+            #aren't necessary anymore
+            install_misc.record_removed(packages,True)
+
+    def setup_common(self):
+        #All types
+        for question in ('mythtv/mysql_mythtv_user','mythtv/mysql_mythtv_password',\
+                         'mythtv/mysql_mythtv_dbname','mythtv/mysql_host'):
+            answer = self.progress.get(question)
+            install_misc.set_debconf(self.target, question,answer)
+
+        os.remove(self.target + '/etc/mythtv/mysql.txt')
+        install_misc.reconfigure(self.target, 'mythtv-common')
+
+    def setup_master_backend(self):
+        if 'Master' in self.type:
+            #Setup database
+            install_misc.reconfigure(self.target, 'mysql-server-5.1')
+            proc=subprocess.Popen(['chroot',self.target,'mysqld'])
+            install_misc.reconfigure(self.target, 'mythtv-database')
+
+            #Cleanup
+            install_misc.chrex(self.target,'mysqladmin','--defaults-file=/etc/mysql/debian.cnf','shutdown')
+            proc.communicate()
+
+            #Mythweb
+            passwd = self.progress.get('passwd/user-password')
+            user = self.progress.get('passwd/username')
+            install_misc.set_debconf(self.target, 'mythweb/enable', 'true')
+            install_misc.set_debconf(self.target, 'mythweb/username', user)
+            install_misc.set_debconf(self.target, 'mythweb/password', passwd)
+            install_misc.reconfigure(self.target, 'mythweb')
+
+    def install(self, target, progress, *args, **kwargs):
+        self.target = target
+        self.progress = progress
+
+        self.progress.info('ubiquity/install/mythbuntu')
+        self.type = self.progress.get('mythbuntu/install_type')
+
+        self.setup_common()
+        self.setup_master_backend()
+        self.process_package_removals()
+
+        return InstallPlugin.install(self, target, progress, *args, **kwargs)

=== modified file 'ubiquity/components/myth-passwords.py'
--- ubiquity/components/myth-passwords.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-passwords.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -19,43 +19,94 @@
 # You should have received a copy of the GNU General Public License
 # along with Ubiquity.  If not, see <http://www.gnu.org/licenses/>.
 
+import string
+import debconf
+import subprocess
 from ubiquity.plugin import *
+from mythbuntu_common.installer import *
+from mythbuntu_common.mysql import MySQLHandler
+from ubiquity import install_misc
 import os
 
 NAME = 'myth-passwords'
 AFTER = 'myth-drivers'
 WEIGHT = 10
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_widgets = 'mythbuntu_stepPasswords'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        self.ui_file = 'mythbuntu_stepPasswords'
+        MythPageGtk.__init__(self, controller, *args, **kwargs)
+        self.populate_mysql()
+
+    def set_type(self,type):
+        """Prevents the user from going forward initially because of the
+           type that was selected"""
+        if "Master" not in type:
+            self.controller.allow_go_forward(False)
+
+    def populate_mysql(self):
+        """Puts a new random mysql password into the UI for each run
+           This ensures that passwords don't ever get cached"""
+        self.mysql=MySQLHandler()
+        new_pass_caller = subprocess.Popen(['pwgen','-s','8'],stdout=subprocess.PIPE)
+        self.mysql_password.set_text(string.split(new_pass_caller.communicate()[0])[0])
+
+    def do_connection_test(self,widget):
+        """Tests to make sure that the backend is accessible"""
+        config={}
+        config["user"]=self.mysql_user.get_text()
+        config["password"]=self.mysql_password.get_text()
+        config["server"]=self.mysql_server.get_text()
+        config["database"]=self.mysql_database.get_text()
+        self.mysql.update_config(config)
+        result=self.mysql.do_connection_test()
+        self.controller.allow_go_forward(True)
+        self.connection_results_label.show()
+        self.connection_results.set_text(result)
+
+    def set_password(self,name,value):
+        """Preseeds a password"""
+        lists = [{'mysql_mythtv_user':self.mysql_user,
+                  'mysql_mythtv_password':self.mysql_password,
+                  'mysql_mythtv_dbname':self.mysql_database,
+                  'mysql_host':self.mysql_server}]
+        preseed_list(lists,name,value)
+
+    def get_mythtv_passwords(self):
+        return build_static_list([{'mysql_mythtv_user':self.mysql_user,
+                                         'mysql_mythtv_password':self.mysql_password,
+                                         'mysql_mythtv_dbname':self.mysql_database,
+                                         'mysql_host':self.mysql_server}])
 
 class Page(Plugin):
-
     def prepare(self):
         #mythtv passwords
-        passwords = self.frontend.get_mythtv_passwords()
+        passwords = self.ui.get_mythtv_passwords()
         questions = []
         for this_password in passwords:
             answer = self.db.get('mythtv/' + this_password)
             if answer != '':
-                self.frontend.set_password(this_password,answer)
+                self.ui.set_password(this_password,answer)
             questions.append('^mythtv/' + this_password)
 
-        #if we are a Master type, we'll skip this page
-        if 'Master' in self.frontend.get_installtype() and 'UBIQUITY_AUTOMATIC' not in os.environ:
-            os.environ['UBIQUITY_AUTOMATIC'] = "2"
-            #regrab the passwords in case any of them actually were supposed preseeded
-            passwords = self.frontend.get_mythtv_passwords()
-            for this_password in passwords:
-                self.preseed('mythtv/' + this_password, passwords[this_password])
+        if 'UBIQUITY_AUTOMATIC' not in os.environ:
+            #if we are a Master type, we'll skip this page
+            type = self.db.get('mythbuntu/install_type')
+            if 'Master' in type:
+                os.environ['UBIQUITY_AUTOMATIC'] = "2"
+                #regrab the passwords in case any of them actually were supposed preseeded
+                passwords = self.ui.get_mythtv_passwords()
+                for this_password in passwords:
+                    self.preseed('mythtv/' + this_password, passwords[this_password])
+            else:
+                self.ui.set_type(type)
+
 
         return (['/usr/share/ubiquity/ask-mythbuntu','passwords'], questions)
 
     def ok_handler(self):
         #mythtv passwords
-        passwords = self.frontend.get_mythtv_passwords()
+        passwords = self.ui.get_mythtv_passwords()
         for this_password in passwords:
             self.preseed('mythtv/' + this_password, passwords[this_password])
 
@@ -67,3 +118,54 @@
             del os.environ['UBIQUITY_AUTOMATIC']
 
         Plugin.cleanup(self)
+
+class Install(InstallPlugin):
+    def install(self, target, progress, *args, **kwargs):
+        passwd = progress.get('passwd/user-password')
+        user = progress.get('passwd/username')
+        type = progress.get('mythbuntu/install_type')
+
+        #Before beginning, set the initial root sql pass to the user pass
+        for key in [ 'mythtv/mysql_admin_password',
+                     'mysql-server/root_password',
+                     'mysql-server/root_password_again' ]:
+            install_misc.set_debconf(target, key, passwd)
+
+
+        #Create a .mythtv directory
+        home_mythtv_dir = target + '/home/' + user + '/.mythtv'
+        if not os.path.isdir(home_mythtv_dir):
+            #in case someone made a symlink or file for the directory
+            if os.path.islink(home_mythtv_dir) or os.path.exists(home_mythtv_dir):
+                os.remove(home_mythtv_dir)
+            os.makedirs(home_mythtv_dir)
+
+        #Remove mysql.txt from home directory if it's there, then make one
+        sql_txt= home_mythtv_dir + '/mysql.txt'
+        if os.path.islink(sql_txt) or os.path.exists(sql_txt):
+            os.remove(sql_txt)
+        try:
+            os.symlink('/etc/mythtv/mysql.txt', sql_txt)
+        except OSError:
+            #on a live disk there is a chance this was a broken link
+            #depending on what the user did in the livefs
+            pass
+
+        #mythtv.desktop autostart
+        if 'Frontend' in type:
+            config_dir = target + '/home/' + user + '/.config'
+            autostart_dir =  config_dir + '/autostart'
+            autostart_link = autostart_dir + '/mythtv.desktop'
+            if not os.path.isdir(config_dir):
+                os.makedirs(config_dir)
+            if not os.path.isdir(autostart_dir):
+                os.makedirs(autostart_dir)
+            elif os.path.islink(autostart_link) or os.path.exists(autostart_link):
+                os.remove(autostart_link)
+            try:
+                os.symlink('/usr/share/applications/mythtv.desktop',autostart_link)
+            except OSError:
+                #on a live disk, this will appear a broken link, but it works
+                pass
+
+        return InstallPlugin.install(self, target, progress, *args, **kwargs)

=== modified file 'ubiquity/components/myth-remote.py'
--- ubiquity/components/myth-remote.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-remote.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -20,31 +20,170 @@
 # along with Ubiquity.  If not, see <http://www.gnu.org/licenses/>.
 
 from ubiquity.plugin import *
+from ubiquity import osextras
+from mythbuntu_common.installer import *
+from mythbuntu_common.lirc import LircHandler
+from ubiquity import install_misc
 import os
+import debconf
+
 
 NAME = 'myth-remote'
 AFTER = 'myth-services'
 WEIGHT = 10
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_widgets = 'tab_remote_control'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        self.ui_file = 'tab_remote_control'
+        MythPageGtk.__init__(self, controller, *args, **kwargs)
+        self.populate_lirc()
+        self.remote_control_support.hide()
+
+    def populate_lirc(self):
+        """Fills the lirc pages with the appropriate data"""
+        self.remote_count = 0
+        self.transmitter_count = 0
+        lirchandler=LircHandler()
+        for item in lirchandler.get_possible_devices("remote"):
+            if "Custom" not in item and "Blaster" not in item:
+                self.remote_list.append_text(item)
+                self.remote_count = self.remote_count + 1
+        for item in lirchandler.get_possible_devices("transmitter"):
+            if "Custom" not in item:
+                self.transmitter_list.append_text(item)
+                self.transmitter_count = self.transmitter_count + 1
+        self.remote_list.set_active(0)
+        self.transmitter_list.set_active(0)
+
+    def toggle_ir(self,widget):
+        """Called whenever a request to enable/disable remote is called"""
+        if widget is not None:
+            #turn on/off IR remote
+            if widget.get_name() == 'remotecontrol':
+                self.remote_hbox.set_sensitive(widget.get_active())
+                self.generate_lircrc_checkbox.set_sensitive(widget.get_active())
+                if widget.get_active() and self.remote_list.get_active() == 0:
+                        self.remote_list.set_active(1)
+                else:
+                    self.remote_list.set_active(0)
+            #turn on/off IR transmitter
+            elif widget.get_name() == "transmittercontrol":
+                self.transmitter_hbox.set_sensitive(widget.get_active())
+                if widget.get_active():
+                    if self.transmitter_list.get_active() == 0:
+                        self.transmitter_list.set_active(1)
+                else:
+                    self.transmitter_list.set_active(0)
+            #if our selected remote itself changed
+            elif widget.get_name() == 'remote_list':
+                self.generate_lircrc_checkbox.set_active(True)
+                if self.remote_list.get_active() == 0:
+                    self.remotecontrol.set_active(False)
+                    self.generate_lircrc_checkbox.set_active(False)
+            #if our selected transmitter itself changed
+            elif widget.get_name() == 'transmitter_list':
+                if self.transmitter_list.get_active() == 0:
+                    self.transmittercontrol.set_active(False)
+
+    def set_lirc(self,question,answer):
+        """Preseeds a lirc configuration item"""
+        if question == "remote":
+            for i in range(0,self.remote_count):
+                self.remote_list.set_active(i)
+                found=False
+                if self.remote_list.get_active_text() == answer:
+                    found = True
+                    break
+                if not found:
+                    self.remote_list.set_active(0)
+        if question == "transmitter":
+            for i in range(0,self.transmitter_count):
+                self.transmitter_list.set_active(i)
+                found=False
+                if self.transmitter_list.get_active_text() == answer:
+                    found = True
+                    break
+                if not found:
+                    self.transmitter_list.set_active(0)
+
+    def get_lirc(self,type):
+        item = {"modules":"","device":"","driver":"","lircd_conf":""}
+        if type == "remote":
+            item["remote"]=self.remote_list.get_active_text()
+        elif type == "transmitter":
+            item["transmitter"]=self.transmitter_list.get_active_text()
+        return item
 
 class Page(Plugin):
-
     def prepare(self):
         self.top = ['remote', 'transmitter']
         questions = []
         for question in self.top:
             answer = self.db.get('lirc/' + question)
             if answer != '':
-                self.frontend.set_lirc(question,answer)
+                self.ui.set_lirc(question,answer)
             questions.append('^lirc/' + question)
         return (['/usr/share/ubiquity/ask-mythbuntu','ir'], questions)
 
     def ok_handler(self):
         for question in self.top:
-            device = self.frontend.get_lirc(question)
+            device = self.ui.get_lirc(question)
             self.preseed('lirc/' + question,device[question])
         Plugin.ok_handler(self)
+
+class Install(InstallPlugin):
+    def install(self, target, progress, *args, **kwargs):
+        progress.info('ubiquity/install/ir')
+
+        lirchandler = LircHandler()
+
+        #configure lircd for remote and transmitter
+        ir_device = {"modules":"","driver":"","device":"","lircd_conf":"","remote":"","transmitter":""}
+        install_misc.chroot_setup(target)
+        install_misc.chrex(target,'dpkg-divert', '--package', 'ubiquity', '--rename',
+                   '--quiet', '--add', '/sbin/udevd')
+        try:
+            os.symlink('/bin/true', '/target/sbin/udevd')
+        except OSError:
+            pass
+
+        try:
+            ir_device["remote"] = progress.get('lirc/remote')
+            install_misc.set_debconf(target, 'lirc/remote',ir_device["remote"])
+            ir_device["modules"] = ""
+            ir_device["driver"] = ""
+            ir_device["device"] = ""
+            ir_device["lircd_conf"] = ""
+            lirchandler.set_device(ir_device,"remote")
+        except debconf.DebconfError:
+            pass
+
+        try:
+            ir_device["transmitter"] = progress.get('lirc/transmitter')
+            install_misc.set_debconf(target, 'lirc/transmitter',ir_device["transmitter"])
+            ir_device["modules"] = ""
+            ir_device["driver"] = ""
+            ir_device["device"] = ""
+            ir_device["lircd_conf"] = ""
+            lirchandler.set_device(ir_device,"transmitter")
+        except debconf.DebconfError:
+            pass
+
+        lirchandler.write_hardware_conf(target + '/etc/lirc/hardware.conf')
+
+        try:
+            install_misc.reconfigure(target, 'lirc')
+        finally:
+            osextras.unlink_force('/target/sbin/udevd')
+            install_misc.chrex(target,'dpkg-divert', '--package', 'ubiquity', '--rename',
+                       '--quiet', '--remove', '/sbin/udevd')
+        install_misc.chroot_cleanup(target)
+
+        #configure lircrc
+        home = '/target/home/' + progress.get('passwd/username')
+        os.putenv('HOME',home)
+        if not os.path.isdir(home):
+            os.makedirs(home)
+        lirchandler.create_lircrc(os.path.join(target,"etc/lirc/lircd.conf"),False)
+
+        return InstallPlugin.install(self, target, progress, *args, **kwargs)

=== modified file 'ubiquity/components/myth-services.py'
--- ubiquity/components/myth-services.py	2009-09-01 18:20:59 +0000
+++ ubiquity/components/myth-services.py	2010-01-27 01:47:14 +0000
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006, 2007, 2009 Canonical Ltd.
 # Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
+# Copyright (C) 2007-2010 Mario Limonciello
 #
 # This file is part of Ubiquity.
 #
@@ -20,32 +20,80 @@
 # along with Ubiquity.  If not, see <http://www.gnu.org/licenses/>.
 
 from ubiquity.plugin import *
+from mythbuntu_common.installer import *
+from mythbuntu_common.dictionaries import get_services_dictionary
+from mythbuntu_common.vnc import VNCHandler
+from ubiquity import install_misc
+from ubiquity import misc
+
 import os
+import shutil
 
 NAME = 'myth-services'
 AFTER = 'myth-installtype'
 WEIGHT = 10
 
-class PageGtk(PluginUI):
-    def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_widgets = 'mythbuntu_stepServices'
+class PageGtk(MythPageGtk):
+    def __init__(self, controller, *args, **kwargs):
+        self.ui_file = 'mythbuntu_stepServices'
+        MythPageGtk.__init__(self, controller, *args, **kwargs)
+
+    def toggle_customtype (self,type):
+        """Called whenever a custom type is toggled"""
+
+        if "Master" in type:
+            self.mysql_option_hbox.show()
+        else:
+            self.enablemysql.set_active(False)
+            self.mysql_option_hbox.hide()
+
+        if "Backend" in type:
+            self.samba_option_hbox.show()
+            self.nfs_option_hbox.show()
+        else:
+            self.enablesamba.set_active(False)
+            self.enablenfs.set_active(False)
+            self.samba_option_hbox.hide()
+            self.nfs_option_hbox.hide()
+
+    def set_service(self,name,value):
+        """Preseeds the status of a service"""
+        lists = [get_services_dictionary(self,self.enablemysql)]
+        preseed_list(lists,name,value)
+
+    def get_services(self):
+        """Returns the status of all installable services"""
+        return build_static_list([get_services_dictionary(self,self.enablemysql)])
+
+    def toggle_offer_vnc(self, sensitive):
+        """Decides whether or not to offer VNC"""
+        if sensitive:
+            self.vnc_option_hbox.show()
+        else:
+            self.enablevnc.set_active(False)
+            self.vnc_option_hbox.hide()
 
 class Page(Plugin):
-#we are seeding the status of each service
-
     def prepare(self):
-        services = self.frontend.get_services()
+        services = self.ui.get_services()
         questions = []
         for this_service in services:
             answer = self.db.get('mythbuntu/' + this_service)
             if answer != '':
-                self.frontend.set_service(this_service,answer)
+                self.ui.set_service(this_service,answer)
             questions.append('^mythbuntu/' + this_service)
+
+        #Hide some stuff depending on the type previously selected
+        type = self.db.get('mythbuntu/install_type')
+        self.ui.toggle_customtype(type)
+
+        #VNC hates us if we have short passwords
+        self.ui.toggle_offer_vnc(len(self.frontend.get_password()) >= 6)
+
         return (['/usr/share/ubiquity/ask-mythbuntu','services'], questions)
 
     def ok_handler(self):
-        services = self.frontend.get_services()
+        services = self.ui.get_services()
         for this_service in services:
             answer = services[this_service]
             if answer is True or answer is False:
@@ -53,3 +101,44 @@
             else:
                 self.preseed('mythbuntu/' + this_service, answer)
         Plugin.ok_handler(self)
+
+class Install(InstallPlugin):
+    def install(self, target, progress, *args, **kwargs):
+        to_install = []
+
+        progress.info('ubiquity/install/services')
+
+        if misc.create_bool(progress.get('mythbuntu/samba')):
+            shutil.copy('/usr/share/mythbuntu/examples/smb.conf.dist', target + '/etc/samba/smb.conf')
+
+        if misc.create_bool(progress.get('mythbuntu/nfs-kernel-server')):
+            shutil.copy('/usr/share/mythbuntu/examples/exports.dist', target + '/etc/exports')
+            to_install.append('nfs-kernel-server')
+            to_install.append('portmap')
+
+        if misc.create_bool(progress.get('mythbuntu/openssh-server')):
+            for file in ['ssh_host_dsa_key','ssh_host_dsa_key.pub','ssh_host_rsa_key','ssh_host_rsa_key.pub']:
+                os.remove(target + '/etc/ssh/' + file)
+            install_misc.reconfigure(target, 'openssh-server')
+
+        if misc.create_bool(progress.get('mythbuntu/mysql-server')):
+            f=open(target + '/etc/mysql/conf.d/mythtv.cnf','w')
+            print >>f, """\
+[mysqld]
+bind-address=0.0.0.0"""
+            f.close()
+
+        if misc.create_bool(progress.get('mythbuntu/x11vnc')):
+            vnc=VNCHandler()
+            vnc.create_password(progress.get('passwd/user-password'))
+            directory = target + '/home/' + progress.get('passwd/username') + '/.vnc'
+            if not os.path.exists(directory):
+                os.makedirs(directory)
+            shutil.move('/root/.vnc/passwd', directory + '/passwd')
+            to_install.append('x11vnc')
+
+        #Mark new items
+        install_misc.record_installed(to_install)
+
+        return InstallPlugin.install(self, target, progress, *args, **kwargs)
+

=== modified file 'ubiquity/components/myth-summary.py'
--- ubiquity/components/myth-summary.py	2009-10-28 13:04:43 +0000
+++ ubiquity/components/myth-summary.py	2010-01-27 01:47:14 +0000
@@ -27,16 +27,13 @@
 AFTER = 'myth-passwords'
 WEIGHT = 10
 
-if ('UBIQUITY_FRONTEND' in os.environ and
-    os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui'):
-    HIDDEN = ['summary', 'migrationassistant']
+HIDDEN = ['summary', 'migrationassistant']
 
 class PageGtk(PluginUI):
     plugin_is_install = True
 
     def __init__(self, *args, **kwargs):
-        if os.environ['UBIQUITY_FRONTEND'] == 'mythbuntu_ui':
-            self.plugin_widgets = 'stepReady'
+        self.plugin_widgets = 'stepReady'
 
 class Page(ubiquity.components.summary.Page):
     """This class is used for populating the Mythbuntu summary page

=== removed file 'ubiquity/components/mythbuntu_install.py'
--- ubiquity/components/mythbuntu_install.py	2009-07-28 20:46:56 +0000
+++ ubiquity/components/mythbuntu_install.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
-
-# Copyright (C) 2006, 2007 Canonical Ltd.
-# Written by Colin Watson <[e-mail]>.
-# Copyright (C) 2007 Mario Limonciello
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import ubiquity.components.install
-class Install(ubiquity.components.install.Install):
-    """This class calls out to the main ubiquity processing script. Control
-       is handled off from the part of the UI asking questions by this class"""
-    def prepare(self):
-        prep = list(ubiquity.components.install.Install.prepare(self))
-        prep[0] = ['/usr/share/ubiquity/mythbuntu_install.py']
-        return prep

=== modified file 'ubiquity/frontend/base.py'
--- ubiquity/frontend/base.py	2010-01-21 09:03:10 +0000
+++ ubiquity/frontend/base.py	2010-01-27 01:47:14 +0000
@@ -60,6 +60,8 @@
         pass
     def go_backward(self):
         pass
+    def toggle_top_level(self):
+        pass
 
 class Component:
     def __init__(self):
@@ -251,7 +253,7 @@
     def post_mortem(self, exctype, excvalue, exctb):
         """Drop into the debugger if possible."""
         self.run_error_cmd()
-        
+
         # Did the user request this?
         if 'UBIQUITY_DEBUG_PDB' not in os.environ:
             return
@@ -269,7 +271,7 @@
         import pdb
         pdb.post_mortem(exctb)
         sys.exit(1)
-    
+
     def set_page(self, page):
         """A question has been asked.  Set the interface to the appropriate
         page given the component, page."""
@@ -524,7 +526,7 @@
     def question_dialog(self, title, msg, options, use_templates=True):
         """Ask a question."""
         self._abstract('question_dialog')
-    
+
     def run_automation_error_cmd(self):
         if self.automation_error_cmd != '':
             execute_root('sh', '-c', self.automation_error_cmd)
@@ -532,7 +534,7 @@
     def run_error_cmd(self):
         if self.error_cmd != '':
             execute_root('sh', '-c', self.error_cmd)
-    
+
     def run_success_cmd(self):
         if self.success_cmd != '':
             self.debconf_progress_info(

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2010-01-21 09:03:10 +0000
+++ ubiquity/frontend/gtk_ui.py	2010-01-27 01:47:14 +0000
@@ -123,6 +123,13 @@
     def go_to_page(self, widget):
         self._wizard.set_current_page(self._wizard.steps.page_num(widget))
 
+    def toggle_top_level(self):
+        if self._wizard.live_installer.get_property('visible'):
+            self._wizard.live_installer.hide()
+        else:
+            self._wizard.live_installer.show()
+        self._wizard.refresh()
+
 class Wizard(BaseFrontend):
 
     def __init__(self, distro):
@@ -455,9 +462,7 @@
 
         self.set_current_page(0)
 
-        while(self.pagesindex < self.pageslen):
-            if self.current_page == None:
-                break
+        while(self.pagesindex < len(self.pages)):
 
             if not self.pages[self.pagesindex].filter_class:
                 # This page is just a UI page
@@ -485,9 +490,11 @@
                 self.pages[self.pagesindex].controller.dbfilter = None
 
             if self.backup or self.dbfilter_handle_status():
-                if self.installing:
-                    self.progress_loop()
-                elif self.current_page is not None and not self.backup:
+                #TODO: superm1, Jan 2010 is there some kind of way that we are entering this normally?
+                #if self.installing:
+                #    self.progress_loop()
+                #elif
+                if self.current_page is not None and not self.backup:
                     self.process_step()
                     if not self.stay_on_page:
                         self.pagesindex = self.pagesindex + 1
@@ -498,18 +505,23 @@
                 if self.backup:
                     self.pagesindex = self.pop_history()
 
+
             while gtk.events_pending():
                 gtk.main_iteration()
 
-            # needed to be here for --automatic as there might not be any
-            # current page in the event all of the questions have been
-            # preseeded.
-            if self.pagesindex == self.pageslen:
-                # Ready to install
-                self.live_installer.hide()
-                self.current_page = None
-                self.installing = True
-                self.progress_loop()
+        if self.oem_user_config:
+            self.quit_installer()
+        elif not self.get_reboot_seen():
+            self.live_installer.hide()
+            if 'UBIQUITY_ONLY' in os.environ:
+                txt = self.get_string('ubiquity/finished_restart_only')
+                self.finished_label.set_label(txt)
+                self.quit_button.hide()
+            self.finished_dialog.set_keep_above(True)
+            self.finished_dialog.run()
+        elif self.get_reboot():
+            self.reboot()
+
         return self.returncode
 
 
@@ -943,9 +955,11 @@
 
     def progress_loop(self):
         """prepare, copy and config the system in the core install process."""
+        self.installing = True
 
         syslog.syslog('progress_loop()')
 
+        self.live_installer.hide()
         self.current_page = None
 
         slideshow_dir = '/usr/share/ubiquity-slideshow'
@@ -1030,21 +1044,15 @@
         # just to make sure
         self.debconf_progress_window.hide()
 
-        self.installing = False
-
         self.run_success_cmd()
-        if self.oem_user_config:
-            self.quit_installer()
-        elif not self.get_reboot_seen():
-            if 'UBIQUITY_ONLY' in os.environ:
-                txt = self.get_string('ubiquity/finished_restart_only')
-                self.finished_label.set_label(txt)
-                self.quit_button.hide()
-            self.finished_dialog.set_keep_above(True)
-            self.finished_dialog.run()
-        elif self.get_reboot():
-            self.reboot()
-
+
+        #in case there are extra pages
+        self.back.hide()
+        self.quit.hide()
+        self.next.set_label("gtk-go-forward")
+        self.translate_widget(self.next)
+
+        self.installing = False
 
     def reboot(self, *args):
         """reboot the system after installing process."""
@@ -1191,6 +1199,10 @@
         elif step == "stepUserInfo":
             self.process_identification()
 
+        # Ready to install
+        elif self.pages[self.pagesindex].ui.get('plugin_is_install'):
+            self.progress_loop()
+
     def process_identification (self):
         """Processing identification step tasks."""
 

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2010-01-21 09:03:10 +0000
+++ ubiquity/frontend/kde_ui.py	2010-01-27 01:47:16 +0000
@@ -123,6 +123,13 @@
     def go_to_page(self, widget):
         self._wizard.set_current_page(self._wizard.ui.widgetStack.indexOf(widget))
 
+    def toggle_top_level(self):
+        if self._wizard.ui.isVisible():
+            self._wizard.ui.hide()
+        else:
+            self._wizard.ui.show()
+        self._wizard.refresh()
+
 class Wizard(BaseFrontend):
 
     def __init__(self, distro):

=== removed file 'ubiquity/frontend/mythbuntu_ui.py'
--- ubiquity/frontend/mythbuntu_ui.py	2009-10-17 22:30:05 +0000
+++ ubiquity/frontend/mythbuntu_ui.py	1970-01-01 00:00:00 +0000
@@ -1,406 +0,0 @@
-# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# «mythbuntu-ui» - Mythbuntu user interface
-#
-# Copyright (C) 2005 Junta de Andalucía
-# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd.
-# Copyright (C) 2007-2009, Mario Limonciello, for Mythbuntu
-# Copyright (C) 2007, Jared Greenwald, for Mythbuntu
-#
-# Authors:
-#
-# - Original gtk-ui.py that this is based upon:
-#   - Javier Carranza <javier.carranza#interactors._coop>
-#   - Juan Jesús Ojeda Croissier <juanje#interactors._coop>
-#   - Antonio Olmo Titos <aolmo#emergya._info>
-#   - Gumer Coronel Pérez <gcoronel#emergya._info>
-#   - Colin Watson <[e-mail]>
-#   - Evan Dandrea <[e-mail]>
-#   - Mario Limonciello <[e-mail]>
-#
-# - This Document:
-#   - Mario Limonciello <[e-mail]>
-#   - Jared Greenwald <[e-mail]>
-#
-# This file is part of Ubiquity.
-#
-# Ubiquity is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or at your option)
-# any later version.
-#
-# Ubiquity is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Ubiquity; if not, write to the Free Software Foundation, Inc., 51
-# Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import sys
-import os
-import re
-import string
-import subprocess
-import syslog
-import signal
-
-import gtk
-
-#Mythbuntu common functionality
-from mythbuntu_common.lirc import LircHandler
-from mythbuntu_common.mysql import MySQLHandler
-from mythbuntu_common.dictionaries import *
-
-#Mythbuntu ubiquity imports
-from ubiquity.components import mythbuntu_install
-
-#Ubiquity imports
-from ubiquity.misc import *
-import ubiquity.frontend.gtk_ui as ParentFrontend
-ParentFrontend.install = mythbuntu_install
-
-class Wizard(ParentFrontend.Wizard):
-
-#Overriden Methods
-    def __init__(self, distro):
-        ParentFrontend.Wizard.__init__(self,distro)
-
-    def customize_installer(self):
-        """Initial UI setup."""
-        #Default to auto login, but don't make it mandatory
-        #This requires disabling encrypted FS
-        self.set_auto_login(True)
-        self.login_encrypt.set_sensitive(False)
-
-        #we aren't allowed to remove lirc right now
-        self.remote_control_support.hide()
-
-        #Prepopulate some dynamic pages
-        self.populate_lirc()
-        self.populate_video()
-        self.populate_mysql()
-        self.backup=False
-
-        ParentFrontend.Wizard.customize_installer(self)
-
-    def run_success_cmd(self):
-        """Runs mythbuntu post post install GUI step"""
-        if not 'UBIQUITY_AUTOMATIC' in os.environ and self.get_installtype() != "Frontend":
-            # Ideally, this next bit (showing the backend-setup page) would
-            # be fixed by re-architecting gtk_ui to run the install step after
-            # the first 'is_install' plugin and just naturally ask for the rest
-            # of the plugins afterward.
-            for page in self.pages:
-                if page.module.NAME == 'myth-backend-setup':
-                    pagenum = self.steps.page_num(page.optional_widgets[0])
-                    self.set_current_page(pagenum)
-                    self.live_installer.show()
-                    self.installing = False
-                    self.back.hide()
-                    self.quit.hide()
-                    self.next.set_label("Finish")
-                    self.step_label.set_text("")
-                    gtk.main()
-                    self.live_installer.hide()
-                    break
-        ParentFrontend.Wizard.run_success_cmd(self)
-
-    def set_page(self, n):
-        if n == 'myth-passwords':
-            if "Master" not in self.get_installtype():
-                self.allow_go_forward(False)
-        elif n == 'myth-services':
-            self.vnc_option_hbox.set_sensitive(len(self.get_password()) >= 6)
-        return ParentFrontend.Wizard.set_page(self,n)
-
-####################
-#Helper Functions  #
-####################
-#Called for initialization and calculation on a page
-
-    def populate_lirc(self):
-            """Fills the lirc pages with the appropriate data"""
-            self.remote_count = 0
-            self.transmitter_count = 0
-            self.lirc=LircHandler()
-            for item in self.lirc.get_possible_devices("remote"):
-                if "Custom" not in item and "Blaster" not in item:
-                    self.remote_list.append_text(item)
-                    self.remote_count = self.remote_count + 1
-            for item in self.lirc.get_possible_devices("transmitter"):
-                if "Custom" not in item:
-                    self.transmitter_list.append_text(item)
-                    self.transmitter_count = self.transmitter_count + 1
-            self.remote_list.set_active(0)
-            self.transmitter_list.set_active(0)
-
-    def populate_video(self):
-        """Finds the currently active video driver"""
-        dictionary=get_graphics_dictionary()
-        if len(dictionary) > 0:
-            for driver in dictionary:
-                self.video_driver.append_text(driver)
-            self.video_driver.append_text("Open Source Driver")
-            self.video_driver.set_active(len(dictionary))
-            self.tvoutstandard.set_active(0)
-            self.tvouttype.set_active(0)
-
-    def populate_mysql(self):
-        """Puts a new random mysql password into the UI for each run
-           This ensures that passwords don't ever get cached"""
-        self.mysql=MySQLHandler()
-        new_pass_caller = subprocess.Popen(['pwgen','-s','8'],stdout=subprocess.PIPE)
-        self.mysql_password.set_text(string.split(new_pass_caller.communicate()[0])[0])
-
-    def do_mythtv_setup(self,widget):
-        """Spawn MythTV-Setup binary."""
-        self.live_installer.hide()
-        self.refresh()
-        execute_root("/usr/share/ubiquity/mythbuntu-setup")
-        self.live_installer.show()
-
-    def do_connection_test(self,widget):
-        """Tests to make sure that the backend is accessible"""
-        config={}
-        config["user"]=self.mysql_user.get_text()
-        config["password"]=self.mysql_password.get_text()
-        config["server"]=self.mysql_server.get_text()
-        config["database"]=self.mysql_database.get_text()
-        self.mysql.update_config(config)
-        result=self.mysql.do_connection_test()
-        self.allow_go_forward(True)
-        self.connection_results_label.show()
-        self.connection_results.set_text(result)
-
-#####################
-#Preseeding Functions#
-#####################
-#Used to preset the status of an element in the GUI
-
-    def set_installtype(self,type):
-        """Preseeds the type of custom install"""
-        if type == "Set Top Box":
-            self.stb.set_active(True)
-        elif type == "Frontend":
-            self.fe.set_active(True)
-        elif type == "Slave Backend":
-            self.slave_be.set_active(True)
-        elif type == "Master Backend":
-            self.master_be.set_active(True)
-        elif type == "Slave Backend/Frontend":
-            self.slave_be_fe.set_active(True)
-        else:
-            self.master_be_fe.set_active(True)
-
-    def set_service(self,name,value):
-        """Preseeds the status of a service"""
-        lists = [get_services_dictionary(self,self.enablemysql)]
-        self._preseed_list(lists,name,value)
-
-    def set_driver(self,name,value):
-        """Preseeds the status of a driver"""
-        lists = [{'video_driver': self.video_driver,
-                  'tvout': self.tvouttype,
-                  'tvstandard': self.tvoutstandard}]
-        self._preseed_list(lists,name,value)
-
-    def set_password(self,name,value):
-        """Preseeds a password"""
-        lists = [{'mysql_mythtv_user':self.mysql_user,
-                  'mysql_mythtv_password':self.mysql_password,
-                  'mysql_mythtv_dbname':self.mysql_database,
-                  'mysql_host':self.mysql_server}]
-        self._preseed_list(lists,name,value)
-
-    def set_lirc(self,question,answer):
-        """Preseeds a lirc configuration item"""
-        if question == "remote":
-            for i in range(0,self.remote_count):
-                self.remote_list.set_active(i)
-                found=False
-                if self.remote_list.get_active_text() == answer:
-                    found = True
-                    break
-                if not found:
-                    self.remote_list.set_active(0)
-        if question == "transmitter":
-            for i in range(0,self.transmitter_count):
-                self.transmitter_list.set_active(i)
-                found=False
-                if self.transmitter_list.get_active_text() == answer:
-                    found = True
-                    break
-                if not found:
-                    self.transmitter_list.set_active(0)
-
-    def _preseed_list(self,lists,names,value):
-        """Helper function for preseeding dictionary based lists"""
-        new_value = create_bool(value)
-        for list in lists:
-            for item in list:
-                for name in string.split(names):
-                    if item == name:
-                        #be careful what type of item we are deealing with
-                        if type(list[item]) == gtk.CheckButton:
-                            list[item].set_active(new_value)
-                        elif type(list[item]) == gtk.Entry:
-                            list[item].set_text(new_value)
-                        elif type(list[item]) == gtk.ComboBox:
-                            for iteration in range(len(list[item]),0):
-                                list[item].set_active(iteration)
-                                if list[item].get_active_text() == new_value:
-                                    break
-                        else:
-                            list[item].set_active_text(new_value)
-
-##################
-#Status Reading  #
-##################
-#Functions for reading the status of Frontend elements
-
-    def get_installtype(self):
-        """Returns the current custom installation type"""
-        if self.master_be_fe.get_active():
-            return "Master Backend/Frontend"
-        elif self.slave_be_fe.get_active():
-            return "Slave Backend/Frontend"
-        elif self.master_be.get_active():
-            return "Master Backend"
-        elif self.slave_be.get_active():
-            return "Slave Backend"
-        elif self.fe.get_active():
-            return "Frontend"
-        elif self.stb.get_active():
-            return "Set Top Box"
-
-    def _build_static_list(self,lists):
-        """Creates a flat list"""
-        total_list= {}
-        for list in lists:
-            for item in list:
-                if type(list[item]) == str:
-                    total_list[item]=list[item]
-                elif type(list[item]) == gtk.CheckButton:
-                    total_list[item]=list[item].get_active()
-                elif type(list[item]) == gtk.Entry:
-                    total_list[item]=list[item].get_text()
-                else:
-                    total_list[item]=list[item].get_active_text()
-        return total_list
-
-    def get_services(self):
-        """Returns the status of all installable services"""
-        return self._build_static_list([get_services_dictionary(self,self.enablemysql)])
-
-    def get_drivers(self):
-        video_drivers=get_graphics_dictionary()
-        active_video_driver=self.video_driver.get_active_text()
-        for item in video_drivers:
-            if (active_video_driver == item):
-                active_video_driver=video_drivers[item]
-                break
-        return self._build_static_list([{'video_driver': active_video_driver,
-                                         'tvout': self.tvouttype,
-                                         'tvstandard': self.tvoutstandard}])
-
-    def get_mythtv_passwords(self):
-        return self._build_static_list([{'mysql_mythtv_user':self.mysql_user,
-                                         'mysql_mythtv_password':self.mysql_password,
-                                         'mysql_mythtv_dbname':self.mysql_database,
-                                         'mysql_host':self.mysql_server}])
-
-    def get_lirc(self,type):
-        item = {"modules":"","device":"","driver":"","lircd_conf":""}
-        if type == "remote":
-            item["remote"]=self.remote_list.get_active_text()
-        elif type == "transmitter":
-            item["transmitter"]=self.transmitter_list.get_active_text()
-        return item
-
-##################
-#Toggle functions#
-##################
-#Called when a widget changes and other GUI elements need to react
-
-    def toggle_tv_out (self,widget):
-        """Called when the tv-out type is toggled"""
-        if (self.tvouttype.get_active() == 0):
-            self.tvoutstandard.set_active(0)
-        elif ((self.tvouttype.get_active() == 1 or self.tvouttype.get_active() == 2) and (self.tvoutstandard.get_active() == 0 or self.tvoutstandard.get_active() >= 11 )):
-            self.tvoutstandard.set_active(10)
-        elif self.tvouttype.get_active() == 3:
-            self.tvoutstandard.set_active(11)
-
-    def toggle_tv_standard(self,widget):
-        """Called when the tv standard is toggled"""
-        if (self.tvoutstandard.get_active() >= 11):
-            self.tvouttype.set_active(3)
-        elif (self.tvoutstandard.get_active() < 11 and self.tvoutstandard.get_active() > 0 and self.tvouttype.get_active() == 0):
-            self.tvouttype.set_active(1)
-        elif (self.tvoutstandard.get_active() < 11 and self.tvouttype.get_active() ==3):
-            self.tvouttype.set_active(1)
-        elif (self.tvoutstandard.get_active() == 0):
-            self.tvouttype.set_active(0)
-
-    def video_changed (self,widget):
-        """Called whenever the modify video driver option is toggled or its kids"""
-        drivers=get_graphics_dictionary()
-        if (widget is not None and widget.get_name() == 'video_driver'):
-            self.allow_go_forward(True)
-            type = widget.get_active()
-            if (type < len(drivers)):
-                self.tvout_vbox.set_sensitive(True)
-            else:
-                self.tvout_vbox.set_sensitive(False)
-                self.tvoutstandard.set_active(0)
-                self.tvouttype.set_active(0)
-
-    def toggle_customtype (self,widget):
-        """Called whenever a custom type is toggled"""
-
-        if "Master" in self.get_installtype():
-            self.mysql_option_hbox.show()
-        else:
-            self.enablemysql.set_active(False)
-            self.mysql_option_hbox.hide()
-
-        if "Backend" in self.get_installtype():
-            self.samba_option_hbox.show()
-            self.nfs_option_hbox.show()
-        else:
-            self.enablesamba.set_active(False)
-            self.enablenfs.set_active(False)
-            self.samba_option_hbox.hide()
-            self.nfs_option_hbox.hide()
-
-    def toggle_ir(self,widget):
-        """Called whenever a request to enable/disable remote is called"""
-        if widget is not None:
-            #turn on/off IR remote
-            if widget.get_name() == 'remotecontrol':
-                self.remote_hbox.set_sensitive(widget.get_active())
-                self.generate_lircrc_checkbox.set_sensitive(widget.get_active())
-                if widget.get_active() and self.remote_list.get_active() == 0:
-                        self.remote_list.set_active(1)
-                else:
-                    self.remote_list.set_active(0)
-            #turn on/off IR transmitter
-            elif widget.get_name() == "transmittercontrol":
-                self.transmitter_hbox.set_sensitive(widget.get_active())
-                if widget.get_active():
-                    if self.transmitter_list.get_active() == 0:
-                        self.transmitter_list.set_active(1)
-                else:
-                    self.transmitter_list.set_active(0)
-            #if our selected remote itself changed
-            elif widget.get_name() == 'remote_list':
-                self.generate_lircrc_checkbox.set_active(True)
-                if self.remote_list.get_active() == 0:
-                    self.remotecontrol.set_active(False)
-                    self.generate_lircrc_checkbox.set_active(False)
-            #if our selected transmitter itself changed
-            elif widget.get_name() == 'transmitter_list':
-                if self.transmitter_list.get_active() == 0:
-                    self.transmittercontrol.set_active(False)

=== added file 'ubiquity/install_misc.py'
--- ubiquity/install_misc.py	1970-01-01 00:00:00 +0000
+++ ubiquity/install_misc.py	2010-01-27 01:47:14 +0000
@@ -0,0 +1,231 @@
+#!/usr/bin/python
+# -*- coding: utf-8; Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
+
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd.
+# Copyright (C) 2010 Mario Limonciello
+#
+# Functions useful for the final install.py script and for ubiquity
+# plugins to use
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import subprocess
+import os
+import debconf
+from ubiquity import misc
+from ubiquity import osextras
+
+def debconf_disconnect():
+    """Disconnect from debconf. This is only to be used as a subprocess
+    preexec_fn helper."""
+    os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
+    if 'DEBIAN_HAS_FRONTEND' in os.environ:
+        del os.environ['DEBIAN_HAS_FRONTEND']
+    if 'DEBCONF_USE_CDEBCONF' in os.environ:
+        # Probably not a good idea to use this in /target too ...
+        del os.environ['DEBCONF_USE_CDEBCONF']
+
+def reconfigure_preexec():
+    debconf_disconnect()
+    os.environ['XAUTHORITY'] = '/root/.Xauthority'
+
+def reconfigure(target, package):
+    """executes a dpkg-reconfigure into installed system to each
+    package which provided by args."""
+    subprocess.call(['log-output', '-t', 'ubiquity', 'chroot', target,
+                     'dpkg-reconfigure', '-fnoninteractive', package],
+                    preexec_fn=reconfigure_preexec, close_fds=True)
+
+def chrex(target, *args):
+    """executes commands on chroot system (provided by *args)."""
+    return misc.execute('chroot', target, *args)
+
+def set_debconf(target, question, value, db=None):
+    try:
+        if 'UBIQUITY_OEM_USER_CONFIG' in os.environ and db:
+            dccomm = None
+            dc = db
+        else:
+            dccomm = subprocess.Popen(['log-output', '-t', 'ubiquity',
+                                       '--pass-stdout',
+                                       'chroot', target,
+                                       'debconf-communicate',
+                                       '-fnoninteractive', 'ubiquity'],
+                                      stdin=subprocess.PIPE,
+                                      stdout=subprocess.PIPE, close_fds=True)
+            dc = debconf.Debconf(read=dccomm.stdout, write=dccomm.stdin)
+        dc.set(question, value)
+        dc.fset(question, 'seen', 'true')
+    finally:
+        if dccomm:
+            dccomm.stdin.close()
+            dccomm.wait()
+
+def get_all_interfaces():
+    """Get all non-local network interfaces."""
+    ifs = []
+    ifs_file = open('/proc/net/dev')
+    # eat header
+    ifs_file.readline()
+    ifs_file.readline()
+
+    for line in ifs_file:
+        name = re.match('(.*?(?::\d+)?):', line.strip()).group(1)
+        if name == 'lo':
+            continue
+        ifs.append(name)
+
+    ifs_file.close()
+    return ifs
+
+def chroot_setup(target, x11=False):
+    """Set up /target for safe package management operations."""
+    if target == '/':
+        return
+
+    policy_rc_d = os.path.join(target, 'usr/sbin/policy-rc.d')
+    f = open(policy_rc_d, 'w')
+    print >>f, """\
+#!/bin/sh
+exit 101"""
+    f.close()
+    os.chmod(policy_rc_d, 0755)
+
+    start_stop_daemon = os.path.join(target, 'sbin/start-stop-daemon')
+    if os.path.exists(start_stop_daemon):
+        os.rename(start_stop_daemon, '%s.REAL' % start_stop_daemon)
+    f = open(start_stop_daemon, 'w')
+    print >>f, """\
+#!/bin/sh
+echo 1>&2
+echo 'Warning: Fake start-stop-daemon called, doing nothing.' 1>&2
+exit 0"""
+    f.close()
+    os.chmod(start_stop_daemon, 0755)
+
+    initctl = os.path.join(target, 'sbin/initctl')
+    if os.path.exists(initctl):
+        os.rename(initctl, '%s.REAL' % initctl)
+        f = open(initctl, 'w')
+        print >>f, """\
+#!/bin/sh
+echo 1>&2
+echo 'Warning: Fake initctl called, doing nothing.' 1>&2
+exit 0"""
+        f.close()
+        os.chmod(initctl, 0755)
+
+    if not os.path.exists(os.path.join(target, 'proc/cmdline')):
+        chrex(target,'mount', '-t', 'proc', 'proc', '/proc')
+    if not os.path.exists(os.path.join(target, 'sys/devices')):
+        chrex(target,'mount', '-t', 'sysfs', 'sysfs', '/sys')
+    misc.execute('mount', '--bind', '/dev', os.path.join(target, 'dev'))
+
+    if x11 and 'DISPLAY' in os.environ:
+        if 'SUDO_USER' in os.environ:
+            xauthority = os.path.expanduser('~%s/.Xauthority' %
+                                            os.environ['SUDO_USER'])
+        else:
+            xauthority = os.path.expanduser('~/.Xauthority')
+        if os.path.exists(xauthority):
+            shutil.copy(xauthority,
+                        os.path.join(target, 'root/.Xauthority'))
+
+        if not os.path.isdir(os.path.join(target, 'tmp/.X11-unix')):
+            os.mkdir(os.path.join(target, 'tmp/.X11-unix'))
+        misc.execute('mount', '--bind', '/tmp/.X11-unix',
+                     os.path.join(target, 'tmp/.X11-unix'))
+
+def chroot_cleanup(target, x11=False):
+    """Undo the work done by chroot_setup."""
+    if target == '/':
+        return
+
+    if x11 and 'DISPLAY' in os.environ:
+        misc.execute('umount', os.path.join(target, 'tmp/.X11-unix'))
+        try:
+            os.rmdir(os.path.join(target, 'tmp/.X11-unix'))
+        except OSError:
+            passo
+        osextras.unlink_force(os.path.join(target,
+                                           'root/.Xauthority'))
+
+    chrex(target,'umount', '/sys')
+    chrex(target,'umount', '/proc')
+    misc.execute('umount', os.path.join(target,'/dev'))
+
+    initctl = os.path.join(target, 'sbin/initctl')
+    if os.path.exists('%s.REAL' % initctl):
+        os.rename('%s.REAL' % initctl, initctl)
+
+    start_stop_daemon = os.path.join(target, 'sbin/start-stop-daemon')
+    if os.path.exists('%s.REAL' % start_stop_daemon):
+        os.rename('%s.REAL' % start_stop_daemon, start_stop_daemon)
+    else:
+        osextras.unlink_force(start_stop_daemon)
+
+    policy_rc_d = os.path.join(target, 'usr/sbin/policy-rc.d')
+    osextras.unlink_force(policy_rc_d)
+
+def record_installed(pkgs):
+    """Record which packages we've explicitly installed so that we don't
+    try to remove them later."""
+
+    record_file = "/var/lib/ubiquity/apt-installed"
+    if not os.path.exists(os.path.dirname(record_file)):
+        os.makedirs(os.path.dirname(record_file))
+    record = open(record_file, "a")
+
+    for pkg in pkgs:
+        print >>record, pkg
+
+    record.close()
+
+def query_recorded_installed():
+    apt_installed = set()
+    if os.path.exists("/var/lib/ubiquity/apt-installed"):
+        record_file = open("/var/lib/ubiquity/apt-installed")
+        for line in record_file:
+            apt_installed.add(line.strip())
+        record_file.close()
+    return apt_installed
+
+def record_removed(pkgs, recursive=False):
+    """Record which packages we've like removed later"""
+
+    record_file = "/var/lib/ubiquity/apt-removed"
+    if not os.path.exists(os.path.dirname(record_file)):
+        os.makedirs(os.path.dirname(record_file))
+    record = open(record_file, "a")
+
+    for pkg in pkgs:
+        print >>record, pkg, str(recursive).lower()
+
+    record.close()
+
+def query_recorded_removed():
+    apt_removed = set()
+    apt_removed_recursive = set()
+    if os.path.exists("/var/lib/ubiquity/apt-removed"):
+        record_file = open("/var/lib/ubiquity/apt-removed")
+        for line in record_file:
+            if misc.create_bool(line.split()[1]):
+                apt_removed_recursive.add(line.split()[0])
+            else:
+                apt_removed.add(line.split()[0])
+        record_file.close()
+    return (apt_removed, apt_removed_recursive)
+
+# vim:ai:et:sts=4:tw=80:sw=4: