Commit 61515e5e authored by amnesia's avatar amnesia

fix build with live-helper >= 2.0a4, and require it

Leave .list at the end of our always-enabled packages list (amnesia-common),
remove it from others, and copy at lh_config time the needed additional
packages lists to .list-named ones to enable them.
parent c02f8c03
......@@ -22,6 +22,11 @@ fi
rm -f config/chroot_local-includes/etc/amnesia/version
rm -f config/chroot_local-includes/usr/share/doc/amnesia/Changelog
rm -f config/chroot_local-includes/usr/share/doc/amnesia/amnesia.asc
for list in config/chroot_local-packageslists/*.list ; do
if [ "$list" != 'config/chroot_local-packageslists/amnesia-common.list' ]; then
rm -f "$list"
fi
done
# static wiki
rm -rf config/binary_local-includes/doc wiki/src/.ikiwiki
......
......@@ -22,6 +22,7 @@ $RUN_LH_CONFIG \
--iso-publisher="https://amnesia.boum.org/" \
--iso-volume="Amnesia ${AMNESIA_FULL_VERSION}" \
--memtest none \
--packages-lists="standard" \
--username="amnesia" \
--syslinux-menu vesamenu \
--syslinux-timeout 4 \
......@@ -61,13 +62,16 @@ $RUN_LH_CONFIG --bootappend-live "${AMNESIA_APPEND}" ${@}
case "${LH_LANGUAGE}" in
de|fr|en)
PACKAGES_LISTS="standard amnesia-common amnesia-${AMNESIA_BASE} amnesia-${LH_LANGUAGE}"
ADD_PACKAGES_LISTS="amnesia-${AMNESIA_BASE} amnesia-${LH_LANGUAGE}"
;;
*)
PACKAGES_LISTS="standard amnesia-common amnesia-${AMNESIA_BASE}"
ADD_PACKAGES_LISTS="amnesia-${AMNESIA_BASE}"
;;
esac
$RUN_LH_CONFIG --packages-lists="$PACKAGES_LISTS" ${@}
for basename in ${ADD_PACKAGES_LISTS} ; do
cp "config/chroot_local-packageslists/${basename}" \
"config/chroot_local-packageslists/${basename}.list"
done
# version
mkdir -p config/chroot_local-includes/etc/amnesia/
......
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