Bug#706366: unblock: debian-installer-launcher/17
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package debian-installer-launcher
This version solves the last few issues. We got started late
due to this package being unmaintained until quite recently.
unblock debian-installer-launcher/17
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (500, 'testing'), (101, 'unstable'), (1, 'experimental')
Architecture: i386 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru debian-installer-launcher-16/debian/changelog debian-installer-launcher-17/debian/changelog
--- debian-installer-launcher-16/debian/changelog 2013-03-30 16:59:31.000000000 -0300
+++ debian-installer-launcher-17/debian/changelog 2013-04-28 17:15:55.000000000 -0300
@@ -1,3 +1,15 @@
+debian-installer-launcher (17) unstable; urgency=low
+
+ [ Raphaël Hertzog ]
+ * Ensure to always provide a sane TERM variable to d-i. This fixes problems
+ with d-i not loading the preseed file. Closes: #704065
+ * Add hooks to allow other packages to temporarily tweak the system while
+ d-i is running. See /usr/share/debian-installer-launcher/hooks/README.
+ * Ensure that /run/lock exists in the d-i chroot (mimick what /init does
+ in the initrd).
+
+ -- Ben Armstrong <synrg@sanctuary.nslug.ns.ca> Sun, 28 Apr 2013 17:15:41 -0300
+
debian-installer-launcher (16) unstable; urgency=low
* Use tmpfs and lazy unmount to ensure safe cleanup.
diff -Nru debian-installer-launcher-16/debian/debian-installer-launcher.install debian-installer-launcher-17/debian/debian-installer-launcher.install
--- debian-installer-launcher-16/debian/debian-installer-launcher.install 2013-03-04 11:05:54.000000000 -0400
+++ debian-installer-launcher-17/debian/debian-installer-launcher.install 2013-04-26 07:43:33.000000000 -0300
@@ -1,5 +1,6 @@
debian-installer-launcher /usr/sbin
plugins /usr/share/debian-installer-launcher
+hooks /usr/share/debian-installer-launcher
*.8 /usr/share/man/man8
*.desktop /usr/share/applications
*.png /usr/share/icons
diff -Nru debian-installer-launcher-16/debian/po/hr.po debian-installer-launcher-17/debian/po/hr.po
--- debian-installer-launcher-16/debian/po/hr.po 2013-03-04 11:05:54.000000000 -0400
+++ debian-installer-launcher-17/debian/po/hr.po 2013-04-26 07:43:33.000000000 -0300
@@ -15,14 +15,14 @@
# Krunoslav Gernhard, 2004
# Vladimir Vuksan <vuksan@veus.hr>, 2000.
# Vlatko Kosturjak, 2001
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
+# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: Debian-installer 1st-stage master file HR\n"
"Report-Msgid-Bugs-To: debian-installer-launcher@packages.debian.org\n"
"POT-Creation-Date: 2010-08-05 20:58+0000\n"
-"PO-Revision-Date: 2012-06-18 16:28+0200\n"
+"PO-Revision-Date: 2013-04-17 18:08+0200\n"
"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
@@ -30,21 +30,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#. Type: title
#. Description
#. :sl3:
#: ../debian-installer-launcher.templates:1001
msgid "Kernel version mismatch"
-msgstr "Verzija jezgre (kernela) se ne slaže"
+msgstr "Verzija jezgre se ne slaže"
#. Type: error
#. Description
#. :sl3:
#: ../debian-installer-launcher.templates:2001
msgid "Live system kernel and installer kernel don't match"
-msgstr "Verzija kernela na živom sustavu i verzija u instaleru se ne slažu"
+msgstr ""
+"Verzija jezgre na živom sustavu i verzija u instalacijskom programu se ne "
+"slažu"
#. Type: error
#. Description
@@ -56,8 +58,9 @@
"The installer can only be used if the kernel versions of the live system "
"(${LIVE_KERNEL}) and of the installer (${DI_KERNEL}) are the same."
msgstr ""
-"Instaler se može koristiti samo ako su verzije jezgre operacijskog sustava "
-"na živom sustavu (${LIVE_KERNEL}) i u instaleru (${DI_KERNEL}) iste."
+"Instalacijski program se može koristiti samo ako su verzije jezgre "
+"operacijskog sustava na živom sustavu (${LIVE_KERNEL}) i u instalacijskom "
+"programu (${DI_KERNEL}) iste."
#. Type: error
#. Description
diff -Nru debian-installer-launcher-16/debian-installer-launcher debian-installer-launcher-17/debian-installer-launcher
--- debian-installer-launcher-16/debian-installer-launcher 2013-03-04 11:05:54.000000000 -0400
+++ debian-installer-launcher-17/debian-installer-launcher 2013-04-26 07:43:33.000000000 -0300
@@ -53,9 +53,16 @@
EOF
}
+run_hook_scripts() {
+ if [ -d /usr/share/debian-installer-launcher/hooks ]; then
+ run-parts "$@" /usr/share/debian-installer-launcher/hooks
+ fi
+}
+
cleanup()
{
call_for_plugins "cleanup"
+ run_hook_scripts --reverse --arg=cleanup
}
PLUGINS_DIR="/usr/share/debian-installer-launcher/plugins"
@@ -100,6 +107,8 @@
exit 1
fi
+run_hook_scripts --arg=startup
+
if call_for_plugin $PLUGIN "prepare" $@; then
call_for_plugin $PLUGIN "run"
fi
diff -Nru debian-installer-launcher-16/debian-installer.sh debian-installer-launcher-17/debian-installer.sh
--- debian-installer-launcher-16/debian-installer.sh 2013-03-30 16:59:31.000000000 -0300
+++ debian-installer-launcher-17/debian-installer.sh 2013-04-26 07:43:33.000000000 -0300
@@ -3,7 +3,7 @@
set -e
in_image () {
- chroot /lib/live/installer /usr/bin/env -i LIVE_INSTALLER_MODE=1 DEBIAN_FRONTEND=$DI_FRONTEND DISPLAY=$DISPLAY TERM=$TERM $CMDLINE $@
+ chroot /lib/live/installer /usr/bin/env -i LIVE_INSTALLER_MODE=1 DEBIAN_FRONTEND=$DI_FRONTEND DISPLAY=$DISPLAY TERM=${TERM:-xterm} $CMDLINE $@
}
CMDLINE=
@@ -14,5 +14,7 @@
done
# Launching debian-installer
+in_image mount /run
+in_image mkdir -p /run/lock
in_image /sbin/debian-installer-startup
in_image /sbin/debian-installer
diff -Nru debian-installer-launcher-16/hooks/README debian-installer-launcher-17/hooks/README
--- debian-installer-launcher-16/hooks/README 1969-12-31 20:00:00.000000000 -0400
+++ debian-installer-launcher-17/hooks/README 2013-04-26 07:43:33.000000000 -0300
@@ -0,0 +1,12 @@
+Debian-installer-launcher hooks
+-------------------------------
+
+You can put script files in this directory and they will be called by
+various hooks of debian-installer-launcher. The hook name is given as
+first parameter when the script is executed.
+
+Existing hooks:
+- startup: called right at the start, even before the "prepare" step of
+ the plugin used.
+- cleanup: called at the very end, once all plugins have cleaned up. Those
+ hooks are executed in reverse order.
Reply to: