Commit e15c24a9 authored by intrigeri's avatar intrigeri

Rename /usr/share/amnesia to /usr/share/tails.

The project was renamed, what, 8 years ago?
parent 57c05619
......@@ -23,11 +23,11 @@
/config/source
/config/chroot_local-includes/etc/amnesia/environment
/config/chroot_local-includes/etc/amnesia/version
/config/chroot_local-includes/usr/share/amnesia/readahead-list
/config/chroot_local-includes/usr/share/amnesia/build/variables
/config/chroot_local-includes/usr/share/doc/Changelog
/config/chroot_local-includes/usr/share/doc/amnesia/Changelog
/config/chroot_local-includes/usr/share/doc/tails/website
/config/chroot_local-includes/usr/share/tails/build/variables
/config/chroot_local-includes/usr/share/tails/readahead-list
/.lock
/.stage
/source
......
......@@ -50,15 +50,15 @@ rm -rf cache/stages_rootfs
# save variables that are needed by chroot_local-hooks
echo "KERNEL_VERSION=${KERNEL_VERSION}" \
>> config/chroot_local-includes/usr/share/amnesia/build/variables
>> config/chroot_local-includes/usr/share/tails/build/variables
echo "KERNEL_SOURCE_VERSION=${KERNEL_SOURCE_VERSION}" \
>> config/chroot_local-includes/usr/share/amnesia/build/variables
echo "LB_DISTRIBUTION=${LB_DISTRIBUTION}" >> config/chroot_local-includes/usr/share/amnesia/build/variables
>> config/chroot_local-includes/usr/share/tails/build/variables
echo "LB_DISTRIBUTION=${LB_DISTRIBUTION}" >> config/chroot_local-includes/usr/share/tails/build/variables
echo "POTFILES_DOT_IN='$(
/bin/grep -E --no-filename '[^ #]*\.in$' po/POTFILES.in \
| sed -e 's,^config/chroot_local-includes,,' | tr "\n" ' '
)'" \
>> config/chroot_local-includes/usr/share/amnesia/build/variables
>> config/chroot_local-includes/usr/share/tails/build/variables
# fix permissions on some source files that will be copied as is to the chroot.
# they may be wrong, e.g. if the Git repository was cloned with a strict umask.
......@@ -111,7 +111,7 @@ DEBOOTSTRAP_OPTIONS="$DEBOOTSTRAP_OPTIONS --keyring=$DEBOOTSTRAP_GNUPG_KEYRING"
export DEBOOTSTRAP_OPTIONS
: ${MKSQUASHFS_OPTIONS:='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K -no-exports'}
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesia/build/mksquashfs-excludes"
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/tails/build/mksquashfs-excludes"
export MKSQUASHFS_OPTIONS
# build the doc wiki
......
......@@ -33,7 +33,7 @@ for list in config/chroot_local-packageslists/*.list ; do
done
# files copied or created in the build stage
rm -f config/chroot_local-includes/usr/share/amnesia/build/variables
rm -f config/chroot_local-includes/usr/share/tails/build/variables
# static wiki
rm -rf config/chroot_local-includes/usr/share/doc/tails/website wiki/src/.ikiwiki
......
......@@ -184,11 +184,11 @@ cp debian/changelog config/chroot_local-includes/usr/share/doc/amnesia/Changelog
# create readahead-list from squashfs.sort
if [ -e config/binary_rootfs/squashfs.sort ]; then
mkdir -p config/chroot_local-includes/usr/share/amnesia
mkdir -p config/chroot_local-includes/usr/share/tails
sort -k2 -n -r config/binary_rootfs/squashfs.sort | \
cut -d' ' -f1 | \
grep --invert-match --extended-regexp "$READAHEAD_EXCLUDE_PATTERN" \
> config/chroot_local-includes/usr/share/amnesia/readahead-list
> config/chroot_local-includes/usr/share/tails/readahead-list
fi
# custom APT sources
......
......@@ -19,7 +19,7 @@ usr/lib/locale/aa_DJ.utf8/LC_COLLATE 32750
usr/lib/locale/en_US.utf8/LC_TIME 32749
usr/lib/locale/aa_ET/LC_NUMERIC 32748
usr/lib/locale/aa_DJ.utf8/LC_CTYPE 32747
usr/share/amnesia/readahead-list 32746
usr/share/tails/readahead-list 32746
bin/kmod 32745
bin/touch 32744
lib/modprobe.d/aliases.conf 32742
......@@ -480,7 +480,7 @@ usr/lib/python3.5/__pycache__/random.cpython-35.pyc 32088
lib/live/mount/overlay/usr/lib/python3.5/__pycache__/hashlib.cpython-35.pyc 32087
usr/lib/python3.5/__pycache__/hashlib.cpython-35.pyc 32086
usr/lib/python3.5/lib-dynload/_hashlib.cpython-35m-x86_64-linux-gnu.so 32085
usr/share/amnesia/firstnames.txt 32084
usr/share/tails/firstnames.txt 32084
usr/bin/od 32083
usr/bin/expr 32082
usr/bin/bc 32081
......
......@@ -6,7 +6,7 @@ set -x
echo "Setting up a build environment for kernel modules"
. /usr/share/amnesia/build/variables
. /usr/share/tails/build/variables
# Import ensure_hook_dependency_is_installed() and
# install_fake_package()
......
......@@ -5,7 +5,7 @@ set -u
echo "Building the aufs module"
. /usr/share/amnesia/build/variables
. /usr/share/tails/build/variables
# Import ensure_hook_dependency_is_installed()
. /usr/local/lib/tails-shell-library/build.sh
......
......@@ -6,7 +6,7 @@ set -x
echo "Building VirtualBox guest modules"
. /usr/share/amnesia/build/variables
. /usr/share/tails/build/variables
# Import ensure_hook_dependency_is_installed()
# and install_fake_package()
......
......@@ -5,7 +5,7 @@ set -e
echo "Removing unwanted files"
# Get POTFILES_DOT_IN
. /usr/share/amnesia/build/variables
. /usr/share/tails/build/variables
find /usr/share/doc -type f -name changelog.gz -delete
find /usr/share/doc -type f -name changelog.Debian.gz -delete
......
......@@ -29,7 +29,7 @@ EOF
/usr/local/lib/boot-profile /var/log/boot-profile
# Put readahead list at the very begining
head -n 1 /usr/share/amnesia/readahead-list >/dev/null || true
head -n 1 /usr/share/tails/readahead-list >/dev/null || true
# Creating state file
touch /var/lib/live/config/boot-profile
......
#!/bin/sh
READAHEAD_LIST="/usr/share/amnesia/readahead-list"
READAHEAD_LIST="/usr/share/tails/readahead-list"
BACKGROUND_AT="^usr/bin/Xorg$"
Readahead ()
......
#!/bin/sh
# List of at least 2000 possible nicknames
NICKS_LIST=/usr/share/amnesia/firstnames.txt
NICKS_LIST=/usr/share/tails/firstnames.txt
# returns true with probability $1
prob()
......
......@@ -4,7 +4,6 @@ boot/vmlinuz-*
debootstrap/*
root/.gnupg/S.gpg-agent*
tmp/*
usr/share/amnesia/packages/*
usr/share/doc/tails/website/blueprint/*
usr/share/doc/tails/website/contribute/how/translate/translation_progress.html
usr/share/doc/tails/website/promote/slides/*
......@@ -13,6 +12,7 @@ usr/share/icons/*/.icon-theme.cache
usr/share/icons/*/icon-theme.cache
usr/share/inkscape/examples/*
usr/share/inkscape/tutorials/*
usr/share/tails/packages/*
var/cache/apt/archives/*.deb
var/cache/apt/archives/partial/*.deb
var/cache/apt/pkgcache.bin
......
......@@ -161,7 +161,7 @@ A number of files are simply emptied or excluded when creating the
SquashFS (some to optimize size, some because they are not needed in
there so we did not bother generating them in a deterministic manner):
- <https://git-tails.immerda.ch/tails/tree/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes>
- <https://git-tails.immerda.ch/tails/tree/config/chroot_local-includes/usr/share/tails/build/mksquashfs-excludes>
- <https://git-tails.immerda.ch/tails/tree/config/chroot_local-hooks/99-zzzzzz_reproducible-builds-post-processing>
We considered dropping even more stuff such as the fontconfig cache,
......
......@@ -926,7 +926,7 @@ user. The Debian Live persistence feature is disabled by passing
Removable drives auto-mounting is disabled in Tails 0.7 and newer.
- [[!tails_gitweb config/chroot_local-includes/usr/share/amnesia/gconf/apps_nautilus.xml]]
- [[!tails_gitweb config/chroot_local-includes/usr/share/tails/gconf/apps_nautilus.xml]]
### 3.6.11 Secure erasure of files and free disk space
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment