Compare commits

...

15 Commits

  1. 19
      CHANGELOG
  2. 45
      DFbuild.sh
  3. 6
      README.md
  4. 12
      config/hooks/normal/numlockx_for_lightdm.chroot
  5. 266
      config/includes.chroot/etc/skel/.xscreensaver
  6. 4
      config/package-lists/dfiso.list.chroot
  7. 141
      maketorrent.sh

19
CHANGELOG

@ -1,3 +1,22 @@
2021 ?? ??
Debian-Facile xx.xx-x
- Correction bugs :
- ...
- Mise à jour et modifications :
- automatisation de la création des torrents pour DFiso (merci @vv222)
- ...
2021 01 05
Debian-Facile 10.7-1 Stable
- Correction bugs :
- remplacement de wbext-ublock-origin par sa version 'firefox'
- nettoyage
- amélioration du script de construction
- Mise à jour et modifications :
- Mise à jour Debian 10.7
- Mise à jour du manuel de l'utilisateur
- Mise à jour des cahiers du débutant
2020 10 03
Debian-Facile 10.6-1 Stable
- Correction bugs :

45
DFbuild.sh

@ -2,8 +2,11 @@
# Debian-Facile live-build script
# https://debian-facile.org/git/ProjetsDF/dfiso-buster/
# set working directory ------------------------------------------------
DFDIR="$(realpath "$(dirname "$0")")"
cd ${DFDIR}
# cfg ------------------------------------------------------------------
VERSION="10.6-1"
VERSION="10.7-1"
if [ `whoami` != root ]; then
echo "erreur : lancer DFbuild en tant qu'administrateur"
@ -33,35 +36,32 @@ lb clean
echo "INFO: building DFiso-${VERSION}-${ARCH}"
## mise en place du dossier des paquets externes
mkdir -p config/packages
mkdir -p ${DFDIR}/config/packages
## construction des paquets debian
mkdir -p src-deb
cd src-deb/
mkdir -p ${DFDIR}/src-deb
cd ${DFDIR}/src-deb/
# gdebi-fixdesk
echo ""
echo "INFOS : construction du gdebi-fixdesk.deb"
git clone --branch master --depth 1 https://debian-facile.org/git/ProjetsDF/gdebi-fixdesk.git
cd gdebi-fixdesk/
equivs-build gdebi-fixdesk.equivs
mv *.deb ../../config/packages/
cd ../
cd ${DFDIR}/src-deb/
# dfl-dispatch
echo ""
echo "INFOS : construction du dfl-dispatch.deb"
git clone --branch master --depth 1 https://debian-facile.org/git/ProjetsDF/dfl-dispatch.git
cd dfl-dispatch/
equivs-build dfl-dispatch.equivs
mv *.deb ../../config/packages/
cd ../
cd ${DFDIR}/src-deb/
# handymenu
echo ""
echo "INFOS : construction du handymenu.deb"
git clone --branch master --depth 1 https://debian-facile.org/git/ProjetsDF/handymenu.git
cd handymenu/
equivs-build handymenu.equivs
mv *.deb ../../config/packages/
cd ../
cd ${DFDIR}/src-deb/
# df-manuel
echo ""
echo "INFOS : récupération des sources pour doc-dfiso-buster"
@ -70,10 +70,10 @@ cd doc-dfiso-buster/docs/
./mkpdf
cd ../debian/
./mkdeb
cd ../
mv *.deb ../../config/packages/
cd ../../
cd ${DFDIR}
echo ""
echo "INFOS : récupération des deb's"
find src-deb -iname "*.deb" -exec mv {} config/packages \;
echo "INFOS : nettoyage du dossier de construction des deb's"
rm -Rf src-deb/
# import des cahiers du débutant
@ -81,8 +81,8 @@ rm -Rf src-deb/
echo ""
echo "INFOS : récupération des cahiers du débutant"
cd config/packages/
wget -q -c https://debian-facile.org/projets/lescahiersdudebutant/download/lescahiersdudebutant_10.5-2_all.deb
cd ../../
wget -q -c https://debian-facile.org/projets/lescahiersdudebutant/download/lescahiersdudebutant_10.6_all.deb
cd ${DFDIR}
## téléchargement des vidéos de présentation et d'installation
## depuis le compte peertube debian-facile
@ -121,11 +121,16 @@ lb build
## renommage
if test -f live-image-${ARCH}.hybrid.iso; then
echo "INFO: renommer"
mkdir -p dfiso-${ARCH}
mv live-image-${ARCH}.hybrid.iso dfiso-${ARCH}/debian-facile-${VERSION}_${ARCH}.iso
mv chroot.packages.install dfiso-${ARCH}/debian-facile-${VERSION}_${ARCH}.pkgs
mv dfiso.log dfiso-${ARCH}/debian-facile-${VERSION}_${ARCH}.log
cd dfiso-${ARCH} && md5sum debian-facile-${VERSION}_${ARCH}.iso > debian-facile-${VERSION}_${ARCH}.md5 && cd ../
ISODIR="${DFDIR}/dfiso-${ARCH}"
NAME="debian-facile-${VERSION}_${ARCH}"
mkdir -p ${ISODIR}
mv live-image-${ARCH}.hybrid.iso ${ISODIR}/${NAME}.iso
mv chroot.packages.install ${ISODIR}/${NAME}.pkgs
mv dfiso.log ${ISODIR}/${NAME}.log
cd ${ISODIR} && md5sum ${NAME}.iso > ${NAME}.md5
mv ${DFDIR}/maketorrent.sh ${ISODIR}
./maketorrent.sh ${NAME}.iso
mv maketorrent.sh ${DFDIR} && cd ${DFDIR}
echo "INFO: nettoyage"
rm config/includes.chroot/etc/skel/Vidéos/Debian_Buster_par_Debian_Facile.mp4
rm config/includes.chroot/etc/skel/Vidéos/DFiso_3_modes_d_installation.mp4

6
README.md

@ -41,11 +41,11 @@ Dépendances live-build :
Dépendance git pour cloner le dépôt dfiso :
# apt update && apt install git
# apt update && apt install git
Dépendance debian :
# apt update && apt install equivs
# apt update && apt install equivs mktorrent
Cloner le sources git :
@ -57,7 +57,7 @@ Mettre à jour les sources git sur sa propre machine :
Nettoyer les sources (à faire entre chaque build d'architectures différentes) :
# ./DFbuild.sh clean
# ./DFbuild.sh clean
Construire son iso :

12
config/hooks/normal/numlockx_for_lightdm.chroot

@ -0,0 +1,12 @@
#!/bin/sh
set -e
echo ""
echo "------------------------------------------------------------------------------------"
echo "- INFO : activer automatiquement numlockx dans lightdm -"
echo "keyboard = numlockx on" >> "/etc/lightdm/lightdm-gtk-greeter.conf"
echo ""
echo "------------------------------------------------------------------------------------"
echo ""

266
config/includes.chroot/etc/skel/.xscreensaver

@ -1,266 +0,0 @@
# XScreenSaver Preferences File
# Written by xscreensaver-demo 5.30 for arp on Fri Oct 28 01:18:23 2016.
# http://www.jwz.org/xscreensaver/
timeout: 0:10:00
cycle: 0:10:00
lock: False
lockTimeout: 0:00:00
passwdTimeout: 0:00:30
visualID: default
installColormap: True
verbose: False
timestamp: True
splash: True
splashDuration: 0:00:05
demoCommand: xscreensaver-demo
prefsCommand: xscreensaver-demo -prefs
nice: 10
memoryLimit: 0
fade: True
unfade: False
fadeSeconds: 0:00:03
fadeTicks: 20
captureStderr: True
ignoreUninstalledPrograms:False
font: *-medium-r-*-140-*-m-*
dpmsEnabled: False
dpmsQuickOff: False
dpmsStandby: 2:00:00
dpmsSuspend: 2:00:00
dpmsOff: 4:00:00
grabDesktopImages: False
grabVideoFrames: False
chooseRandomImages: True
imageDirectory: /usr/share/backgrounds/xfce
mode: one
selected: 81
textMode: url
textLiteral: XScreenSaver
textFile:
textProgram: fortune
textURL: http://planet.debian.org/rss20.xml
programs: \
maze -root \n\
- GL: superquadrics -root \n\
attraction -root \n\
blitspin -root \n\
greynetic -root \n\
helix -root \n\
hopalong -root \n\
imsmap -root \n\
- noseguy -root \n\
- pyro -root \n\
qix -root \n\
- rocks -root \n\
rorschach -root \n\
decayscreen -root \n\
flame -root \n\
halo -root \n\
slidescreen -root \n\
pedal -root \n\
bouboule -root \n\
- braid -root \n\
coral -root \n\
deco -root \n\
drift -root \n\
- fadeplot -root \n\
galaxy -root \n\
goop -root \n\
grav -root \n\
ifs -root \n\
unicode -root \n\
- GL: jigsaw -root \n\
julia -root \n\
- kaleidescope -root \n\
- GL: moebius -root \n\
moire -root \n\
- GL: morph3d -root \n\
mountain -root \n\
munch -root \n\
penrose -root \n\
- GL: pipes -root \n\
rd-bomb -root \n\
- GL: rubik -root \n\
- sierpinski -root \n\
slip -root \n\
- GL: sproingies -root \n\
starfish -root \n\
strange -root \n\
swirl -root \n\
triangle -root \n\
xjack -root \n\
xlyap -root \n\
- GL: atlantis -root \n\
bsod -root \n\
- GL: bubble3d -root \n\
- GL: cage -root \n\
- crystal -root \n\
cynosure -root \n\
discrete -root \n\
distort -root \n\
epicycle -root \n\
flow -root \n\
- GL: glplanet -root \n\
interference -root \n\
kumppa -root \n\
- GL: lament -root \n\
moire2 -root \n\
- GL: sonar -root \n\
- GL: stairs -root \n\
truchet -root \n\
- vidwhacker -root \n\
blaster -root \n\
bumps -root \n\
ccurve -root \n\
compass -root \n\
deluxe -root \n\
- demon -root \n\
- GL: extrusion -root \n\
- loop -root \n\
penetrate -root \n\
petri -root \n\
phosphor -root \n\
- GL: pulsar -root \n\
ripples -root \n\
shadebobs -root \n\
- GL: sierpinski3d -root \n\
spotlight -root \n\
squiral -root \n\
wander -root \n\
- webcollage -root \n\
xflame -root \n\
xmatrix -root \n\
- GL: gflux -root \n\
- nerverot -root \n\
xrayswarm -root \n\
xspirograph -root \n\
- GL: circuit -root \n\
- GL: dangerball -root \n\
- GL: engine -root \n\
- GL: flipscreen3d -root \n\
- GL: gltext -root \n\
- GL: menger -root \n\
- GL: molecule -root \n\
rotzoomer -root \n\
speedmine -root \n\
- GL: starwars -root \n\
- GL: stonerview -root \n\
vermiculate -root \n\
whirlwindwarp -root \n\
zoom -root \n\
anemone -root \n\
apollonian -root \n\
- GL: boxed -root \n\
- GL: cubenetic -root \n\
- GL: endgame -root \n\
euler2d -root \n\
fluidballs -root \n\
- GL: flurry -root \n\
- GL: glblur -root \n\
- GL: glsnake -root \n\
halftone -root \n\
- GL: juggler3d -root \n\
- GL: lavalite -root \n\
- polyominoes -root \n\
- GL: queens -root \n\
- GL: sballs -root \n\
- GL: spheremonics -root \n\
- thornbird -root \n\
twang -root \n\
- GL: antspotlight -root \n\
apple2 -root \n\
- GL: atunnel -root \n\
barcode -root \n\
- GL: blinkbox -root \n\
- GL: blocktube -root \n\
- GL: bouncingcow -root \n\
cloudlife -root \n\
- GL: cubestorm -root \n\
eruption -root \n\
- GL: flipflop -root \n\
- GL: flyingtoasters -root \n\
fontglide -root \n\
- GL: gleidescope -root \n\
- GL: glknots -root \n\
- GL: glmatrix -root \n\
- GL: glslideshow -root \n\
- GL: hypertorus -root \n\
- GL: jigglypuff -root \n\
metaballs -root \n\
- GL: mirrorblob -root \n\
piecewise -root \n\
- GL: polytopes -root \n\
pong -root \n\
popsquares -root \n\
- GL: surfaces -root \n\
xanalogtv -root \n\
- abstractile -root \n\
anemotaxis -root \n\
- GL: antinspect -root \n\
fireworkx -root \n\
fuzzyflakes -root \n\
interaggregate -root \n\
intermomentary -root \n\
memscroller -root \n\
- GL: noof -root \n\
pacman -root \n\
- GL: pinion -root \n\
- GL: polyhedra -root \n\
- GL: providence -root \n\
substrate -root \n\
wormhole -root \n\
- GL: antmaze -root \n\
- GL: boing -root \n\
boxfit -root \n\
- GL: carousel -root \n\
celtic -root \n\
- GL: crackberg -root \n\
- GL: cube21 -root \n\
fiberlamp -root \n\
- GL: fliptext -root \n\
- GL: glhanoi -root \n\
- GL: tangram -root \n\
- GL: timetunnel -root \n\
- GL: glschool -root \n\
- GL: topblock -root \n\
- GL: cubicgrid -root \n\
cwaves -root \n\
- GL: gears -root \n\
- GL: glcells -root \n\
- GL: lockward -root \n\
m6502 -root \n\
- GL: moebiusgears -root \n\
- GL: voronoi -root \n\
- GL: hypnowheel -root \n\
- GL: klein -root \n\
- lcdscrub -root \n\
- GL: photopile -root \n\
- GL: skytentacles -root \n\
- GL: rubikblocks -root \n\
- GL: companioncube -root \n\
- GL: hilbert -root \n\
- GL: tronbit -root \n\
- GL: geodesic -root \n\
hexadrop -root \n\
- GL: kaleidocycle -root \n\
- GL: quasicrystal -root \n\
- GL: unknownpleasures -root \n\
- GL: projectiveplane -root \n\
tessellimage -root \n\
- GL: winduprobot -root \n\
pointerPollTime: 0:00:05
pointerHysteresis: 10
windowCreationTimeout:0:00:30
initialDelay: 0:00:00
GetViewPortIsFullOfLies:False
procInterrupts: True
xinputExtensionDev: False
overlayStderr: True
authWarningSlack: 20

4
config/package-lists/dfiso.list.chroot

@ -31,8 +31,8 @@ thunar-archive-plugin tumbler-plugins-extra
#network
hexchat
firefox-esr webext-https-everywhere webext-ublock-origin
thunderbird thunderbird-l10n-fr lightning-l10n-fr enigmail
firefox-esr webext-https-everywhere webext-ublock-origin-firefox
thunderbird thunderbird-l10n-fr
transmission-gtk network-manager-gnome curl wpasupplicant whois nmap dnsutils
#office

141
maketorrent.sh

@ -0,0 +1,141 @@
#!/bin/bash
#----------
# make dfiso torrent file
# depends on mktorrent
# usage : ./maketorrent.sh /path/to/file
mktorrent \
-a udp://tracker.coppersurfer.tk:6969/announce \
-a udp://tracker.opentrackr.org:1337/announce \
-a udp://p4p.arenabg.ch:1337/announce \
-a udp://tracker.leechers-paradise.org:6969/announce \
-a udp://9.rarbg.to:2710/announce \
-a udp://9.rarbg.me:2710/announce \
-a udp://exodus.desync.com:6969/announce \
-a udp://tracker.cyberia.is:6969/announce \
-a udp://tracker.tiny-vps.com:6969/announce \
-a udp://retracker.lanta-net.ru:2710/announce \
-a udp://tracker.moeking.me:6969/announce \
-a udp://open.stealth.si:80/announce \
-a udp://tracker.torrent.eu.org:451/announce \
-a udp://tracker3.itzmx.com:6961/announce \
-a udp://bt2.archive.org:6969/announce \
-a udp://bt1.archive.org:6969/announce \
-a udp://ipv4.tracker.harry.lu:80/announce \
-a udp://valakas.rollo.dnsabr.com:2710/announce \
-a udp://retracker.akado-ural.ru:80/announce \
-a udp://opentor.org:2710/announce \
-a udp://explodie.org:6969/announce \
-a udp://zephir.monocul.us:6969/announce \
-a udp://www.midea123.z-media.com.cn:6969/announce \
-a udp://wassermann.online:6969/announce \
-a udp://vps2.avc.cx:7171/announce \
-a udp://vibe.community:6969/announce \
-a udp://ultra.zt.ua:6969/announce \
-a udp://u.wwwww.wtf:1/announce \
-a udp://tsundere.pw:6969/announce \
-a udp://tracker0.ufibox.com:6969/announce \
-a udp://tracker.zum.bi:6969/announce \
-a udp://tracker.zooki.xyz:6969/announce \
-a udp://tracker.zerobytes.xyz:1337/announce \
-a udp://tracker.zemoj.com:6969/announce \
-a udp://tracker.yoshi210.com:6969/announce \
-a udp://tracker.vulnix.sh:6969/announce \
-a udp://tracker.v6speed.org:6969/announce \
-a udp://tracker.uw0.xyz:6969/announce \
-a udp://tracker.skyts.net:6969/announce \
-a udp://tracker.skynetcloud.site:6969/announce \
-a udp://tracker.shkinev.me:6969/announce \
-a udp://tracker.publictracker.xyz:6969/announce \
-a udp://tracker.lelux.fi:6969/announce \
-a udp://tracker.kamigami.org:2710/announce \
-a udp://tracker.fortu.io:6969/announce \
-a udp://tracker.dyne.org:6969/announce \
-a udp://tracker.ds.is:6969/announce \
-a udp://tracker.blacksparrowmedia.net:6969/announce \
-a udp://tracker.army:6969/announce \
-a udp://tracker-udp.gbitt.info:80/announce \
-a udp://teamspeak.value-wolf.org:6969/announce \
-a udp://t3.leech.ie:1337/announce \
-a udp://t2.leech.ie:1337/announce \
-a udp://t1.leech.ie:1337/announce \
-a udp://storage.groupees.com:6969/announce \
-a udp://sd-161673.dedibox.fr:6969/announce \
-a udp://rutorrent.frontline-mod.com:6969/announce \
-a udp://retracker.netbynet.ru:2710/announce \
-a udp://retracker.local.msn-net.ru:6969/announce \
-a udp://qg.lorzl.gq:2710/announce \
-a udp://publictracker.xyz:6969/announce \
-a udp://public.publictracker.xyz:6969/announce \
-a udp://public-tracker.zooki.xyz:6969/announce \
-a udp://opentracker.i2p.rocks:6969/announce \
-a udp://nagios.tks.sumy.ua:80/announce \
-a udp://mts.tvbit.co:6969/announce \
-a udp://movies.zsw.ca:6969/announce \
-a udp://mail.realliferpg.de:6969/announce \
-a udp://ln.mtahost.co:6969/announce \
-a udp://line-net.ru:6969/announce \
-a udp://koli.services:6969/announce \
-a udp://kanal-4.de:6969/announce \
-a udp://josueunhuit.com:6969/announce \
-a udp://inferno.demonoid.is:3391/announce \
-a udp://handrew.me:6969/announce \
-a udp://git.vulnix.sh:6969/announce \
-a udp://free-tracker.zooki.xyz:6969/announce \
-a udp://forever-tracker.zooki.xyz:6969/announce \
-a udp://fe.dealclub.de:6969/announce \
-a udp://engplus.ru:6969/announce \
-a udp://eliastre100.fr:6969/announce \
-a udp://edu.uifr.ru:6969/announce \
-a udp://drumkitx.com:6969/announce \
-a udp://dpiui.reedlan.com:6969/announce \
-a udp://discord.heihachi.pw:6969/announce \
-a udp://daveking.com:6969/announce \
-a udp://cutiegirl.ru:6969/announce \
-a udp://contra.sf.ca.us:6969/announce \
-a udp://code2chicken.nl:6969/announce \
-a udp://chanchan.uchuu.co.uk:6969/announce \
-a udp://cdn-2.gamecoast.org:6969/announce \
-a udp://cdn-1.gamecoast.org:6969/announce \
-a udp://bubu.mapfactor.com:6969/announce \
-a udp://bms-hosxp.com:6969/announce \
-a udp://blokas.io:6969/announce \
-a udp://benouworldtrip.fr:6969/announce \
-a udp://aruacfilmes.com.br:6969/announce \
-a udp://api.bitumconference.ru:6969/announce \
-a udp://adminion.n-blade.ru:6969/announce \
-a udp://admin.videoenpoche.info:6969/announce \
-a udp://adm.category5.tv:6969/announce \
-a udp://aaa.army:8866/announce \
-a udp://6ahddutb1ucc3cp.ru:6969/announce \
-a udp://61626c.net:6969/announce \
-a udp://47.ip-51-68-199.eu:6969/announce \
-a udp://tracker6.dler.org:2710/announce \
-a udp://tracker4.itzmx.com:2710/announce \
-a udp://tracker2.itzmx.com:6961/announce \
-a udp://tracker2.dler.org:80/announce \
-a udp://tracker.teambelgium.net:6969/announce \
-a udp://tracker.kali.org:6969/announce \
-a udp://tracker.filemail.com:6969/announce \
-a udp://tracker.dler.org:6969/announce \
-a udp://tr.cili001.com:8070/announce \
-a udp://tr.bangumi.moe:6969/announce \
-a udp://retracker.sevstar.net:2710/announce \
-a udp://opentracker.arg.bz:6969/announce \
-a udp://open.lolicon.eu:7777/announce \
-a udp://ns389251.ovh.net:6969/announce \
-a udp://ns-1.x-fins.com:6969/announce \
-a udp://f68.n5022.z2.binkp.net:6969/announce \
-a udp://concen.org:6969/announce \
-a udp://camera.lei001.com:6969/announce \
-a udp://btt.royalquest.ru:2710/announce \
-a udp://bt2.54new.com:8080/announce \
-a udp://bt.firebit.org:2710/announce \
-a udp://bitsparadise.info:6969/announce \
-a udp://bioquantum.co.za:6969/announce \
-a udp://bclearning.top:6969/announce \
-a udp://anidex.moe:6969/announce \
-w https://dflinux.debian-facile.org/isos/${1} ${1}
exit 0
Loading…
Cancel
Save