From: Christian Hofstaedtler Date: Tue, 6 Dec 2011 20:40:44 +0000 (+0100) Subject: Merge branch 'debian' X-Git-Tag: v3.0_a24-1+grml.1~9 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8 Merge branch 'debian' Conflicts: debian/changelog debian/control debian/rules --- 6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8 diff --cc debian/changelog index 96d42b0,8a7eb5c..0115e5d --- a/debian/changelog +++ b/debian/changelog @@@ -1,35 -1,109 +1,141 @@@ + live-boot (3.0~a24-1) unstable; urgency=low + + * Removing quotes from udev path_id command to actually execute the + command. + + -- Daniel Baumann Sun, 04 Dec 2011 09:58:23 +0100 + + live-boot (3.0~a23-1) unstable; urgency=low + + [ Tails developers ] + * Enabling whiteouts support for aufs. + + [ Daniel Baumann ] + * Update udevs path_id changes as of version 174, thanks to Baurzhan + Muftakhidinov for spotting it. + + [ Tails developers ] + * Adding persistent-encryption={none|luks}. + * Making persistent-encryption=luks strict. + * Making sure dm-crypt is loaded when dealing with LUKS devices. + * Adding persistent-storage=TYPE... + * Removing now obsolete persistent=* arguments. + * Adding persistent-method=METHOD... + * Fixing an incorrectly redirected newline. + * Clarifying what happens when you don't retry decrypting a device. + * Refactoring device scanning in find_{cow_device,files}. + * Making use of is_supported_fs in find_cow_devices (like in + find_files). + * Refactoring overlay and snapshot scanning code. + * Fixing a "sh: bad number" when $offset is not passed to + setup_loop(). + * Disabling persistent-encryption=luks if dependencies are + unavailable. + * Adding persistent-read-only boot parameter. + * Changing persistent-encryption to accept a list TYPE... instead. + * Updating live-boot man page for persistent-encryption. + * Updating live-boot man page for persistent-storage. + * Updating live-boot man page for persistent-method. + * Updating and rewording live-boot man page for the persistent option. + * Making persistent-read-only work for home-rw overlays. + * Making persistent-read-only work for live-rw overlays. + * Updating live-boot man page for persistent-read-only. + * Adding workaround for a busybox bug with grep -w. + + -- Daniel Baumann Mon, 28 Nov 2011 18:26:11 +0100 + + live-boot (3.0~a22-1) unstable; urgency=low + + [ Daniel Baumann ] + * Using compression level 9 also for binary packages. + * Updating matching in is_nice_device to, amongst others, match for + virtio devices. + * Include overlayfs modules in initramfs if existing. + + [ Marco Amadori ] + * Fix live-snapshot exclude.list handling (Closes: #610337) + + [ Daniel Baumann ] + * Sorting overrides in rules alphabetically. + + -- Daniel Baumann Fri, 04 Nov 2011 11:37:28 +0100 + + live-boot (3.0~a21-1) unstable; urgency=low + + [ Daniel Baumann ] + * Silencing rmdir calls in makefile. + * Printing out a warning message in initramfs-tools hook if backend is + installed but no live-boot package, exiting early and not breaking + update-initramfs (Closes: #639884). + + [ Tails developers ] + * Fixing cache_path: cache non-executable libs dependencies as well. + * Fixing cache_path: taking into account the three forms of ldd output + lines. + * Adding a white_listed_devices parameter to find_cow_device and + find_files. + * Factorizing loops on removable/non-removable devices. + * Adding support for persistent-media={removable,removable-usb}. + * Silencing umount in case live/image was unmounted already, extracted + from a patch by Michael Schierl . + * Erroring out in case a "wrong" filesystem was chosen. + + [ Daniel Baumann ] + * Using /usr/share/live-boot instead of unreliable + /usr/share/doc/live-boot in validateroot bootscript, stripped live + systems may or may not carry /usr/share/doc. + + -- Daniel Baumann Thu, 08 Sep 2011 21:06:28 +0200 + + live-boot (3.0~a20-1) unstable; urgency=low + + [ Daniel Baumann ] + * Updating section for live-boot-doc. + + [ Ben Armstrong ] + * Cross-referencing lb_config --bootappend-live. + + [ Daniel Baumann ] + * Correcting bootappend-live reference in live-boot manpage. + * Applying patch from grml to update forgotten use of live.log with + live-boot.log. + * Applying reformated patch from Ulrich Dangel to add + support for lvm and md devices. + + -- Daniel Baumann Thu, 04 Aug 2011 21:20:47 +0200 + +live-boot (3.0~a19-1+grml.01) grml-testing; urgency=low + + * Depend on quilt with a version to quiet lintian + * Add debian/control headers Origin, Bugs + + -- Christian Hofstaedtler Wed, 30 Nov 2011 13:24:41 +0100 + +live-boot (3.0~a19-1+grml.00) unstable; urgency=low + + * Resync with Debian. This brings in: + [ Daniel Baumann ] + * Updating and correcting sendsigs.omit support for /run (Closes: #628188). + * Removing accidentally twice included English files when installing manpages. + * Correct rmdir call in top-level Makefiles uninstall target to not fail if there was no prior live-boot installation. + * Making references to debian more distribution neutral. + * Replacing reference to old alioth page in live-snapshot. + * Splitting out documentation so that it can be accesses separately from the initramfs code. + * Adding conflicts/replaces for live-boot to live-boot-doc to not break upgrades. + + * Grml changes: + [ Ulrich Dangel ] + * [8424e93] Use quilt instead of dpatch + * [86ca4d5] Remove old manpage live-snapshot.it.1.txt + * [7fb9e91] Support comma delimited devices in live-media-path + * [6b21c57] Depend on the same live-boot-initramfs-tools/live-boot-backend version. + + [ Christian Hofstaedtler ] + * Rename packages to not clash with Debian. + * Resynced with Debian. + + -- Christian Hofstaedtler Mon, 25 Jul 2011 02:26:40 +0200 + live-boot (3.0~a19-1) unstable; urgency=low * Correct rmdir call in top-level Makefiles uninstall target to not diff --cc debian/control index 58f33c7,301b583..4021c30 --- a/debian/control +++ b/debian/control @@@ -24,17 -20,13 +24,18 @@@ Description: Debian Live - System Boot . 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 Depends: ${misc:Depends} -Conflicts: live-boot (<< 3.0~a18~) -Replaces: live-boot +Conflicts: live-boot (<< 3.0~a18~), live-boot-doc +Replaces: live-boot, live-boot-doc +Provides: live-boot-doc Description: Debian Live - System Boot Scripts (documentation) live-boot contains the scripts that configure a Debian Live system during the boot process (early userspace). diff --cc debian/rules index 41a057a,61a5e25..910523b --- a/debian/rules +++ b/debian/rules @@@ -14,19 -7,17 +14,22 @@@ override_dh_auto_install dh_auto_install -- DESTDIR=debian/tmp # Removing useless files - rm -f debian/tmp/usr/share/doc/live-boot/COPYING + rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING + # Some more useless files + rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/12fstab + rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/23networking + rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/24preseed + rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/30accessibility # live-boot-initramfs-tools - mkdir -p debian/live-boot-initramfs-tools/usr/share - mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share + mkdir -p debian/live-boot-grml-initramfs-tools/usr/share + mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share - override_dh_installinit: - dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .' + override_dh_builddeb: + dh_builddeb -- -Zgzip -z9 override_dh_install: dh_install --fail-missing + + override_dh_installinit: - dh_installinit -p live-boot --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .' ++ dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'