{"base_revision":"git-v1:e718a31a18c940cc444cd2f31ea1465bdb996467","content":"diff --git a/configure.ac b/configure.ac\nindex 99cef47..ebbebc8 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -16,7 +16,7 @@ dnl with this program; if not, write to the Free Software Foundation, Inc.,\n dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n \n AC_INIT([live-installer], [0])\n-AC_CONFIG_HEADERS([include/config.h:include/config.h.in])\n+AC_CONFIG_HEADER(include/config.h:include/config.h.in)\n AM_INIT_AUTOMAKE([1.8])\n \n AM_MAINTAINER_MODE([enable])\n@@ -25,5 +25,4 @@ dnl Checks for programs we'd need for building\n AC_PROG_MAKE_SET\n AC_PROG_CC\n \n-AC_CONFIG_FILES([Makefile src/Makefile])\n-AC_OUTPUT\n+AC_OUTPUT(Makefile src/Makefile)\ndiff --git a/debian/changelog b/debian/changelog\nindex 43466fe..8190651 100644\n--- a/debian/changelog\n+++ b/debian/changelog\n@@ -1,24 +1,3 @@\n-live-installer (60) unstable; urgency=medium\n-\n-  * Team upload.\n-\n-  [ Roland Clobus ]\n-  * Drop jessie-specific code.\n-  * Update standards-version; no changes required.\n-  * Update path for usrmerge (Closes: #1122349).\n-  * Move file system support files to a more intuitive location.\n-  * Remove unneeded conditional checks of depmod.\n-\n- -- Holger Wansing <hwansing@mailbox.org>  Tue, 07 Jul 2026 20:52:51 +0200\n-\n-live-installer (59) unstable; urgency=medium\n-\n-  * Team upload.\n-  * Use cd rather than chdir (closes: #1140062).\n-  * Upgrade configure.ac using autoupdate.\n-\n- -- Colin Watson <cjwatson@debian.org>  Mon, 15 Jun 2026 13:16:45 +0100\n-\n live-installer (58) unstable; urgency=medium\n \n   [ Jonathan Carter ]\ndiff --git a/debian/control b/debian/control\nindex 0ea1a06..54b2728 100644\n--- a/debian/control\n+++ b/debian/control\n@@ -3,7 +3,7 @@ Section: debian-installer\n Priority: optional\n Maintainer: Debian Install System Team <debian-boot@lists.debian.org>\n Uploaders: Raphaël Hertzog <hertzog@debian.org>\n-Standards-Version: 4.7.4\n+Standards-Version: 4.6.1\n Build-Depends: debhelper-compat (= 13), po-debconf\n Vcs-Browser: https://salsa.debian.org/installer-team/live-installer\n Vcs-Git: https://salsa.debian.org/installer-team/live-installer.git\ndiff --git a/debian/live-installer.install b/debian/live-installer.install\nindex fe75655..c5fc0b2 100644\n--- a/debian/live-installer.install\n+++ b/debian/live-installer.install\n@@ -1,4 +1,4 @@\n finish-install.d\t/usr/lib\n live-installer.d\t/usr/lib\n post-base-installer.d\t/usr/lib\n-support/*\t\t/usr/lib/live-installer-fs-support.d\n+support/*\t\t/lib/live-installer\ndiff --git a/debian/live-installer.postinst b/debian/live-installer.postinst\nindex e0734e7..ed3b9b8 100644\n--- a/debian/live-installer.postinst\n+++ b/debian/live-installer.postinst\n@@ -27,10 +27,17 @@ install_live_system () {\n \tPLACE_FOUND=0\n \n \t# Load filesystem support\n-\tfor script in $(ls /usr/lib/live-installer-fs-support.d/*); do\n+\tfor script in $(ls /lib/live-installer/*); do\n \t\t. $script\n \tdone\n \n+\t# XXX: To be dropped in jessie when a fixed partman-target is made\n+\t# available.\n+\t# Drop /var/lock and /var/run directories created by\n+\t# partman-target so that the tar call that follows can install\n+\t# symlinks there.\n+\trmdir /target/var/lock /target/var/run 2>/dev/null || true\n+\n \t# Backup files that should not be overwritten by the copy\n \tfor f in $FILES_TO_PRESERVE; do\n \t    if [ -e /target$f ] && [ ! -e /target/${f}.live-installer ]; then\n@@ -56,7 +63,7 @@ install_live_system () {\n \t\tmkdir -p /target\n \t\texec 4>&0\n \t\ttar c . | \\\n-\t\t(cd /target && tar xv) | \\\n+\t\t(chdir /target && tar xv) | \\\n \t\t(\n \t\t\twhile read line; do\n \t\t\t\tCOUNT=$(($COUNT + 1))\n@@ -69,7 +76,7 @@ install_live_system () {\n \t\t\tdone\n \t\t\tif [ $COUNT -lt $STEPS ]; then\n \t\t\t\terror \"The tar process copying the live system failed (only $COUNT out of $STEPS files have been copied, last file was $line).\"\n-\t\t\t\tcd /\n+\t\t\t\tchdir /\n \t\t\t\teval ${SUPPORT}_teardown\n \t\t\t\texit 1\n \t\t\tfi\n@@ -80,7 +87,7 @@ install_live_system () {\n \t\t\t(cd /target && setfattr --no-dereference --restore=-) \\\n \t\t\t|| true\n \n-\t\tcd /\n+\t\tchdir /\n \t\teval ${SUPPORT}_teardown\n \tdone\n \ndiff --git a/live-installer.d/openssh-server b/live-installer.d/openssh-server\nindex 3294c40..21d46cb 100755\n--- a/live-installer.d/openssh-server\n+++ b/live-installer.d/openssh-server\n@@ -3,7 +3,7 @@\n # Unfortunately, we can't use in-target here as this doesn't allow to set the\n # debconf frontend to noninteractive.\n \n-. /usr/lib/chroot-setup.sh\n+. /lib/chroot-setup.sh\n \n if ! chroot_setup; then\n \tlogger -t live-installer -- \"Unexpected error; command not executed: '$@'\"\ndiff --git a/live-installer.d/ssl-cert b/live-installer.d/ssl-cert\nindex cca8bb4..901e811 100755\n--- a/live-installer.d/ssl-cert\n+++ b/live-installer.d/ssl-cert\n@@ -2,7 +2,7 @@\n \n set -e\n \n-for config in /target/usr/lib/live/config/*-ssl-cert;\n+for config in /target/lib/live/config/*-ssl-cert;\n do\n     if [ -x $config ]; then\n \tin-target ${config##/target}\ndiff --git a/post-base-installer.d/25live-installer-console-setup b/post-base-installer.d/25live-installer-console-setup\nindex 36302af..c1696ae 100755\n--- a/post-base-installer.d/25live-installer-console-setup\n+++ b/post-base-installer.d/25live-installer-console-setup\n@@ -8,7 +8,7 @@ if [ \"$(debconf-get live-installer/enable)\" != true ]; then\n \texit 0\n fi\n \n-. /usr/lib/chroot-setup.sh\n+. /lib/chroot-setup.sh\n \n if ! chroot_setup; then\n \tlogger -t live-installer -- \"Unexpected error; command not executed: '$@'\"\ndiff --git a/support/btrfs b/support/btrfs\nold mode 100755\nnew mode 100644\nindex 3db9b29..3dd3048\n--- a/support/btrfs\n+++ b/support/btrfs\n@@ -8,7 +8,10 @@ PLACES=\"$PLACES /cdrom/casper/filesystem.btrfs\"\n btrfs_prepare() {\n \tANNA_QUIET=1 anna-install btrfs-modules || true\n \n-\tdepmod -a > /dev/null 2>&1 || true\n+\tif [ -x /sbin/depmod ]; then\n+\t\tdepmod -a > /dev/null 2>&1 || true\n+\tfi\n+\n \tmodprobe btrfs || true\n \tmodprobe loop || true\n \ndiff --git a/support/dir b/support/dir\nold mode 100755\nnew mode 100644\ndiff --git a/support/extX b/support/extX\nold mode 100755\nnew mode 100644\nindex aa81513..3bf8965\n--- a/support/extX\n+++ b/support/extX\n@@ -8,7 +8,10 @@ PLACES=\"$PLACES /cdrom/casper/filesystem.ext2 /cdrom/casper/filesystem.ext3 /cdr\n extX_prepare() {\n \tANNA_QUIET=1 anna-install ${1}-modules || true\n \n-\tdepmod -a > /dev/null 2>&1 || true\n+\tif [ -x /sbin/depmod ]; then\n+\t\tdepmod -a > /dev/null 2>&1 || true\n+\tfi\n+\n \tmodprobe $1 || true\n \n \tmkdir -p /mnt\ndiff --git a/support/squashfs b/support/squashfs\nold mode 100755\nnew mode 100644\nindex 3570e66..f37cc1e\n--- a/support/squashfs\n+++ b/support/squashfs\n@@ -8,7 +8,10 @@ PLACES=\"$PLACES /cdrom/casper/filesystem.squashfs\"\n squashfs_prepare() {\n \tANNA_QUIET=1 anna-install squashfs-modules || true\n \n-\tdepmod -a > /dev/null 2>&1 || true\n+\tif [ -x /sbin/depmod ]; then\n+\t\tdepmod -a > /dev/null 2>&1 || true\n+\tfi\n+\n \tmodprobe squashfs || true\n \tmodprobe loop || true\n \n","content_type":"text/plain","diff_type":"vcs","new_revision":"git-v1:6f4b93b1a6988a2490695545fece4bbcb31a06aa"}