From: Evgeni Golov Date: Wed, 13 Feb 2013 21:14:29 +0000 (+0100) Subject: Merge branch 'debian-next' into master-next X-Git-Tag: debian/4.0_a13-1+grml.1~13 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=d9586141f1bf766d5cfd77346bc48e6885d5762f;hp=-c;p=live-boot-grml.git Merge branch 'debian-next' into master-next Conflicts: debian/changelog --- d9586141f1bf766d5cfd77346bc48e6885d5762f diff --combined debian/changelog index 9464591,233cca9..cdf691c --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,50 +1,60 @@@ + live-boot (3.0.0-1) unstable; urgency=low + + [ Daniel Baumann ] + * Updating manpage year handling for 2013. + + [ Richard Nelson ] + * Replace noprompt with noeject on manpage. + + [ Daniel Baumann ] + * Updating noeject description in manpage. + + [ chals ] + * Updating Spanish translation in respect to noeject. + + [ Daniel Baumann ] + * Dropping dpkg compression level. + * Calling df with -P to avoid line wraps with overly long mountpoints. + + [ Tails developers ] + * Improving test for /etc/fstab.d support by testing for its existence + instead of /run's one. + + [ Daniel Baumann ] + * Removing some dead code in netbase parts. + + [ Gaudenz Steinlin ] + * Fixing support for multiple squashfs images (Closes: #696494). + * Fixing mounting of rootfs, cow and medium filesystems (Closes: + #696495). + + [ Daniel Baumann ] + * Correcting persistence-label handling fwrt/ legacy live-boot 2.x + support, thanks to Mike Gach (Closes: #697873). + + -- Daniel Baumann Tue, 12 Feb 2013 08:23:17 +0100 + + live-boot (3.0~b11-1) unstable; urgency=low + + * Updating year in copyright file. + * Supporting legacy filenames for checksums in debian within verify- + checksums. + * Correcting legacy filename for checksum files. + * By default including sha256sum only in progress-linux, keep md5sum + legacy for debian. + + -- Daniel Baumann Wed, 02 Jan 2013 11:32:21 +0100 + +live-boot (3.0~b10-1+grml.1) unstable; urgency=low + + [ Evgeni Golov ] + * [795263e] refresh 29_support_dns_in_initramfs.patch against + current upstream + * [2045fef] drop 43_do_not_fix_mountpoints_with_live-persistence.patch, + applied upstream + + -- Michael Prokop Tue, 18 Dec 2012 01:41:16 +0100 + live-boot (3.0~b10-1) unstable; urgency=low [ Daniel Baumann ] @@@ -33,23 -70,6 +80,23 @@@ -- Daniel Baumann Mon, 17 Dec 2012 20:22:50 +0100 +live-boot (3.0~b9-1+grml.1) unstable; urgency=low + + [ Evgeni Golov ] + * [bdc44cd] drop 37_fix_legacy_persistence_handling.patch, applied + upstream + + [ Michael Prokop ] + * [1aa780a] Refresh patches against current master + * [a133107] Add patch to drop nameserver handling from ip= boot + parameter + * [7782d4f] Add patch to restore support for persistence media with + LABEL=custom-ov (credits to Evgeni) + * [b7de9b2] Do not fix mountpoints with live-persistence.conf as + home-rw/live-rw (credits to Evgeni) + + -- Michael Prokop Mon, 17 Dec 2012 18:22:27 +0100 + live-boot (3.0~b9-1) unstable; urgency=low [ Tails developers ] @@@ -60,16 -80,6 +107,16 @@@ -- Daniel Baumann Mon, 10 Dec 2012 20:01:21 +0100 +live-boot (3.0~b8-1+grml.1) unstable; urgency=low + + The "sync with Debian's 3.0~b8-1 version" release + + [ Evgeni Golov ] + * [ce765d3] refresh patches against Debian's 3.0~b8-1 + * [b484d6d] allow the use of multiple initramfs hooks and scripts again + + -- Michael Prokop Thu, 06 Dec 2012 12:51:50 +0100 + live-boot (3.0~b8-1) unstable; urgency=low * Removing eject from recommends, the script that ejects the live medium @@@ -404,76 -414,6 +451,76 @@@ live-boot (3.0~a28-1) experimental; urg -- Daniel Baumann Mon, 04 Jun 2012 17:31:32 +0200 +live-boot (3.0~a27-1+grml.7) grml-testing; urgency=low + + * [a488db6] Enable write-mode for persistency related devices in + readonly/forensic mode + + -- Michael Prokop Fri, 14 Sep 2012 17:01:39 +0200 + +live-boot (3.0~a27-1+grml.6) grml-testing; urgency=low + + [ Lukas Schwaighofer ] + * [95fb70f] fixed legacy persistence handling + + [ Michael Prokop ] + * [ed79f48] readonly: do not check for "forensic" boot option + * [72aebf1] Move changes to scripts/live-premount/readonly into debian + patch file + + -- Michael Prokop Fri, 07 Sep 2012 13:43:08 +0200 + +live-boot (3.0~a27-1+grml.5) grml-testing; urgency=low + + * [8b51f69] Adjust 15_networking_grml.patch + 27_support_static_ip.patch + for klibc's ipconfig /run switch + * [bbeb928] Add "Breaks: klibc-utils (<< 2.0-2)" to live-boot-grml- + initramfs-tools for /run switch + * [cad0077] Refresh debian/patches/35_fix_findiso_umount.patch + * [7f450c2] Support overriding "nodhcp" boot option via "dhcp" + * [2b065a0] Adjust file permissions also of files that are added during + dh_quilt_patch stage + + -- Michael Prokop Fri, 27 Jul 2012 15:06:38 +0200 + +live-boot (3.0~a27-1+grml.4) grml-testing; urgency=low + + * [6d32dfe] Check for presence of /tmp/net-${device}.conf before + sourcing it [Closes: issue1196] Thanks to Marc 'Zugschlus' Haber for + the bugreport and debugging this issue + + -- Michael Prokop Mon, 23 Jul 2012 17:13:42 +0200 + +live-boot (3.0~a27-1+grml.3) grml-testing; urgency=low + + * [d978027] 35_fix_findiso_umount.patch: make sure ISO gets unmounted + correctly when using findiso/toram. Thanks to Christoph Biedl for the + bugreport and the patch + * [d621ee2] 34_ignore_unknown_filesystems.patch: also ignore fstype swap + + -- Michael Prokop Mon, 28 May 2012 12:27:08 +0200 + +live-boot (3.0~a27-1+grml.2) grml-testing; urgency=low + + * [e161c2c] New patch to ignore "unknown" filesystems in + is_supported_fs() [Testing: issue1170] + + -- Michael Prokop Sun, 20 May 2012 18:54:58 +0200 + +live-boot (3.0~a27-1+grml.1) grml-testing; urgency=low + + * [3039c63] Sync with Debian's upstream/3.0_a27 (new log file name, + persistency reworked,...) + * [06185b3] Bump Standards-Version, raise Build-Depends from dh 8 to dh + 9 + raise compat version to 9 + * [2998c28] Drop debian/patches/07_support_findiso.patch which is in + upstream nowadays + * [3967979] Drop deprecated debian/patches/14_no_blkid_on_lenny.patch + * [91460b9] Refresh debian/patches/ against new upstream code + * [7116647] Drop deprecated debian/patches/28_remove_localized_manpages.patch + + -- Michael Prokop Wed, 09 May 2012 14:10:37 +0200 + live-boot (3.0~a27-1) experimental; urgency=low [ Daniel Baumann ] @@@ -647,39 -587,6 +694,39 @@@ live-boot (3.0~a25-1) unstable; urgency -- Daniel Baumann Mon, 06 Feb 2012 23:27:38 +0100 +live-boot (3.0~a24-1+grml.2) grml-testing; urgency=low + + [ Ulrich Dangel ] + * [87a8e76] Append nameservers provided via dns bootoption into + initramfs resolv.conf + + [ Michael Prokop ] + * [1d25495] Add genext2fs to depends [Closes: issue1126] Thanks to + Charles A. Hewson for the bugreport + + -- Michael Prokop Wed, 04 Jan 2012 16:48:38 +0100 + +live-boot (3.0~a24-1+grml.1) grml-testing; urgency=low + + * Resynchronized with Debian. + + [ Christian Hofstaedtler ] + * Resynchronized with Debian. + * Drop upstream-applied patch: 01_fix_output_file + * Drop upstream-applied patch: 10_validateroot + * Drop upstream-applied patch: 25_support_lvm_for_live-media + * 07_support_findiso: remove upstream-applied parts + * Manually refreshd patch 31_package_rename + + [ Ulrich Dangel ] + * Add kms modules to initramfs + * Install hook instead of specifying modules.d + + [ Michael Prokop ] + * Try loading phram module twice to fix loading issue. + + -- Christian Hofstaedtler Tue, 06 Dec 2011 22:26:32 +0100 + live-boot (3.0~a24-1) unstable; urgency=low * Removing quotes from udev path_id command to actually execute the @@@ -786,38 -693,6 +833,38 @@@ live-boot (3.0~a20-1) unstable; urgency -- 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 @@@ -840,51 -715,6 +887,51 @@@ live-boot (3.0~a18-1) unstable; urgency -- Daniel Baumann Sat, 11 Jun 2011 11:24:15 +0200 +live-boot (3.0~a17-1+grml.01) unstable; urgency=low + + * [6666658] Do not fail in multiarch environment when + installing libnss_dns.so. + * [ebdefd9] Drop installation of localized manpages + from upstream Makefile. + + -- Michael Prokop Wed, 08 Jun 2011 12:15:23 +0200 + +live-boot (3.0~a17-1+grml.00) unstable; urgency=low + + [ Christian Hofstaedtler ] + * [c9a70fd] Add dpatch support to build process. + * [a9ddc0a] Readd Grml patches. + * [675f2b2] Remove unused boot scripts. + * [c4993d4] Update debian/control for Grml. + * [0716b66] Ensure 10validateroot is executable. + * [b5b937f] Always honor the "nodhcp" boot option. + * [10cf847] Don't mess around with kernel/initramfs-tools' ip=. + * [aa93321] Networking_grml: DNS for systems without resolvconf. + * [2a859b8] Merge dhcphostname support into 23networking-grml. + * [10caf0b] Support DNS in boot environment. + + [ Michael Prokop ] + * [6cd3977] Add patch number 19 to revert the toram bootoption + to expected behaviour. + * [65fa11b] Support dns bootoption. + + [ Ulrich Dangel ] + * [df17b43] Support lvm devices for live-media. + * [8ff045c] Support raid devices as well. + * [2ad3c30] Change output to live-boot.log. + * [34b4518] Explicit specify offset parameter for setup_loop. + [Closes: issue1003] + * [3ac64e5] Remove dba from uploader as this is a Grml project. + * [b289379] Support static ip configuration. + * [1371673] Improve static version. + * [9487c5d] Change nodhcp patch to unset the DHCP option as well. + * [1662374] Support nodhcp bootoption. + * [7847abd] Ignore devices with no file matching the findiso parameter. + * [7158e84] Don't show an error message if /live/image is already + unmounted. + + -- Michael Prokop Sun, 05 Jun 2011 21:29:14 +0200 + live-boot (3.0~a17-1) unstable; urgency=low [ Daniel Baumann ] diff --combined debian/rules index 65404fe,ba9bb63..916ea28 --- a/debian/rules +++ b/debian/rules @@@ -1,34 -1,21 +1,34 @@@ #!/usr/bin/make -f +build: + # regular build. + dh build + %: - dh ${@} + dh ${@} --with quilt 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 rm -f debian/lib/live/boot/FIXME # 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 + + # this is needed because dpatch doesn't do file modes on diffs + # and we can't execute this fix during build stage as new files + # might be installed during dh_quilt_patch + chmod a+rx debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/* + chmod a+rx debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/hooks/* override_dh_builddeb: - dh_builddeb -- -Zxz -z9 + dh_builddeb -- -Zxz override_dh_install: dh_install --fail-missing + +override_dh_installinit: + dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'