diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-12-18 15:09:55 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 04:28:12 +0200 |
| commit | 10ba380dfc6564f7a18d80acc3f4153bb0cc005f (patch) | |
| tree | e44f036d1f57bf8e1f75eb98bffa03a53ea69d9f | |
| parent | a18ef47a22b09347e6d4738c37f364379a86d93b (diff) | |
Upgrade preseeding to Debian 7.7.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | preseed.cfg | 2 | ||||
| -rwxr-xr-x | preseed.sh | 4 | ||||
| -rw-r--r-- | src/fripost-partman-udeb/base.sh | 14 |
4 files changed, 13 insertions, 12 deletions
@@ -1,8 +1,9 @@ CC ?= gcc CC += -m$(shell dpkg-architecture -qDEB_HOST_ARCH_BITS $(patsubst %,-a%, ${ARCH})) DEB_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH $(patsubst %,-a%, ${ARCH})) +# Multiarch: apt-get install gcc-multilib libc6-dev-x32 -VERSION = 7.5.0 +VERSION = 7.7.0 IMAGE_TYPE ?= iso ISOIMG = debian-${VERSION}-${DEB_ARCH}-netinst.iso @@ -27,7 +28,7 @@ iso-checksum: $(patsubst %,iso-checksum-%, ${CHECKSUMS}) iso-checksum-%: dist/${DEB_ARCH}/${ISOIMG} dist/${DEB_ARCH}/%SUMS dist/${DEB_ARCH}/%SUMS.sign @echo Checking $* sum @cd dist/${DEB_ARCH}; grep "\s${ISOIMG}$$" $*SUMS | $$(echo $* | sed 's@.*@/usr/bin/\L&sum@') --strict -c - gpg --verify dist/${DEB_ARCH}/$*SUMS.sign + gpg --verify dist/${DEB_ARCH}/$*SUMS.sign dist/${DEB_ARCH}/$*SUMS # Download .PRECIOUS: dist/${DEB_ARCH}/% diff --git a/preseed.cfg b/preseed.cfg index 877c185..c08e9e1 100644 --- a/preseed.cfg +++ b/preseed.cfg @@ -122,5 +122,5 @@ d-i pkgsel/upgrade select safe-upgrade d-i preseed/early_command string anna-install fripost-partman fripost-postinst d-i preseed/late_command string /bin/in-target /usr/bin/update-alternatives --set editor /usr/bin/vim.nox -# bugfix for #666974 +# Dirty fix for bug #666974 d-i grub-installer/only_debian boolean false @@ -138,10 +138,10 @@ elif [ $type = iso ]; then efi_opts= fi - # /usr/lib/syslinux/mbr/isohdpfx.bin is in 'syslinux-common' + # /usr/lib/ISOLINUX/isohdpfx.bin is in the 'isolinux' package xorriso -as mkisofs -r \ -checksum_algorithm_iso all \ - -isohybrid-mbr /usr/lib/syslinux/mbr/isohdpfx.bin \ + -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ -b isolinux/isolinux.bin -c isolinux/boot.cat \ -partition_offset 16 \ -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot $efi_opts \ diff --git a/src/fripost-partman-udeb/base.sh b/src/fripost-partman-udeb/base.sh index d757670..449d3ae 100644 --- a/src/fripost-partman-udeb/base.sh +++ b/src/fripost-partman-udeb/base.sh @@ -52,13 +52,13 @@ wait_for_device() { [ -b "$device" ] || fatal "Error: $device not found!" } -# The non-blocking PRNG /dev/urandom doesn't block if it has been seeded -# enough, sadly (e.g., if the entropy pool is empty). Reading a few -# bytes from the *blocking* should ensure that "the kernel RNG has [...] -# reach full entropy at least once, which guarantees cryptographic -# quality of the rest of the /dev/urandom stream." -- Tor bug #10676. -# See also urandom(4). (XXX It's possible that the debian installer -# does that already.) +# The non-blocking PRNG /dev/urandom doesn't block if it hasn't been +# seeded enough, sadly (e.g., if the entropy pool is empty). Reading a +# few bytes from the *blocking* PRNG should ensure that "the kernel RNG +# has [...] reach full entropy at least once, which guarantees +# cryptographic quality of the rest of the /dev/urandom stream." -- Tor +# bug #10676. See also urandom(4). (XXX It's possible that the debian +# installer does that already.) seed_urandom() { local seed=/var/run/random-seed fifo n records dir local poolfile=/proc/sys/kernel/random/poolsize bytes=512 |