Commit 14776de3 authored by amnesia's avatar amnesia
Browse files

Migrate to live-boot / live-config instead of live-initramfs.

Tons of involved changes.

The $HOME files have been moved to /etc/skel in order to get rid of permissions
problems: we now let adduser deal with this.

New custom packages:
 - live-boot 2.0~a16-1+tails1.cb5e34 built from our Git repository. It
   integrates the changes our custom live-initramfs had.
 - live-config patched with xserver-xorg related fixes sent today on the Debian
   Live ML; hopefully this is only temporary...
parent f85fe5b1
......@@ -19,13 +19,11 @@ $RUN_LH_CONFIG \
--isohybrid-options "$AMNESIA_ISOHYBRID_OPTS" \
--bootappend-live "${AMNESIA_APPEND}" \
--archive-areas "main contrib non-free" \
--hostname="amnesia" \
--iso-application="The Amnesic Incognito Live System" \
--iso-publisher="https://amnesia.boum.org/" \
--iso-volume="TAILS ${AMNESIA_FULL_VERSION}" \
--memtest none \
--packages-lists="standard" \
--username="amnesia" \
--syslinux-menu vesamenu \
--syslinux-timeout 4 \
${@}
......
......@@ -63,39 +63,39 @@ for LANG_CODE in ${AMNESIA_SUPPORTED_LANGUAGES}; do
case "${LANG_CODE}" in
ar)
LANG_NAME='^Arabic'
LANG_APPEND='locale=ar_EG.UTF-8 timezone=Africa/Cairo'
LANG_APPEND='locales=ar_EG.UTF-8 timezone=Africa/Cairo'
;;
de)
LANG_NAME='^German'
LANG_APPEND='locale=de_DE.UTF-8 klayout=de timezone=Europe/Berlin'
LANG_APPEND='locales=de_DE.UTF-8 keyboard-layouts=de timezone=Europe/Berlin'
;;
en)
LANG_NAME='^English'
LANG_APPEND='locale=en_US.UTF-8 klayout=us timezone=America/Detroit'
LANG_APPEND='locales=en_US.UTF-8 keyboard-layouts=us timezone=America/Detroit'
;;
es)
LANG_NAME='^Spanish'
LANG_APPEND='locale=es klayout=es timezone=Europe/Madrid'
LANG_APPEND='locales=es keyboard-layouts=es timezone=Europe/Madrid'
;;
fr)
LANG_NAME='^French'
LANG_APPEND='locale=fr_FR.UTF-8 klayout=fr timezone=Europe/Paris'
LANG_APPEND='locales=fr_FR.UTF-8 keyboard-layouts=fr timezone=Europe/Paris'
;;
it)
LANG_NAME='^Italian'
LANG_APPEND='locale=it timezone=Europe/Rome'
LANG_APPEND='locales=it timezone=Europe/Rome'
;;
pt)
LANG_NAME='^Portuguese'
LANG_APPEND='locale=pt timezone=Europe/Lisbon'
LANG_APPEND='locales=pt timezone=Europe/Lisbon'
;;
ru)
LANG_NAME='^Russian'
LANG_APPEND='locale=ru timezone=Europe/Moscow'
LANG_APPEND='locales=ru timezone=Europe/Moscow'
;;
zh)
LANG_NAME='^Chinese'
LANG_APPEND='locale=zh_CN.UTF-8 klayout=zh timezone=Asia/Shangai'
LANG_APPEND='locales=zh_CN.UTF-8 keyboard-layouts=zh timezone=Asia/Shangai'
;;
*)
Echo_error "Language ${LANG_CODE} is not supported yet, ask amnesia developpers!"
......
......@@ -94,6 +94,18 @@ Package: live-build
Pin: release a=testing
Pin-Priority: 999
Package: live-config
Pin: release a=testing
Pin-Priority: 999
Package: live-config-sysvinit
Pin: release a=testing
Pin-Priority: 999
Package: live-initramfs
Pin: release a=testing
Pin-Priority: 999
Package: monkeysphere
Pin: release a=lenny-backports
Pin-Priority: 999
......
......@@ -7,5 +7,5 @@ echo "root:amnesia" | chpasswd
# Change the autogenerated user password to "amnesia"
plain_password="amnesia"
password=$(echo "${plain_password}" | mkpasswd -s)
sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser
sed -i -e 's/\(_PASSWORD=\)\(.*\)/\1\"'${password}'\"/' /lib/live/config/002-user-setup
update-initramfs -tu -kall
#!/bin/sh
if [ ! -d /etc/X11 ]; then
mkdir /etc/X11
chmod 755 /etc/X11
fi
ln -s --force /usr/bin/Xorg /etc/X11/X
#!/bin/sh
chown -R 1000:1000 /home/amnesia
chmod go+rX /etc/apt/apt.conf /etc/apt/preferences /etc/apt/sources.list /etc/apt/sources.list.d/*
chmod go+rX /lib /lib/live /lib/live/config
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