From: Michael Prokop Date: Thu, 13 Dec 2018 14:58:31 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: debian/1%20180603+grml.1~4 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=f35e0cfae2a2c7b15ed6a38211264b7b26b80a43 Merge remote-tracking branch 'upstream/master' Sync with upstream (https://salsa.debian.org/live-team/live-boot/), git commit 7130a2c0b. --- f35e0cfae2a2c7b15ed6a38211264b7b26b80a43 diff --cc backend/initramfs-tools/live.hook index 9c2ec69,1817814..ef148b6 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@@ -243,15 -245,10 +251,17 @@@ d copy_exec "${_SHLIB}" done - # might be needed if /etc/hosts is used - #mkdir -p "${DESTDIR}/etc" - #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" + if [ ! -e "${DESTDIR}/etc/nsswitch.conf" ] + then + # Needed to make "hostname -f" honor the domainname provided by DHCP + echo "hosts: files dns" > "${DESTDIR}/etc/nsswitch.conf" + fi +# vlan support +if [ -x /sbin/vconfig ] +then + copy_exec /sbin/vconfig + manual_add_modules 8021q +fi + [ "${QUIET}" ] || echo . diff --cc debian/changelog index 8020c0c,1a113fe..2e3fddc --- a/debian/changelog +++ b/debian/changelog @@@ -1,74 -1,111 +1,166 @@@ + live-boot (1:20180603) unstable; urgency=medium + + [ Luca Boccassi ] + * Mark live-boot-doc as Multi-Arch: foreign + * Remove --parallel from dh to fix Lintian Warning. + + [ Benjamin Drung ] + * Fix resolving FQDN given by DHCP + * Double quote to prevent globbing and word splitting + + -- Raphaël Hertzog Sun, 03 Jun 2018 23:00:11 +0200 + + live-boot (1:20180328) unstable; urgency=low + + [ Raphaël Hertzog ] + * Fix read-only persistence mode with overlayfs. Closes: #877776 + Thanks to Ronny Standtke for the patch. + * Add a small warning in the long description that the + package must not be installed on a regular system, but only in + a live image. Closes: #884886 + * Strip comments from checksums files passed to "shaXsum -c" + Thanks to Andreas Heinlein for the report (Closes: #856482) + + [ Steve McIntyre ] + * Repo moved to salsa + + [ Benjamin Drung ] + * Don't replace busybox's wget by the true wget. + It was likely done for https support but since buster the busybox + provided wget has https support too. We save a lot of space by + doing so (8 Mb). (Closes: #885455) + * Avoid double slashes in some paths (Closes: #885453) + * Support setting upperdir tmpfs size with overlay-size boot parameter + (Closes: #885466) + * Simplify mount point handling by using /run/live instead of /lib/live/mount + (Closes: #886328) + * Add configuration variables to build a stripped down initrd + (Closes: #886337) + + [ Daniel Reichelt ] + * Use klibc's mount again for fuse mounts (Closes: #868559) + + [ raizo62 ] + * Update DNSFILE even if DNSFILE contains only commented or empty lines + + [ Sameer Agrawal ] + * Fix ifconfig parsing (Closes: #892772) + + [ Chas Williams ] + * Add back persistence fsck option + * Remove workaround for ipconfig issues + + [ Benjamin Drung ] + * Remove sourcing /scripts/functions in components + * Support live-{top,premount,bottom} hooks (Closes: #884355) + + [ Luca Boccassi ] + * Add backward compatibility rbind mount /lib/live/mount -> /run/live. + The paths used in the current released versions of live-boot are a + form of public API, and existing applications and scripts might rely + on them. Do a recursive bind mount of the new path on the previous one + so that they do not break on upgrade (see #886328). + This backward-compatible mount point will be deprecated and removed + before the Bullseye (Debian 11) release. Users are recommended to start + migrating to the new /run/live path as soon as possible. + + [ Erik Ziegenbalg ] + * fromiso: add support for local ISO (ONIE) + + [ Luca Boccassi ] + * Clarify FROMISO documentation in live-boot manpage + * Use HTTPS in debian/copyright (policy 4.0.0). + * Remove dead link to live-systems.org from debian/copyright. + * Bump Standards-Version to 4.1.3, no changes. + * Add myself to Uploaders. + + -- Luca Boccassi Wed, 28 Mar 2018 20:07:39 +0100 + + live-boot (1:20170623) unstable; urgency=medium + + * Do not duplicate files in /lib/live/boot/ and /bin/boot/ in the initrd. + Closes: #864385 Thanks to Daniel Reichelt for the + patch. + * Take into account the fact that udevadm is now in /bin and no longer in + /sbin. Closes: #852570 + * Add myself to Uploaders. + * Bump debhelper compat to 10. + * Bump Standards-Version to 4.0.0. + * Fix spelling errors in live-boot(7). + + -- Raphaël Hertzog Fri, 23 Jun 2017 14:41:06 +0200 + -live-boot (1:20170112) unstable; urgency=medium +live-boot (1:20170112+grml.1) unstable; urgency=medium + + [ Kristian Klausen ] + * [d73c5d5] Check /etc/live/boot.conf exist before trying copy + * [c409a25] Add FAT ascii iocharset support via adding the + "nls_ascii" module to the initrd (Closes: #850532) [ Raphaël Hertzog ] - * Team upload. - * Fix nodhcp option to actually force DHCP off. Closes: #785345 - Thanks to Frank Lillo for the report and Evgeni Golov for the patch. - * Improve 9990-misc-helpers.sh when /sys/block/ is empty. - Closes: #847802 - * Multiple cleanups to appease lintian. + * [7d04ce6] Fix typo in nls_ascii module (nls_asci -> nls_ascii) + * [061976c] Add missing changelog entries + * [2690692] Improve removable_dev() in 9990-misc-helpers.sh when + /sys/block/ is empty (Closes: #847802) + * [d78be8a] Multiple cleanups to appease lintian. + * [4ccc833] Prepare release to unstable + * [aac9014] Only copy /etc/live/boot if it exists + + [ Evgeni Golov ] + * [b88a8da] fix nodhcp option to actually force DHCP off. Thanks to + Frank Lillo (Closes: #785345) + + -- Michael Prokop Sun, 26 Mar 2017 10:19:17 +0200 + +live-boot (1:20160511+grml.1) unstable; urgency=medium + + The "capetown AKA debconf16" release + + [ Evgeni Golov ] + * [d7a4f37] allow the use of multiple initramfs hooks and scripts again + * [16ee41d] make copying libnss_dns.so.* unconditionally + * [11a6c11] fix detection of (no)persistence option in read-only mode + * [03fc557] update manpages with default overlay filesystem + + [ Ulrich Dangel ] + * [f747483] Add kms modules to initramfs + + [ Michael Prokop ] + * [1799c46] Try loading phram module twice to fix loading issue. + * [ac5eb22] Revert toram bootoption to expected behaviour. + * [e3cbd82] Enable write-mode for persistency related devices in + readonly/forensic mode + * [da50dd4] ignore "unknown" filesystems in is_supported_fs() + * [6f465dd] Support dns bootoption. + * [de513c1] Drop deprecated live-boot-grml init script + * [a00236b] debian/rules: drop deprecated build target + * [54c3318] debian/rules: drop dpatch workaround which is no longer + needed + * [a4eba80] Drop dpkg trigger for update-initramfs + * [010800e] Adjust permissions of backend/initramfs-tools/kms.hook + * [7da805e] Bump Standards-Version to 3.9.8 + * [50ff238] Revert "Copy /etc/live/boot{,.conf} to initramfs" + + [ Wolfgang Scheicher ] + * [30b31df] Enable multiple lower layers for overlayfs + + [ Russell Stuart ] + * [4ec4294] default the host in fetch urls to be ROOTSERVER if it is + blank (Closes: #800498) + + [ Raphaël Hertzog ] + * [e81e9c6] Update build system to rely on "dpkg-parsechangelog -S + Version" instead of outdated VERSION file. + * [e75ad2c] Fix typo in variable name + * [3d23fca] No longer modify PATH to point to /root (Closes: #823069) + * [cbf1f9d] Some fixups to ensure we work with busybox/klibc-utils + * [3d30fee] Drop debian/source/*options and dh_builddeb override + * [40bb20f] Prepare for release [ Kristian Klausen ] - * Add "nls_ascii" module in the initrd so that we can access FAT - partitions. Closes: #850532 - * Copy /etc/live/boot.conf and /etc/live/boot to the initrd. + * [b98d289] Copy /etc/live/boot{,.conf} to initramfs - -- Raphaël Hertzog Thu, 12 Jan 2017 16:59:49 +0100 + -- Michael Prokop Tue, 05 Jul 2016 19:36:14 +0200 live-boot (1:20160511) unstable; urgency=medium diff --cc debian/control index 3290dbe,65c8b6d..ecffb52 --- a/debian/control +++ b/debian/control @@@ -1,26 -1,24 +1,26 @@@ Source: live-boot Section: misc Priority: optional -Maintainer: Live Systems Maintainers -Uploaders: Iain R. Learmonth , Raphaël Hertzog , - Luca Boccassi +Maintainer: Grml Team Build-Depends: - debhelper (>= 9), - Standards-Version: 3.9.8 + debhelper (>= 10), + Standards-Version: 4.1.3 -Homepage: https://debian-live.alioth.debian.org/live-boot/ -Vcs-Browser: https://salsa.debian.org/live-team/live-boot -Vcs-Git: https://salsa.debian.org/live-team/live-boot.git +Homepage: http://live.debian.net/devel/live-boot/ +Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git +Vcs-Git: git://git.grml.org/live-boot-grml.git +Origin: Grml +Bugs: mailto:bugs@grml.org -Package: live-boot +Package: live-boot-grml Architecture: all Depends: - live-boot-initramfs-tools | live-boot-backend, + live-boot-grml-initramfs-tools | live-boot-backend, ${misc:Depends}, Recommends: - live-boot-doc, + live-boot-grml-doc, live-tools, + eject, + file, rsync, uuid-runtime, Suggests: @@@ -28,23 -26,21 +28,25 @@@ curlftpfs, httpfs2, wget, +Conflicts: live-boot +Replaces: live-boot +Provides: live-boot Description: Live System Boot Components - The Live Systems project maintains the components to build Debian based Live - systems and the official Debian Live images themselves. - . live-boot contains the components to configure a live system during the boot - process (early userspace). + process (early userspace). Do not install this package on your regular system, + it is only meant to be used in a live image. . In addition to live-boot, a backend for the initrd generation is required, such as live-boot-initramfs-tools. + . + Please notice that this package is maintained by the grml.org team. + This is NOT a fork of Debian's live-boot, it's just a customized + version to better fit Grml's needs. -Package: live-boot-doc +Package: live-boot-grml-doc Section: doc Architecture: all + Multi-Arch: foreign Depends: ${misc:Depends}, Description: Live System Boot Components (documentation) @@@ -78,10 -70,7 +80,11 @@@ Description: Live System Boot Component systems and the official Debian Live images themselves. . live-boot contains the components to configure a live system during the boot - process (early userspace). + process (early userspace). Do not install this package on your regular system, + it is only meant to be used in a live image. . This package contains the initramfs-tools backend. + . + Please notice that this package is maintained by the grml.org team. + This is NOT a fork of Debian's live-boot, it's just a customized + version to better fit Grml's needs.