Control: tags -1 + moreinfo On Sun, 2013-02-17 at 12:17 -0400, Ben Armstrong wrote: > The version in wheezy had some issues (see #685752 which this request > supercedes and I will now close) with upgradability that, while not > typical use cases (live-tools would normally only be installed on a live > system and subsequently not upgraded) were nevertheless show-stoppers > for the wheezy release. Those issues have have since been resolved. We > consider this release to be the only supportable version for the > lifetime of wheezy.
Even as a filtered diff, that's still a reasonably large set of changes. :-( A few comments / queries: --- live-tools.orig/bin/live-persistence 1970-01-01 01:00:00.000000000 +0100 +++ live-tools/bin/live-persistence 2013-02-15 10:42:34.619868805 +0100 [...] +Most options correspond to the persistence-* options of live-boot, and will +override the corresponging options parsed from the kernel command-line. "corresponding" --- live-tools.orig/bin/live-update-initramfs 1970-01-01 01:00:00.000000000 +0100 +++ live-tools/bin/live-update-initramfs 2013-02-15 09:38:30.324657057 +0100 [...] + # FIXME: needs to exclude initrd backup files + if [ "$(ls /boot/initrd.img-* | wc -l)" -gt 1 ] + then + _NUMBER="1" + + for _INITRD in /boot/initrd.img-* "FIXME"s in apparently final(ish) code always make me slightly wary. What's the real-world effect of the loop picking up backup files? --- live-tools.orig/bin/live-update-initramfs-uuid 1970-01-01 01:00:00.000000000 +0100 +++ live-tools/bin/live-update-initramfs-uuid 2013-02-15 09:38:30.324657057 +0100 [...] +case "${_INITRD}" in + *.gz) Where does $_INITRD come from? This appears to be the first reference to it in the script and it's not obviously passed in. (Apologies if I'm missing something relating to the infrastructure here.) +if [ -n "${_NEW_UUID}" ] +then + mv "/tmp/$(basename ${_OLD_INITRD})" "${_NEW_INITRD}" +else + mv "/tmp/$(basename ${_OLD_INITRD})" ./ +fi It looks like it's possible to get to this point with $_NEW_UUID being set, but not $_NEW_INITRD? +cd "${_TMPDIR}" + +${_COMPRESSION} -c -d "${_OLD_INITRD}" | cpio -id + +echo "${_NEW_UUID}" > conf/uuid.conf + + +find . | cpio --quiet -R 0:0 -o -H newc | ${_COMPRESSION} -c > "/tmp/$(basename ${_OLD_INITRD})" Why the hard-coding of /tmp for files (there's some more later on in the script), when mktemp() is already being used for the location of the image contents? Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org