From: Evgeni Golov Date: Mon, 26 Nov 2012 16:20:32 +0000 (+0100) Subject: Merge branch 'debian': Imported 3.0~b6-1 from Debian Live X-Git-Tag: v3.0_b8-1+grml.1~5 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=76af4813596007fc5e4db649f9dd9b498058e2e2 Merge branch 'debian': Imported 3.0~b6-1 from Debian Live Conflicts: Makefile VERSION backends/initramfs-tools/live.hook bin/live-snapshot debian/changelog debian/control debian/copyright debian/live-boot-grml-initramfs-tools.triggers debian/live-boot-grml.init debian/rules manpages/de/live-boot.de.7 manpages/de/live-snapshot.de.1 manpages/en/live-boot.7 manpages/en/live-snapshot.1 manpages/po/de/live-boot.7.po manpages/po/de/live-snapshot.1.po manpages/po4a.cfg manpages/pot/live-boot.7.pot manpages/pot/live-snapshot.1.pot scripts/live scripts/live-bottom/08persistence_excludes scripts/live-bottom/12fstab scripts/live-helpers --- 76af4813596007fc5e4db649f9dd9b498058e2e2 diff --cc debian/changelog index 82d2d0a,381fe95..3c8d0c6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,106 -1,481 +1,584 @@@ + live-boot (3.0~b6-1) unstable; urgency=low + + * Including hfs and hfsplus modules in initrd to access filesystems on + apple systems. + * Stopping to put a tmpfs on /root/lib/live from within initramfs, it + over-'layered' most prominently the live systems /lib/live/config, + making the runtime configuration impossible and the tmpfs is not + used or needed in the first place anyway. + * Renaming rofs to more intuitive rootfs. + * Removing source-only readme file about boot scripts from the binary + package. + * Renaming the boot scripts readme file to fixme to make it even more + obvious. + + -- Daniel Baumann Tue, 02 Oct 2012 10:32:44 +0200 + + live-boot (3.0~b5-1) unstable; urgency=low + + * Updating to standards version 3.9.4. + * Removing showmounts option as it's enable always anyway. + * Applying slightly modified patch from Reinhard Tartler + to ensure that a potentially stray tmpfs on + /live/overlay gets removed to fix netboot failures (Closes: + #685375). + + -- Daniel Baumann Sun, 30 Sep 2012 10:07:09 +0200 + + live-boot (3.0~b4-1) unstable; urgency=low + + * Switching to final name for the persistence configuration file + 'persistence.conf' in line with boot parameter. + * Moving remaining stuff from /live to /lib/live to avoid further + namespace pollution. + + -- Daniel Baumann Thu, 27 Sep 2012 13:23:33 +0200 + + live-boot (3.0~b3-1) unstable; urgency=low + + [ Daniel Baumann ] + * Always move live filesystem mounts to /root within initramfs, + regardless if mountpoint already exists or not (Closes: #688782). + + [ Gaudenz Steinlin ] + * Removing mountpoint if no persistence layer is found on a device. + + [ Daniel Baumann ] + * Exposing rofs and persistence mounts under /live in the live + systems, not just initramfs only (Closes: #687099). + * Updating code for exposing of overlay mounts under /live too. + + -- Daniel Baumann Wed, 26 Sep 2012 14:40:32 +0200 + + live-boot (3.0~b2-1) unstable; urgency=low + + * Recreating /etc/live/boot in postinst. + * Removing /etc/live/boot if empty on purge in postrm. + * Regenerating initramfs on remove. + + -- Daniel Baumann Fri, 24 Aug 2012 12:37:23 +0200 + + live-boot (3.0~b1-1) unstable; urgency=low + + [ chals ] + * Fixing build error in 'es' man pages caused by a newline conflict. + + [ Daniel Baumann ] + * Removing live-new-uuid, a rewritten one goes to live-tools. + * Adding slightly modified patch from Steven Shiau + to transition to /run for network interface + definition files which fixes resolv.conf creation for netboot. + + [ Steven Shiau ] + * Reading /conf/param.conf after Select_eth_device in main function to + fix network booting (Closes: #683240). + + [ Daniel Baumann ] + * Moving reading of initramfs-tools functions to initramfs-tools + script. + * Consistently using case instead of if for conditionals in script + boilerplate. + * Laying tmpfs on /live/overlay only during initramfs stage, fixes + boot failure with plain filesystems (Closes: #681579). + * Correcting DNS inclusion in initramfs-tools hook, thanks to Steven + Shiau for reporting. + * Simplifying usage of copy_exec function from hooks-function in + initramfs-tools hook. + * Using /etc/live/boot/*.conf instead of /etc/live/boot.d/*.conf and + /live/image/live/boot/*.conf instead of + /live/image/live/boot.d/*.conf for consistency reasons. + * Reading configuration file from filesystem and live-media at runtime + too. + * Reading configuration files in initramfs-tools hook too. + + [ Steven Shiau ] + * Adding support for nameserver in ip= boot parameter. + + [ Daniel Baumann ] + * Making nameserver assignment from ip= bootparameter work with + persistence. + * Correcting permissions of /tmp which apparently somehow get mixed up + along the way. + * Updating scripts readme about transition to plugin based + architecture. + + -- Daniel Baumann Thu, 16 Aug 2012 12:21:04 +0200 + + live-boot (3.0~a38-1) unstable; urgency=low + + [ Daniel Baumann ] + * Extending verify-checksums parameters to allow specifying custom + list of digests. + * Harmonizing GPL boilerplate texts. + + [ Richard Nelson ] + * Correct left over references to old initramfs-tools.sh (Closes: + #682504). + + -- Daniel Baumann Fri, 27 Jul 2012 00:20:39 +0200 + + live-boot (3.0~a37-1) unstable; urgency=low + + [ Daniel Baumann ] + * Cleaning up initramfs-tools hook. + + [ Tails developers ] + * Fixing persistence backward-compatibility mode (Closes: #681176). + + [ Daniel Baumann ] + * Making swap function self contained. + * Making read-only function self contained. + * Making verify-checksums function self contained. + * Factoring out debug into an own function. + * Extending read-only parameters to allow specifying custom list of + devices. + * Avoid re-access /proc/cmdline in select-eth-device function and use + internal variable instead. + + -- Daniel Baumann Wed, 25 Jul 2012 17:18:06 +0200 + + live-boot (3.0~a36-1) unstable; urgency=low + + * Adding temporary notes in a readme file. + * Renaming boot scripts for refactoring them into numbered plugins. + * Renaming mountroot function to main to provide a generic live-boot + entry point for initramfs generators. + * Adding temporary redirection layer for dracut initramfs generator. + * Adding redirection layer for initramfs-tools initramfs generator. + * Splitting out already reviewed cmdline parsing script. + * Splitting out already reviewed read-only script. + * Splitting out already reviewed swapon script. + * Splitting out already reviewed verify-checksums script. + * Adding support for defining one or more explicit swap partitions to + be used. + + -- Daniel Baumann Wed, 18 Jul 2012 23:56:06 +0200 + + live-boot (3.0~a35-1) unstable; urgency=low + + * Correcting typo in fstab function call in mountroot, thanks to + Baurzhan Muftakhidinov . + + -- Daniel Baumann Thu, 28 Jun 2012 14:30:46 +0200 + + live-boot (3.0~a34-1) unstable; urgency=low + + [ Daniel Baumann ] + * Renaming persistent-subtext option into persistent-label and making + it define the complete label instead of a custom suffix only. + * Updating coding style in a first bunch of locations. + * Updating location for live-boot files in initramfs-tools hook, + thanks to Baurzhan Muftakhidinov . + * Making live-boot-initramfs-tools.postinst more error safe. + * Removing pre-wheezy dpkg trigger for update-initramfs. + * Removing superfluous directory in initramfs-tools hook. + * Sourcing individual live-boot scripts rather than executing them. + + [ Ben Armstrong ] + * Fix creation of /var/log/live in correct location. + + [ Daniel Baumann ] + * Switching to xz compression in source and binary packages. + + -- Daniel Baumann Wed, 27 Jun 2012 14:14:19 +0200 + + live-boot (3.0~a33-1) unstable; urgency=low + + [ chals ] + * Updating Spanish translation of man pages. + + [ Daniel Baumann ] + * Removing some more dead parameters from cmdline function. + * Removing double author entries in Spanish po files. + + -- Daniel Baumann Wed, 13 Jun 2012 13:26:49 +0200 + + live-boot (3.0~a32-1) experimental; urgency=low + + * Dropping snapshot functionality, superseeded by awesome custom mount + persistence. + * Setting persistence label for live-* 3.x persistency to + 'persistence', we're not making any difference between full-ov and + custom-ov anymore on the filesystem and partition label (it's + determined by the contents of live-persistence.conf). + + -- Daniel Baumann Wed, 06 Jun 2012 19:04:01 +0200 + + live-boot (3.0~a31-1) experimental; urgency=low + + [ Daniel Baumann ] + * Renaming etc directory to their actual name, examples, within source + tree. + * Simplyfing scripts declaration in Makefile. + + [ chals ] + * Fixing fuzzy strings in Spanish translation of man pages. + + [ Daniel Baumann ] + * Removing live-reconfigure, not used anymore. + * Removing live-preseed, not used anymore. + * Unbreaking cmdline parsing after variable rename. + * Moving off remaining functions from main boot script to subscript + for later cleanup. + + -- Daniel Baumann Tue, 05 Jun 2012 21:44:44 +0200 + + live-boot (3.0~a30-1) experimental; urgency=low + + * Removing dead lang2locale function and associated files, not used + anywhere. + * Converting select_eth_device initramfs-tools pre-mount script into + regular live-boot script. + * Consistenly using 'true' instead of 'Yes' or 'yes' when using + booleans. + * Removing some dead boot parameters. + * Splitting out integrity-check function to subscript. + * Rewriting live-media checksum verification to work with any SHA and + MD5 digests. + * Updating read-only handling to new parameter handling. + * Updating internal cmdline handling. + * Updating swapon handling to new parameter handling. + * Also allowing /dev/vd* to be used as swap devices and drop /dev/hd*. + * Splitting out swap handling and rewriting to a live-boot subscript. + * Moving validateroot bottom script into main boot script itself. + * Removing exporting of variables for reviewed options in the cmdline + function, not required. + * Removing fastboot handling, the normal system handles this via + 'fastboot' bootparameter already. + * Transforming persistence_excludes bottom script into normal live- + boot script. + * Transforming fstab bottom script into normal live-boot script. + * Transforming networking bottom script into normal live-boot script. + * Simplyfing initramfs-tools specific files within the source tree. + + -- Daniel Baumann Tue, 05 Jun 2012 19:37:54 +0200 + + live-boot (3.0~a29-1) experimental; urgency=low + + * Automatically translate date formats in po files. + * Starting initramfs-tools specific subdirectory within the source- + tree. + * Replacing live initramfs-tools script with empty stub that calls the + real, in future being initramfs-tools independent, script from + /lib/live. + * Splitting out a first bunch of functions out to /live/live/boot/. + * Moving out live-helpers from initramfs-tools specifics. + * Adding commented 'set -e' explicitly in all subscripts to avoid + running it with 'set -e' until we've made sure it's properly + working. + * Moving out live-functions from initramfs-tools specifics. + * Removing live-premount modules script, not needed anymore. + * Converting read-only initramfs-tools pre-mount script into regular + live-boot script. + + -- Daniel Baumann Tue, 05 Jun 2012 16:00:59 +0200 + + live-boot (3.0~a28-1) experimental; urgency=low + + [ Tails developers ] + * Improving robustness of findiso cleanup process. + * Using fromiso in most places where isofrom was used, thanks to + adrian15 . + * Mounting fromiso filesystem on /live/fromiso instead of /fromiso, + thanks to adrian15 . + * Improving robustness of fromiso cleanup process with is_mountpoint + (Closes: #668100). + + [ Daniel Baumann ] + * Using boot.log and /var/log/live/boot.log respectively for overall + consistency within all debian-live tools. + + [ Ian Reinhart Geiser ] + * Fix to allow for multiple rof when exposed roots is disabled. + + [ Tails developers ] + * Implement and make use of robust list functions. + + [ chals ] + * Fixing several typos in man pages. + * Adding initial Spanish translation of man pages. + + [ Evgeni Golov ] + * Fixing two typos and a wrong word in comments. + + -- 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 ] + * Only looking at boot.d files if they have the .conf suffix to allow + putting other files into these places that do not necessarily need + to be used by live-boot (e.g. documentation). + * Removing preseed bottom-script, a newly written one is now in live- + config where this sort of things belong. + * Removing header in fstab, not required. + * Removing outdated and broken accessibility script, this will be + redone in live-config properly. + * Replacing 'illegal' with better fitting 'invalid' for wrongly + crafted input examples in live.persist manpage. + * Consistently using ext4 in all examples, not a mix of ext2 and ext3. + * Removing user and userfullname variables in scripts/live, they are + not used here sind live-config anymore. + * Renaming /live/cow to /live/overlay in anticipation of overlayfs. + * Using 'persistence' (noun) rather than 'persistent' + (adjective/adverb) everywhere. + * Making extraction of the manpage section in manpages/Makefile work + with multiple dots in the filename. + * Renaming live.persist to live-persistence.conf. + + [ Tails developers ] + * Adding support for the findiso boot parameter (Closes: #656135). + * Fixing findiso argument parsing place to match the existing + ordering. + * Removing overkill double-checking of return code in is_mountpoint + predicate. + * Fixing brace alignment to follow common code style. + * Removing leftover directory after unmounting. + + [ Daniel Baumann ] + * Removing old docs. + * Merging old changelog into current changelog. + * Updating toplevel Makefile to work with manpages having multiple + dots in its filename. + * Renamling linkfiles option when using persistence to simply link. + + [ Tails developers ] + * Allow using / as destination in custom mounts. + * Supress warnings when probing media for persistence. + * Do not probe the device mounted on /live/image for persistence. + * Fix typo to make home-sn snapshots work again. + * Only try copying snapshots if we actually found any. + + -- Daniel Baumann Mon, 09 Apr 2012 18:58:06 +0200 + + live-boot (3.0~a26-1) experimental; urgency=low + + [ Daniel Baumann ] + * Updating year in copyright. + * Updating copyright file machine-readable format version 1.0. + * Updating to standards version 3.9.3. + * Quoting noprompt variable in initscript to avoid syntax errors, + thanks to Philip Newborough . + * Correcting log_end_msg usages in connection with verbosity checks in + live-boot initscript, thanks to Pablo Barbachano + (Closes: #665689). + * Replacing live-boot initscript with a stub and moving the actual + code to /lib/live/boot.sh to allow different initsystem support in + future. + * Removing some of the now useless sysvinit specifics from + bin/boot.sh. + + [ Tails developers ] + * Adding initial work on a custom mounts system. + + [ Daniel Baumann ] + * Correcting indenting initial work on a custom mounts system to + ensure consistency. + * Avoid calling rm without -f in initial work on a custom mounts + system to ensure non-interactivity. + * Avoid '==' bashism in initial work on a custom mounts system to + ensure posix compatiblity. + + [ Tails developers ] + * Prevent custom mounting in /live. + * Optionally symlink files from persistent source instead of mount it. + * Separate overlay labels for full and custom persistence. + * Remove some temporary custom mount related files after they're used. + + [ Daniel Baumann ] + * Calling rm without -f when removing some temporary custom mount + related files to ensure non-interactivity. + + [ Tails developers ] + * Handle custom mounts options a bit more beautifully. + * Continue the correct for-loop so incorrect custom mount is skipped. + * Refactor union mounting into its own function. + * Workaround busybox's inability to detect symlinks with [ -e ]. + * Make union mounting more sensible and robust. + * Ignore empty lines in live.persist. + * Remove the correct file. + * Optionally mount custom mounts as unions. + * Fix mask usage in links_files(). + + [ Daniel Baumann ] + * Correcting syntax when using if constructs in links_files(). + + [ Tails developers ] + * Refactor persistent custom mounting from live into live-helpers. + * Accept using several persistent media with custom-ov label. + * Use same device backing path as used in other places. + * Close unused LUKS devices in all cases. + + [ Daniel Baumann ] + * Adjusting mount calls when using nfs options (Closes: #667435). + + [ Tails developers ] + * Refactor live-boot argument parser from live into live-helpers. + * Refactor some global variables from live into live-helpers. + * Refactor find_persistent_media(). + * Add support for probing partitions' GPT name just like filesystem + labels. + * Some minor cleanups. + * Handle already mounted devices and closing of unused luks devices + better. + * Add backwards compatibility for old labels: live-{rw,sn} and home- + rw. + * We don't black list storage devices any more. + * Check if luks device is already open before trying to open it. + * Fixup some style issues. + * Refactor mounting of persistent storage media. + * Cleanup. + * Remove two FIXME:s that are not really relevant. + * Don't allow . or .. in live.persist paths. + * Use trim_path when we compare paths. + * Make handling of LUKS encrypted GPT partitions more sane. + * Handle list arguments better in get_custom_mounts(). + * Copy ownership/perms from source to rw-branch in read-only mode. + * Change live.persist syntax to "SOURCE [DEST [OPTIONS...]]". + * Refactor closing of persistent devices upon failure. + * Create the source dir for custom mounts using the 'linkfiles' + option. + * Fix ownership/perms for created union/linkfiles source dirs. + * Do not allow mutually exclusive custom mount options. + * Add a note about a potential, future code simplification. + * Greatly simplify live.persist syntax to "DIR [OPTIONS...]". + * Make trim_path() handle "/", and arbitrarily many consecutive /:es. + * Make two custom mounts with nested source directories illegal. + * Improve error message. + * Remove cow dir contents that are in the way for custom mounts. + * Also create parents when creating union/linkfiles source + directories. + * Update live-boot(7) man page and add new one for live.persist(5). + * Delete existing files in the destination's path when creating it. + * Adding functions equivalent to chmod/chown --reference. + * Fix ownership for links created for linkfiles custom mounts. + * Add 'bind' option for the default behaviour of custom mounts (bind- + mount). + * Use trim_path() instead of custom sed stanza to trim /:es from + paths. + * Copy perms/ownership from source when creating linkfiles dest dirs. + * Make cases for all different custom mounting situations more + explicit. + + [ Daniel Baumann ] + * Correcting left-over in author section of live.persist manpage. + * Moving initscript to live-config. + + -- Daniel Baumann Thu, 05 Apr 2012 08:14:51 +0200 + + live-boot (3.0~a25-1) unstable; urgency=low + + [ Daniel Baumann ] + * Updating to debhelper version 9. + + [ Michal Suchanek ] + * Add overlayfs support (Closes: #658265). + + -- 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 diff --cc debian/control index 3450a50,f0f1948..d60958b --- a/debian/control +++ b/debian/control @@@ -1,22 -1,18 +1,22 @@@ Source: live-boot Section: misc Priority: optional -Maintainer: Debian Live Project -Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 9) +Maintainer: Grml Team +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~) - Standards-Version: 3.9.3 + Standards-Version: 3.9.4 Homepage: http://live.debian.net/devel/live-boot/ -Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git -Vcs-Git: git://live.debian.net/git/live-boot.git +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: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend -Recommends: live-boot-doc, eject, file, rsync, uuid-runtime +Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools +Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime +Conflicts: live-boot +Replaces: live-boot +Provides: live-boot Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget Description: Debian Live - System Boot Scripts live-boot contains the scripts that configure a Debian Live system during the diff --cc debian/rules index e84a4b9,37418ee..ac466aa --- a/debian/rules +++ b/debian/rules @@@ -11,25 -7,15 +11,21 @@@ 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 + 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/live-bottom/* + chmod a+rx debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/hooks/* override_dh_builddeb: - dh_builddeb -- -Zgzip -z9 + dh_builddeb -- -Zxz -z9 override_dh_install: dh_install --fail-missing