diff options
| author | intrigeri <intrigeri@boum.org> | 2015-02-26 10:04:49 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-02-26 10:04:49 +0000 |
| commit | 40dcfbfd4b9b69c8d9d1d802773c5dadaa36d597 (patch) | |
| tree | d632689a174a5452c32f493c45d7bd4206c7eed1 /config/binary_local-hooks | |
| parent | 76647ef668eb4d25c82209123c730f0710ce2048 (diff) | |
| parent | 22c1001eb5349f183f8ba04fa4f6328aec2b7937 (diff) | |
Merge branch 'devel' into feature/jessie
Conflicts:
auto/build
config/chroot_apt/preferences
config/chroot_local-packageslists/tails-common.list
config/chroot_local-patches/gdm-background.diff
features/images/UnsafeBrowserStartVerification.png
features/step_definitions/apt.rb
features/step_definitions/evince.rb
po/POTFILES.in
wiki/src/contribute/design/memory_erasure.mdwn
wiki/src/support/known_issues.mdwn
Diffstat (limited to 'config/binary_local-hooks')
| -rwxr-xr-x | config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem index e79fb91..aed5f33 100755 --- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem +++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem @@ -41,6 +41,8 @@ cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/" cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin" cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \ + | grep --extended-regexp --line-regexp --invert-match \ + 'deb\s+file:/root/local-packages\s+\./' \ | sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \ > "$CHROOT_TEMP_APT_SOURCES" Chroot chroot apt-get --yes update |