fix issue #103

Author: fluxer

data/exclude.list

@@ -16,11 +16,6 @@ boot/syslinux/*
 boot/lilo/*
 boot/*.bak
 boot/*.old-dkms
-etc/hostname
-etc/hosts
-etc/resolv.conf
-etc/fstab
-etc/mtab
 etc/group-
 etc/passwd-
 etc/gshadow-

src/actions/extract.py

@@ -34,11 +34,13 @@ def main():
 
     message.sub_info('Mounting ISO', config.ISO)
     try:
-        # in some cases the modules may not be loaded, if they are builtin
-        # a warning should be printed but (AFAIK) the command should not fail.
-        # the "-b" argument is to ensure blacklisted modules are respected,
-        # I hope it does not cause trouble (it works with buysbox and kmod)
-        misc.system_command((misc.whereis('modprobe'), '-ba', 'loop', 'iso9660'))
+        # load the required kernel modules in cases the are not, if they are
+        # builtin the command fails so ignoring that. the "-b" argument is to
+        # ensure blacklisted modules are respected
+        try:
+            misc.system_command((misc.whereis('modprobe'), '-ba', 'loop', 'iso9660'))
+        except:
+            pass
         misc.system_command((misc.whereis('mount'), '-t', 'iso9660', '-o', \
             'ro,loop', config.ISO, mount_dir))
     except:

src/gui.py.in

@@ -21,6 +21,11 @@ import actions.rebuild as rebuild
 import actions.clean as clean
 import actions.qemu as qemu
 misc.CATCH = True
+common.misc.CATCH = True
+extract.misc.CATCH = True
+deb.misc.CATCH = True
+hook.misc.CATCH = True
+qemu.misc.CATCH = True
 
 # prepare for lift-off
 app = QtGui.QApplication(sys.argv)

src/lib/misc.py

@@ -132,6 +132,8 @@ def system_command(command, shell=False, cwd=None, env=None):
 
 def chroot_exec(command, prepare=True, mount=True, output=False, xnest=False, shell=False, cwd=None):
     out = None
+    resolv = '%s/etc/resolv.conf' % config.FILESYSTEM_DIR
+    hosts = '%s/etc/hosts' % config.FILESYSTEM_DIR
     mount = whereis('mount')
     umount = whereis('umount')
     chroot = whereis('chroot')
@@ -142,11 +144,18 @@ def chroot_exec(command, prepare=True, mount=True, output=False, xnest=False, sh
         chroot_command.extend(command)
     try:
         if prepare:
-            resolv = '%s/etc/resolv.conf' % config.FILESYSTEM_DIR
-            hosts = '%s/etc/hosts' % config.FILESYSTEM_DIR
-            if os.path.isfile('/etc/resolv.conf'):
+            if os.path.isfile('/etc/resolv.conf') and not os.path.islink(resolv):
+                 copy_file('/etc/resolv.conf', resolv)
+            elif os.path.islink(resolv):
+                # usually /run/resolvconf/resolv.conf
+                resolv = os.path.realpath(resolv)
+                rdir = os.path.dirname(resolv)
+                if not os.path.isdir(rdir):
+                    os.makedirs(rdir)
                 copy_file('/etc/resolv.conf', resolv)
             if os.path.isfile('/etc/hosts'):
+                if os.path.isfile(hosts):
+                    copy_file(hosts, '%s.backup' % hosts)
                 copy_file('/etc/hosts', hosts)
 
         if mount:
@@ -208,6 +217,10 @@ def chroot_exec(command, prepare=True, mount=True, output=False, xnest=False, sh
             system_command(chroot_command, shell=shell, \
                 env=environment, cwd=cwd)
     finally:
+        if prepare:
+            if os.path.isfile('%s.backup' % hosts):
+                copy_file('%s.backup' % hosts, hosts)
+                os.unlink('%s.backup' % hosts)
         if mount:
             for s in reversed(pseudofs):
                 sdir = config.FILESYSTEM_DIR + s

tr/customizer_bg_BG.ts

@@ -232,72 +232,72 @@ Copyright (C) 2013-2015 Mubiin Kimura</source>
 <context>
     <name>app</name>
     <message>
-        <location filename="gui.py" line="36"/>
+        <location filename="gui.py" line="41"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="gui.py" line="39"/>
+        <location filename="gui.py" line="44"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="gui.py" line="42"/>
+        <location filename="gui.py" line="47"/>
         <source>Critical</source>
         <translation>Критично</translation>
     </message>
     <message>
-        <location filename="gui.py" line="55"/>
+        <location filename="gui.py" line="60"/>
         <source>An instance of Customizer is already running.</source>
         <translation>Инстанция на Customizer вече е стартирана.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="62"/>
+        <location filename="gui.py" line="67"/>
         <source>You are attempting to run Customizer with Python 3.</source>
         <translation>Опитвате се да стартирате Customizer с Python 3.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="140"/>
+        <location filename="gui.py" line="145"/>
         <source>The filesystem is not valid or corrupted. Clean is recommended.</source>
         <translation>Файловата система не е валидна или е повредена. Изчистване е препоръчително.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="161"/>
+        <location filename="gui.py" line="166"/>
         <source>No supported terminal emulator detected.</source>
         <translation>Не е намерен терминал, който се поддържа.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="223"/>
+        <location filename="gui.py" line="228"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="gui.py" line="223"/>
+        <location filename="gui.py" line="228"/>
         <source>ISO Files (*.iso);;All Files (*)</source>
         <translation>ISO Файлове (*.iso);;Всички Файлове (*)</translation>
     </message>
     <message>
-        <location filename="gui.py" line="256"/>
+        <location filename="gui.py" line="261"/>
         <source>No supported text editor detected.</source>
         <translation>Не е намерен текстов редактор, който се поддържа.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="269"/>
+        <location filename="gui.py" line="274"/>
         <source>Deb Files (*.deb);;All Files (*)</source>
         <translation>Deb Файлове (*.deb);;Всички Файлове (*)</translation>
     </message>
     <message>
-        <location filename="gui.py" line="285"/>
+        <location filename="gui.py" line="290"/>
         <source>Shell Scripts (*.sh);;All Files (*)</source>
         <translation>Скриптове на Обвивката (*.sh);;Всички Файлове (*)</translation>
     </message>
     <message>
-        <location filename="gui.py" line="369"/>
+        <location filename="gui.py" line="374"/>
         <source>No supported file manager detected.</source>
         <translation>Не е намерен файлов мениджър, който се поддържа.</translation>
     </message>
     <message>
-        <location filename="gui.py" line="315"/>
+        <location filename="gui.py" line="320"/>
         <source>Live user can not be empty.</source>
         <translation type="unfinished"></translation>
     </message>