From: Michael Prokop Date: Tue, 28 Jun 2016 08:42:17 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: debian/1%20160511+grml.1~8 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=202dc5012543bcfcc6b535b90ca1c652241f7eb2;hp=-c Merge remote-tracking branch 'upstream/master' git://anonscm.debian.org/debian-live/live-boot.git Conflicts: backend/initramfs-tools/live.hook components/0020-read-only components/9990-aaa-fixme.sh components/9990-cmdline-old debian/changelog --- 202dc5012543bcfcc6b535b90ca1c652241f7eb2 diff --combined backend/initramfs-tools/live.hook index d5765bb,8337a64..ab843a7 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@@ -16,12 -16,6 +16,12 @@@ d fi done +# Grml version information: +if [ -r /etc/grml_version ] +then + cp /etc/grml_version "${DESTDIR}"/etc +fi + # Checking live-boot if [ ! -e /bin/live-boot ] then @@@ -39,6 -33,9 +39,9 @@@ cp -a /bin/live-boot /lib/live/boot "${ mkdir -p "${DESTDIR}/lib/live" cp -a /lib/live/boot "${DESTDIR}/lib/live" + mkdir -p "${DESTDIR}/etc/live" + cp -a /etc/live/boot.conf /etc/live/boot "${DESTDIR}/etc/live" + # klibc dependencies for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr* do @@@ -236,11 -233,4 +239,11 @@@ don #mkdir -p "${DESTDIR}/etc" #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" +# vlan support +if [ -x /sbin/vconfig ] +then + copy_exec /sbin/vconfig + manual_add_modules 8021q +fi + [ "${QUIET}" ] || echo . diff --combined components/9990-cmdline-old index 975ade2,1549bb4..f04c0ff --- a/components/9990-cmdline-old +++ b/components/9990-cmdline-old @@@ -17,19 -17,12 +17,18 @@@ Cmdline_old ( BOOTIF=*) BOOTIF="${_PARAMETER#BOOTIF=}" ;; - dns=*) DNS=${_PARAMETER#dns=} DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g') export DNSSERVERS unset DNS ;; + + bootid=*) + BOOTID="${_PARAMETER#bootid=}" + export BOOTID + ;; + dhcp) # Force dhcp even while netbooting # Use for debugging in case somebody works on fixing dhclient @@@ -40,13 -33,12 +39,13 @@@ nodhcp) DHCP="" export DHCP + NODHCP="Yes" + export NODHCP ;; ethdevice=*) - DEVICE="${_PARAMETER#ethdevice=}" - ETHDEVICE="${DEVICE}" - export DEVICE ETHDEVICE + ETHDEVICE="${_PARAMETER#ethdevice=}" + export ETHDEVICE ;; ethdevice-timeout=*) @@@ -92,20 -84,19 +91,20 @@@ export FROMISO ;; + ignore_bootid) + IGNORE_BOOTID="Yes" + export IGNORE_BOOTID + ;; + ignore_uuid) IGNORE_UUID="true" export IGNORE_UUID ;; ip=*) - STATICIP="${_PARAMETER#ip=}" - - if [ -z "${STATICIP}" ] - then - STATICIP="frommedia" - fi - + # copy complete ip=args into staticip, and + # keep multiple uses. + STATICIP="${STATICIP} ${_PARAMETER}" export STATICIP ;; @@@ -154,11 -145,6 +153,11 @@@ export NFS_COW ;; + nodhcphostname) + NODHCPHOSTNAME="Yes" + export NODHCPHOSTNAME + ;; + nofstab) NOFSTAB="true" export NOFSTAB @@@ -260,11 -246,6 +259,11 @@@ UNIONTYPE="${_PARAMETER#union=}" export UNIONTYPE ;; + + vlan=*) + VLANS="${VLANS} ${_PARAMETER#vlan=}" + export VLANS + ;; esac done diff --combined components/9990-misc-helpers.sh index 3355d60,1a06ccf..f3e4d72 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@@ -15,42 -15,6 +15,42 @@@ is_live_path( return 1 } +grml_match_bootid() +{ + path="$1" + + if [ -n "$IGNORE_BOOTID" ] ; then + echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/boot.log + return 0 + fi + + if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then + echo " * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/boot.log + return 1 + fi + + [ -r "${path}/conf/bootid.txt" ] || return 0 + + bootid_conf=$(cat "${path}/conf/bootid.txt") + + if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ] + then + echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/boot.log + return 1 + fi + + if [ "$BOOTID" = "$bootid_conf" ] + then + echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/boot.log + else + echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/boot.log + return 1 + fi + + return 0 +} + + matches_uuid () { if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ] @@@ -250,7 -214,7 +250,7 @@@ check_dev ( fi if is_live_path ${mountpoint} && \ - ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint}) + ([ "${skip_uuid_check}" ] || grml_match_bootid ${mountpoint}) then echo ${mountpoint} return 0 @@@ -346,6 -310,19 +346,6 @@@ find_livefs ( return 0 fi done - elif [ "${fstype}" = "squashfs" -o \ - "${fstype}" = "btrfs" -o \ - "${fstype}" = "ext2" -o \ - "${fstype}" = "ext3" -o \ - "${fstype}" = "ext4" -o \ - "${fstype}" = "jffs2" ] - then - # This is an ugly hack situation, the block device has - # an image directly on it. It's hopefully - # live-boot, so take it and run with it. - ln -s "${devname}" "${devname}.${fstype}" - echo "${devname}.${fstype}" - return 0 fi done @@@ -478,7 -455,7 +478,7 @@@ is_supported_fs ( get_fstype () { - /sbin/blkid -s TYPE -o value $1 2>/dev/null + blkid -s TYPE -o value $1 2>/dev/null } where_is_mounted () @@@ -536,7 -513,7 +536,7 @@@ base_path ( { testpath="${1}" mounts="$(awk '{print $2}' /proc/mounts)" - testpath="$(busybox realpath ${testpath})" + testpath="$(realpath ${testpath})" while true do @@@ -654,7 -631,7 +654,7 @@@ setup_loop ( echo "${passphrase}" > /tmp/passphrase unset passphrase exec 9/dev/null + if ! mount -o move ${old_backing} ${backing} >/dev/null then [ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}" rmdir "${backing}" @@@ -801,7 -778,7 +801,7 @@@ close_persistence_media ( if is_active_luks_mapping ${device} then - /sbin/cryptsetup luksClose ${device} + cryptsetup luksClose ${device} fi } @@@ -815,7 -792,7 +815,7 @@@ open_luks_device ( opts="${opts} --readonly" fi - if /sbin/cryptsetup status "${name}" >/dev/null 2>&1 + if cryptsetup status "${name}" >/dev/null 2>&1 then re="^[[:space:]]*device:[[:space:]]*\([^[:space:]]*\)$" opened_dev=$(cryptsetup status ${name} 2>/dev/null | grep "${re}" | sed "s|${re}|\1|") @@@ -856,7 -833,7 +856,7 @@@ while true do $cryptkeyscript "$cryptkeyprompt" | \ - /sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts} + cryptsetup -T 1 luksOpen ${dev} ${name} ${opts} if [ 0 -eq ${?} ] then @@@ -897,14 -874,14 +897,14 @@@ get_gpt_name ( { local dev dev="${1}" - /sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null + blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null } is_gpt_device () { local dev dev="${1}" - [ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ] + [ "$(blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ] } probe_for_gpt_name () @@@ -944,7 -921,7 +944,7 @@@ probe_for_fs_label ( for label in ${overlays} do - if [ "$(/sbin/blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ] + if [ "$(blkid -s LABEL -o value $dev 2>/dev/null)" = "${label}" ] then echo "${label}=${dev}" fi @@@ -1137,7 -1114,7 +1137,7 @@@ find_persistence_media ( # Close luks device if it isn't used if [ -z "${result}" ] && [ -n "${luks_device}" ] && is_active_luks_mapping "${luks_device}" then - /sbin/cryptsetup luksClose "${luks_device}" + cryptsetup luksClose "${luks_device}" fi done @@@ -1168,13 -1145,13 +1168,13 @@@ get_mac ( is_luks_partition () { device="${1}" - /sbin/cryptsetup isLuks "${device}" 1>/dev/null 2>&1 + cryptsetup isLuks "${device}" 1>/dev/null 2>&1 } is_active_luks_mapping () { device="${1}" - /sbin/cryptsetup status "${device}" 1>/dev/null 2>&1 + cryptsetup status "${device}" 1>/dev/null 2>&1 } get_luks_backing_device () @@@ -1333,15 -1310,14 +1333,14 @@@ do_union ( ;; overlay) - # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) - # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? - if echo ${unionro} | grep -q " " - then - panic "Multiple lower filesystems are currently not supported with overlay (unionro = ${unionro})." - elif [ -z "${unionro}" ] + # XXX: can unionro be optional? i.e. can overlay skip lowerdir? + if [ -z "${unionro}" ] then panic "overlay needs at least one lower filesystem (read-only branch)." fi + # Multiple lower layers can now be given using the the colon (":") as a + # separator character between the directory names. + unionro="$(echo ${unionro} | sed -e 's| |:|g')" # overlayfs requires: # + a workdir to become mounted # + workdir and upperdir to reside under the same mount @@@ -1614,7 -1590,7 +1613,7 @@@ activate_custom_mounts ( do_union ${dest} ${source} ${rootfs_dest_backing} elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ] then - mount --bind "${source}" "${dest}" + mount -o bind "${source}" "${dest}" elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ] then # bind-mount and union mount are handled the same diff --combined debian/changelog index 2ef7946,c0382ab..29fe1fb --- a/debian/changelog +++ b/debian/changelog @@@ -1,19 -1,17 +1,33 @@@ + live-boot (1:20160511) unstable; urgency=medium + + * Team upload. + * Update build system to rely on "dpkg-parsechangelog -S Version" instead + of outdated VERSION file. + * No longer modify PATH to point to /root and thus stop using executables + from /root. Closes: #823069 + * Drop debian/source/local-options as the only option it contained was + not applicable to 3.0 (native) source format. + * Drop debian/source/options and dh_builddeb override as XZ compression is + the default now. + + -- Raphaël Hertzog Wed, 11 May 2016 11:40:37 +0200 + +live-boot (1:20151213+grml.1) unstable; urgency=medium + + [ Evgeni Golov ] + * Merge latest Debian changes. + * [aea94ce] add gbp.conf + * [9f0266a] fix "unexpected operator" error when stopping live-boot + * [83abdd6] Revert "restore support for old persistence media" + * [09d8468] remove debian/patches + * [0c43d97] make package native as in Debian + * [1a226f4] Revert "use auto instead of allow-hotplug in generated /e/n/interfaces" + + [ Riccardo Murri ] + * [3f6c7f2] Allow selecting boot eth dev by MAC address + + -- Evgeni Golov Thu, 07 Jan 2016 08:47:27 +0100 + live-boot (1:20151213) unstable; urgency=medium [ Iain R. Learmonth ] @@@ -52,27 -50,6 +66,27 @@@ live-boot (5.0~a5-1) unstable; urgency= -- Daniel Baumann Sun, 23 Aug 2015 10:55:32 +0200 +live-boot (5.0~a4-1+grml.1) unstable; urgency=medium + + [ Evgeni Golov ] + * Import 5.0~a4-1 from Debian. + * [3a7cc5f] drop stop-using-etc-fstab.d.patch, applied upstream + * [ee5831d] Drop genext2fs from Depends, live-snapshot is long gone + * [8e37c83] update 15_networking_grml.patch against live-boot 5.0 + * [600ec8b] do not run dh with quilt, we have source format 3.0 + * [26c670d] drop patches, we have everything in git now + * [5f1c62a] create a single debian patch :/ + * [214cc03] use auto instead of allow-hotplug in generated /e/n/interfaces + (Closes: issue1568) + * [6795067] backport Allow-selecting-boot-eth-dev-by-MAC-address.patch + from upstream + + [ Laurens Vanderhoven ] + * [5eb34d4] Allow +2 nameserver entries for dns= boot option + (Closes: issue1234) + + -- Evgeni Golov Tue, 18 Aug 2015 14:14:10 +0200 + live-boot (5.0~a4-1) unstable; urgency=low [ Tails developers ] @@@ -154,26 -131,6 +168,26 @@@ live-boot (4.0.2-1) unstable; urgency=l -- Daniel Baumann Wed, 10 Dec 2014 10:36:04 +0100 +live-boot (4.0.1-1+grml.3) unstable; urgency=medium + + [ Evgeni Golov ] + * [ca03a16] update stop-using-etc-fstab.d.patch to latest upstream + version + + -- Michael Prokop Thu, 13 Nov 2014 09:56:07 +0100 + +live-boot (4.0.1-1+grml.2) unstable; urgency=medium + + * stop using /etc/fstab.d + + -- Evgeni Golov Thu, 30 Oct 2014 07:31:08 +0100 + +live-boot (4.0.1-1+grml.1) unstable; urgency=medium + + * Import 4.0.1-1 from Debian. + + -- Evgeni Golov Sun, 26 Oct 2014 11:31:59 +0100 + live-boot (4.0.1-1) unstable; urgency=low [ victory ] @@@ -191,12 -148,6 +205,12 @@@ -- Daniel Baumann Sat, 25 Oct 2014 14:26:22 +0200 +live-boot (4.0.0-1+grml.1) unstable; urgency=medium + + * Import 4.0.0-1 from Debian. + + -- Evgeni Golov Thu, 28 Aug 2014 17:55:20 +0200 + live-boot (4.0.0-1) unstable; urgency=low [ Carlos Zuferri ] @@@ -210,12 -161,6 +224,12 @@@ -- Daniel Baumann Wed, 27 Aug 2014 19:52:09 +0200 +live-boot (4.0~alpha21-1+grml.1) UNRELEASED; urgency=medium + + * Import 4.0~alpha21 from Debian. + + -- Evgeni Golov Thu, 10 Apr 2014 08:29:49 +0200 + live-boot (4.0~alpha21-1) unstable; urgency=low * Building with dh --parallel. @@@ -234,32 -179,6 +248,32 @@@ live-boot (4.0~alpha20-1) unstable; urg -- Daniel Baumann Mon, 31 Mar 2014 21:38:22 +0200 +live-boot (4.0~alpha19-1+grml.3) unstable; urgency=medium + + * [8acc928] try to be smarter when booting a squashfs image from + the network and using resolvconf in it. + + -- Evgeni Golov Tue, 25 Mar 2014 17:49:22 +0100 + +live-boot (4.0~alpha19-1+grml.2) unstable; urgency=medium + + * [805c218] VLAN support via boot option "vlan=:" + + -- Michael Prokop Mon, 17 Mar 2014 23:43:24 +0100 + +live-boot (4.0~alpha19-1+grml.1) unstable; urgency=medium + + * Sync Debian's 4.0~alpha19-1. + * update our patches on top of Debian's 4.0~alpha19 + Droped patches: + - 43_fix_udev_usage_in_is_nice_device.patch + - 44_fix_mdadm_usage_for_findiso.patch + * move Grml-specific patches to a separate subfolder + * move reverts/restores of old upstream behaviour to an own subdir + * consolidate Grml network related patches into 15_networking_grml.patch + + -- Evgeni Golov Sat, 08 Mar 2014 13:59:28 +0100 + live-boot (4.0~alpha19-1) experimental; urgency=low * Updating copyright notices for 2014. @@@ -379,49 -298,6 +393,49 @@@ live-boot (4.0~a14-1) experimental; urg -- Daniel Baumann Fri, 13 Sep 2013 14:17:30 +0200 +live-boot (4.0~a13-1+grml.5) unstable; urgency=medium + + * [3b54472] Add support for label "persistence" to forensic mode + + -- Michael Prokop Sat, 25 Jan 2014 11:45:16 +0100 + +live-boot (4.0~a13-1+grml.4) unstable; urgency=low + + * [3d46167] Add patch to properly boot from mdadm via findiso boot + option [Closes: issue1270] Thanks to thinkgear for the bug report + and providing a test VM + + -- Michael Prokop Tue, 15 Oct 2013 16:58:17 +0200 + +live-boot (4.0~a13-1+grml.3) unstable; urgency=low + + * [79dceec] Update 9990-misc-helpers.sh to support latest udev version + [Closes: issue1278] Thanks to Michael Biebl for + helping in resolve this issue and Ulrich Dangel + for the initial patch + + -- Michael Prokop Sat, 28 Sep 2013 11:44:52 +0200 + +live-boot (4.0~a13-1+grml.2) unstable; urgency=low + + * [61895ec] Do not "exit" if boot option nonetworking is set but + "return" instead [Closes: issue1276] + * [85bddc0] Refresh debian/patches/ + + -- Michael Prokop Fri, 20 Sep 2013 16:38:53 +0200 + +live-boot (4.0~a13-1+grml.1) unstable; urgency=low + + * Sync Debian's 4.0~a13. + * [ba11a22] drop patches that were previously backported from + the 4.x upstream branch + * [5eca029, 3a80a92, eae4296, e6023f8] refresh patches against + new upstream + * [2130827] more forwardporting of deprecated persistence options + * [c06cdf4] log to boot.log, not live-boot.log + + -- Evgeni Golov Sun, 18 Aug 2013 10:53:12 +0200 + live-boot (4.0~a13-1) experimental; urgency=low * Increasing tftp blocksize to maximum value per RFC 2348, thanks to @@@ -614,13 -490,6 +628,13 @@@ live-boot (4.0~a1-1) experimental; urge -- Daniel Baumann Fri, 30 Nov 2012 14:58:46 +0100 +live-boot (3.0.1-1+grml.1) unstable; urgency=low + + * Sync Debian's 3.0.1. + * Backport some patches from Debian's debian-next (4.x) branch. + + -- Evgeni Golov Wed, 06 Mar 2013 08:07:07 +0100 + live-boot (3.0.1-1) unstable; urgency=low [ chals ] @@@ -678,16 -547,6 +692,16 @@@ live-boot (3.0~b11-1) unstable; urgency -- 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 ] @@@ -713,23 -572,6 +727,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 ] @@@ -740,16 -582,6 +754,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 @@@ -1084,76 -916,6 +1098,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 ] @@@ -1327,39 -1089,6 +1341,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 @@@ -1466,38 -1195,6 +1480,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 @@@ -1520,51 -1217,6 +1534,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 1d71477,0ed4818..c7f8b71 --- a/debian/rules +++ b/debian/rules @@@ -1,9 -1,5 +1,9 @@@ #!/usr/bin/make -f +build: + # regular build. + dh build + %: dh ${@} --parallel @@@ -11,24 -7,11 +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 + 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 - 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 .'