diff -Nru debirf-0.36/debian/changelog debirf-0.37/debian/changelog --- debirf-0.36/debian/changelog 2016-05-09 01:51:56.000000000 +0000 +++ debirf-0.37/debian/changelog 2017-05-18 16:10:07.000000000 +0000 @@ -1,3 +1,18 @@ +debirf (0.37) unstable; urgency=medium + + [ JH Chatenet ] + * run fakeroot with bash (Closes: #850080) + * a0_prep-root: run insserv if installed (Closes: #833125) + + [ Antoine Beaupré ] + * avoid crash if CDPATH is set (Closes: #848693) + + [ Daniel Kahn Gillmor ] + * enable rootfs xz compression (Closes: #813472) + * Add more utilities to rescue profile (Closes: #834478) + + -- Daniel Kahn Gillmor Thu, 18 May 2017 12:10:07 -0400 + debirf (0.36) unstable; urgency=medium * better systemd compatibility, prune obsolete modules diff -Nru debirf-0.36/debian/control debirf-0.37/debian/control --- debirf-0.36/debian/control 2016-05-09 01:13:18.000000000 +0000 +++ debirf-0.37/debian/control 2017-05-18 15:24:00.000000000 +0000 @@ -17,6 +17,7 @@ fakechroot, fakeroot, klibc-utils, + xz-utils, ${misc:Depends} Recommends: grub-common (>= 1.98+20100804) | isolinux, lsb-release, diff -Nru debirf-0.36/doc/example-profiles/rescue/packages debirf-0.37/doc/example-profiles/rescue/packages --- debirf-0.36/doc/example-profiles/rescue/packages 2016-05-09 01:13:18.000000000 +0000 +++ debirf-0.37/doc/example-profiles/rescue/packages 2017-05-18 16:10:07.000000000 +0000 @@ -2,34 +2,51 @@ +bonnie++ +chntpw +cryptsetup -+gddrescue +diskscan ++dmidecode +dosfstools +e2tools +eject ++ethtool ++fancontrol +fatresize ++flashrom +foremost ++gddrescue +grub2 +hdparm +hfsplus +hfsprogs +hfsutils ++initramfs-tools-core ++inteltool ++lm-sensors +lsof +lsscsi +lvm2 ++memtester ++msrtool +mtd-utils ++ntfs-3g ++nvramtool +parted +partimage +pciutils ++rsync +screen +scrub +sdparm +sg3-utils +smartmontools +smp-utils ++socat ++squashfs-tools ++superiotool +testdisk +testdisk +tofrodos +u-boot-tools ++usbutils ++wget +wipe +wodim diff -Nru debirf-0.36/src/common debirf-0.37/src/common --- debirf-0.36/src/common 2011-12-03 18:08:37.000000000 +0000 +++ debirf-0.37/src/common 2017-05-18 15:23:11.000000000 +0000 @@ -45,7 +45,7 @@ failure "Debirf fakeroot state file '$DEBIRF_FAKEROOT_STATE' does not exist." fi # set up $PATH and $HOME as though we are superuser - HOME=/root PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin fakeroot -i "$DEBIRF_FAKEROOT_STATE" -s "$DEBIRF_FAKEROOT_STATE" "$@" + HOME=/root PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin bash fakeroot -i "$DEBIRF_FAKEROOT_STATE" -s "$DEBIRF_FAKEROOT_STATE" "$@" fi } export -f fakeroot_if_needed diff -Nru debirf-0.36/src/debirf debirf-0.37/src/debirf --- debirf-0.36/src/debirf 2016-05-09 01:13:18.000000000 +0000 +++ debirf-0.37/src/debirf 2017-05-18 16:10:07.000000000 +0000 @@ -15,6 +15,7 @@ CMD=$(basename $0) +unset CDPATH DEBIRF_COMMON=${DEBIRF_COMMON:-/usr/share/debirf/common} source "$DEBIRF_COMMON" @@ -158,7 +159,7 @@ # abort with a failure if our attempts to build the rootfs fail: set -o pipefail - fakeroot_if_needed bash -c ". $DEBIRF_COMMON && FAKECHROOT_EXCLUDE_PATH=/does-not-exist debirf_exec sh -c 'find * | grep -v -e ^run/ | cpio --create -H newc'" | gzip -9 > "$1" + fakeroot_if_needed bash -c ". $DEBIRF_COMMON && FAKECHROOT_EXCLUDE_PATH=/does-not-exist debirf_exec sh -c 'find * | grep -v -e ^run/ | cpio --create -H newc'" | xz -9 > "$1" } export -f pack_rootfs @@ -214,7 +215,7 @@ fi cd /newroot echo unpacking rootfs... -gunzip - < /rootfs.cgz | cpio -i +unxz - < /rootfs.cxz | cpio -i if (grep -q break=bottom /proc/cmdline); then echo "honoring break=bottom kernel arg" /bin/sh @@ -225,9 +226,9 @@ EOF chmod a+x "$NEST_ROOT"/init - msg "creating rootfs.cgz..." + msg "creating rootfs.cxz..." fakeroot_if_needed ln -sf /sbin/init "$DEBIRF_ROOT/init" - pack_rootfs "$NEST_ROOT"/rootfs.cgz + pack_rootfs "$NEST_ROOT"/rootfs.cxz msg "creating wrapper cgz..." fakeroot_if_needed sh -c "cd $NEST_ROOT && find * | cpio --create -H newc" | gzip -9 > "$INITRD" diff -Nru debirf-0.36/src/modules/a0_prep-root debirf-0.37/src/modules/a0_prep-root --- debirf-0.36/src/modules/a0_prep-root 2014-06-24 20:54:25.000000000 +0000 +++ debirf-0.37/src/modules/a0_prep-root 2017-05-18 15:23:47.000000000 +0000 @@ -67,4 +67,4 @@ debirf_exec apt-get --yes --force-yes upgrade # work around http://bugs.debian.org/686965 -debirf_exec sh -c 'cd /etc/init.d && insserv $(ls | grep -vFx -e rc -e rcS -e skeleton -e README)' +debirf_exec sh -c 'if `which insserv > /dev/null`; then cd /etc/init.d && insserv $(ls | grep -vFx -e rc -e rcS -e skeleton -e README); fi'