<div dir="ltr"><p>Hello! I tried to correct the ubiquity for the normal work on Debian Live. If you are interested, it would be a small correction in diff.gz. This is not the final version, but nevertheless working.</p><p>
--- ubiquity-1.10.3.orig/d-i/source/localechooser/localechooser<br>+++ ubiquity-1.10.3/d-i/source/localechooser/localechooser<br>@@ -115,9 +115,9 @@<br> done<br> IFS="$OLDIFS"<br> <br>- db_subst $tpl_languagelist CODES "$codes"<br>
- db_subst $tpl_languagelist NAMES_EN "$names_en"<br>- db_subst $tpl_languagelist NAMES_BOTH "$names_both"<br>+ db_subst $tpl_languagelist\ CODES\ "$codes"<br>+ db_subst $tpl_languagelist\ NAMES_EN\ "$names_en"<br>
+ db_subst $tpl_languagelist\ NAMES_BOTH\ "$names_both"<br> <br> echo $level >/var/lib/localechooser/langlevel<br> }<br>--- ubiquity-1.10.3.orig/d-i/source/console-setup/debian/console-setup.postinst<br>+++ ubiquity-1.10.3/d-i/source/console-setup/debian/console-setup.postinst<br>
@@ -95,9 +95,7 @@<br> <br> . $CONFIGFILE || true<br> <br>- if [ "$model" = SKIP ]; then<br>- BOOTTIME_KMAP_MD5=<br>- elif \<br>+ if \<br> [ -z "$BOOTTIME_KMAP_MD5" ] \<br> || [ ! -f "$CONFIGDIR/boottime.kmap.gz" ] \<br>
|| echo "$BOOTTIME_KMAP_MD5 $CONFIGDIR/boottime.kmap.gz" \<br>@@ -143,23 +141,22 @@<br> <br> # In d-i debhelper doesn't use /etc/init.d scripts :-)<br> if [ -f /usr/share/console-setup-mini/console-setup.config ]; then<br>
- if [ -d /lib/debian-installer ]; then<br>- setupcon --force --save<br>- else<br>- # setting the font corrupts X<br>- setupcon --save-only<br>- setupcon --force -k<br>- cat >&2 <<EOF<br>-Your console font configuration will be updated the next time your system<br>
-boots. If you want to update it now, run 'setupcon' from a virtual console.<br>-EOF<br>- fi<br>+ setupcon --force --save<br> fi<br> <br>-#DEBHELPER#<br>-<br>-if type update-initramfs >/dev/null 2>&1; then<br>
- update-initramfs -u<br>+# Automatically added by dh_installinit<br>+if [ -x "/etc/init.d/keyboard-setup" ]; then<br>+ update-rc.d keyboard-setup start 06 S . >/dev/null || exit $?<br>+fi<br>+# End automatically added section<br>
+# Automatically added by dh_installinit<br>+if [ -x "/etc/init.d/console-setup" ]; then<br>+ update-rc.d console-setup start 49 S . >/dev/null<br>+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then<br>
+ invoke-rc.d console-setup start || exit $?<br>+ else<br>+ /etc/init.d/console-setup start || exit $?<br>+ fi<br> fi<br>+# End automatically added section<br> <br>-exit 0<br>--- ubiquity-1.10.3.orig/scripts/install.py<br>
+++ ubiquity-1.10.3/scripts/install.py<br>@@ -762,10 +762,11 @@<br> '/var/log/installer/version', '/var/log/casper.log'):<br> target_log_file = os.path.join(target_dir,<br>
os.path.basename(log_file))<br>- if not misc.execute('cp', '-a', log_file, target_log_file):<br>- syslog.syslog(syslog.LOG_ERR,<br>- 'Failed to copy installation log file')<br>
- os.chmod(target_log_file, stat.S_IRUSR | stat.S_IWUSR)<br>+ if os.path.isfile(target_log_file):<br>+ if not misc.execute('cp', '-a', log_file, target_log_file):<br>+ syslog.syslog(syslog.LOG_ERR,<br>
+ 'Failed to copy installation log file')<br>+ os.chmod(target_log_file, stat.S_IRUSR | stat.S_IWUSR)<br> try:<br> status = open(os.path.join(self.target, 'var/lib/dpkg/status'))<br>
status_gz = gzip.open(os.path.join(target_dir,<br>@@ -835,7 +836,10 @@<br> mountpoint = '/var/lib/ubiquity/%s' % sysloop<br> if not os.path.isdir(mountpoint):<br> os.mkdir(mountpoint)<br>
- misc.execute('mount', dev, mountpoint)<br>+ if not misc.execute('mount', dev, mountpoint)<br>+ misc.execute('losetup', '-d', dev)<br>+ misc.execute('mount', '-o', 'loop', fsfile, mountpoint)<br>
+ dev = 'unused'<br> <br> return (dev, mountpoint)<br> <br>@@ -866,7 +870,8 @@<br> # Manual detection on non-unionfs systems<br> fsfiles = ['/cdrom/casper/filesystem.cloop',<br>
'/cdrom/casper/filesystem.squashfs',<br>- '/cdrom/META/META.squashfs']<br>+ '/cdrom/META/META.squashfs',<br>+ '/live/image/live/filesystem.squashfs']<br>
<br> for fsfile in fsfiles:<br> if fsfile != '' and os.path.isfile(fsfile):<br>@@ -916,10 +921,10 @@<br> if not misc.execute('umount', mountpoint):<br> raise InstallStepError("Failed to unmount %s" % mountpoint)<br>
for dev in devs:<br>- if dev != '' and not misc.execute('losetup', '-d', dev):<br>- raise InstallStepError(<br>- "Failed to detach loopback device %s" % dev)<br>
-<br>+ if dev != 'unused':<br>+ if dev != '' and not misc.execute('losetup', '-d', dev):<br>+ raise InstallStepError(<br>+ "Failed to detach loopback device %s" % dev)<br>
<br> def chroot_setup(self, x11=False):<br> """Set up /target for safe package management operations."""<br>@@ -1364,7 +1369,10 @@<br> 'usplash',<br> 'popularity-contest',<br>
'libpaper1',<br>- 'ssl-cert']<br>+ 'ssl-cert',<br>+ 'splashy',<br>+ 'xserver-xorg',<br>
+ 'initramfs-tools']<br> <br> try:<br> for package in packages:<br><br><br clear="all"></p><br>-- <br>С Уважением, Виталий<br><br>Блог: <a href="http://vitaljkapblog.livejournal.com/">http://vitaljkapblog.livejournal.com/</a><br>
Lastfm: <a href="http://www.lastfm.ru/user/kafik-fafik/">http://www.lastfm.ru/user/kafik-fafik/</a><br>ICQ: 578-126<br>E-Mail: <a href="mailto:v31337@gmail.com">v31337@gmail.com</a><br>
</div>