Browse Source

Ajout du numéro de version de l’iso dans le nom du volume USB généré (et pitit nettoyage) #75

pull/82/head
otyugh 2 years ago
parent
commit
23476d9901
  1. 18
      DFbuild.sh
  2. 2
      auto/config

18
DFbuild.sh

@ -94,18 +94,28 @@ wget -c https://video.tedomum.net/download/videos/872b23f7-aa20-4cf4-b076-a5be2d
wget -c https://video.tedomum.net/download/videos/0ed9302a-82bb-482d-a5c1-ef1532385c94-720.mp4 \
-O config/includes.chroot/etc/skel/Vidéos/Debian_Buster_par_Debian_Facile.mp4
CONFIG=()
# utiliser apt-cacher s'il est installé
if dpkg-query -W apt-cacher-ng &>"/dev/null"
then
export http_proxy="http://127.0.0.1:3142/"
CACHE=("--apt-http-proxy" "$http_proxy")
CONFIG+=("--apt-http-proxy" "$http_proxy")
else
echo "WARNING: apt-cacher-ng n'est pas installé"
fi
# architecture
if [ "$ARCH" == "i386" ]; then lb config -a ${ARCH} ${CACHE[@]} -k "686" --bootloader "syslinux"; fi
if [ "$ARCH" == "amd64" ]; then lb config -a ${ARCH} ${CACHE[@]} --bootloader "syslinux,grub-efi"; fi
# architecture handling
CONFIG+=("-a" "${ARCH}")
case $ARCH in
i386)CONFIG+=("-k" "686" "--bootloader" "syslinux");;
amd64)CONFIG+=("--bootloader" "syslinux,grub-efi");;
esac
# version into USB name
CONFIG+=("--iso-application" "DFiso_$VERSION" "--iso-volume" "DFiso_$VERSION")
# live-build time
lb config -a ${CONFIG[@]}
lb build
## renommage

2
auto/config

@ -21,8 +21,6 @@ lb config noauto \
--debian-installer-gui "true" \
--firmware-binary "true" \
--firmware-chroot "true" \
--iso-application "DFiso" \
--iso-volume "DFiso" \
--iso-publisher "Projet DFiso; https://dflinux.debian-facile.org; contact@debian-facile.org" \
--memtest "none" \
--win32-loader "false" \

Loading…
Cancel
Save