Bug#863181: unblock: debirf/0.37
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package debirf
Version 0.37 contains fixes for #850080 and #833125, both of which
make debirf unusable on debian stretch.
It also includes a few smaller fixes which produce more usable and
compact debirf images. These versions are currently being used to
produce the debirf autobuilder images at
http://debirf.cmrg.net/autobuilds/ so they have been tested, and will
continue to be tested regularly.
The debdiff between 0.36 and 0.37 is attached.
unblock debirf/0.37
-- System Information:
Debian Release: 9.0
APT prefers testing-debug
APT policy: (500, 'testing-debug'), (500, 'testing'), (200, 'unstable-debug'), (200, 'unstable'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64
(x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru debirf-0.36/debian/changelog debirf-0.37/debian/changelog
--- debirf-0.36/debian/changelog 2016-05-08 22:37:31.000000000 -0400
+++ debirf-0.37/debian/changelog 2017-05-18 12:10:07.000000000 -0400
@@ -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 <dkg@fifthhorseman.net> 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-08 20:23:32.000000000 -0400
+++ debirf-0.37/debian/control 2017-05-18 11:24:00.000000000 -0400
@@ -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-08 20:16:31.000000000 -0400
+++ debirf-0.37/doc/example-profiles/rescue/packages 2017-05-18 12:10:07.000000000 -0400
@@ -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-05 16:32:14.000000000 -0500
+++ debirf-0.37/src/common 2017-05-18 11:23:11.000000000 -0400
@@ -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-08 20:27:56.000000000 -0400
+++ debirf-0.37/src/debirf 2017-05-18 12:10:07.000000000 -0400
@@ -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 2015-07-09 12:16:50.000000000 -0400
+++ debirf-0.37/src/modules/a0_prep-root 2017-05-18 11:23:47.000000000 -0400
@@ -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'
Reply to: