²@ή¥₺€Û¶ÎÂû®₺”×¢û»“¢₺

live-installer/frontend/gtk_interface.py

@@ -240,6 +240,9 @@ class InstallerWindow:
         # install page
         self.builder.get_object("label_install_progress").set_text(
             ("Calculating file indexes ..."))
+        self.builder.get_object("install_image").set_from_file(
+            "./resources/install.png")
+        
 
         # i18n
         self.i18n()
@@ -305,7 +308,7 @@ class InstallerWindow:
 
         # Welcome page
         self.builder.get_object("img_distro").set_from_file(
-        "./resources/distro.svg")
+        "./resources/distro.png")
         self.builder.get_object("label_welcome1").set_text(
             ("Welcome to the Sulin Installer."))
         self.builder.get_object("label_welcome2").set_text(

live-installer/installer.py

@@ -70,7 +70,7 @@ class InstallerEngine:
         # Transfer the files
         SOURCE = "/source/"
         DEST = "/target/"
-        EXCLUDE_DIRS = "home/* dev/* proc/* sys/* tmp/* run/* mnt/* media/* lost+found source target".split()
+        EXCLUDE_DIRS = "data/* dev/* proc/* sys/* tmp/* run/* lost+found source target".split()
         our_current = 0
         # (Valid) assumption: num-of-files-to-copy ~= num-of-used-inodes-on-/
         our_total = int(subprocess.getoutput(
@@ -459,15 +459,15 @@ class InstallerEngine:
         self.update_progress(our_current, our_total, False,
                              False, ("Settings X11 keyboard options"))
         
-        newconsolefh = open("/target/etc/X11/xorg.conf.d/00-keyboard.conf", "w")
-        newconsolefh.write('Section "InputClass"')
-        newconsolefh.write('Identifier "system-keyboard"')
-        newconsolefh.write('MatchIsKeyboard "on"')
-        newconsolefh.write('Option "XkbLayout" "{}"'.format(self.setup.keyboard_layout))
-        newconsolefh.write('Option "XkbModel" "{}"'.format(self.setup.keyboard_model))
-        newconsolefh.write('Option "XkbVariant" "{}"'.format(self.setup.keyboard_variant))
-        newconsolefh.write('#Option "XkbOptions" "grp:alt_shift_toggle"')
-        newconsolefh.write('EndSection')
+        newconsolefh = open("/target/etc/X11/xorg.conf.d/10-keyboard.conf", "w")
+        newconsolefh.write('Section "InputClass"\n')
+        newconsolefh.write('Identifier "system-keyboard"\n')
+        newconsolefh.write('MatchIsKeyboard "on"\n')
+        newconsolefh.write('Option "XkbLayout" "{}"\n'.format(self.setup.keyboard_layout))
+        newconsolefh.write('Option "XkbModel" "{}"\n'.format(self.setup.keyboard_model))
+        newconsolefh.write('Option "XkbVariant" "{}"\n'.format(self.setup.keyboard_variant))
+        newconsolefh.write('#Option "XkbOptions" "grp:alt_shift_toggle"\n')
+        newconsolefh.write('EndSection\n')
         newconsolefh.close()
             
         # write MBR (grub)

live-installer/resources/interface.ui

@@ -1843,21 +1843,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkScrolledWindow" id="scrolled_slideshow">
-                        <property name="visible">False</property>
+                      <object class="GtkImage" id="install_image">
+                        <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">center</property>
-                        <property name="valign">center</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="hscrollbar_policy">external</property>
-                        <property name="vscrollbar_policy">external</property>
-                        <property name="shadow_type">in</property>
-                        <property name="min_content_width">752</property>
-                        <property name="min_content_height">450</property>
-                        <child>
-                          <placeholder/>
-                        </child>
+                        <property name="icon_name">distro</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>