Commit 54d9cb59 authored by arpinux's avatar arpinux

fix font + refonte DFbuild + fusion 32/64 + update doc + cfg efi

parent 2598588d
......@@ -5,4 +5,3 @@ chroot/*
*.iso
dfl-amd64/**
dfl-i386/**
temoin/**
......@@ -21,28 +21,24 @@ elif [ "$1" == "clean" ]; then
else
# no args or wrong args > help
echo "Usage: as root"
echo "DFbuild 32 > build DFLinux i386"
echo "DFbuild 64 > build DFLinux amd64"
echo "DFbuild clean > clean up cache directories"
echo "./DFbuild.sh 32 > build DFLinux i386"
echo "./DFbuild.sh 64 > build DFLinux amd64"
echo "./DFbuild.sh clean > clean up cache directories"
echo "---"
echo "make sure to clean directory before cross-arch building"
exit 1
fi
## build ISO -----------------------------------------------------------
## place nette
lb clean
## mise en place
echo "INFO: building DFLinux-${VERSION}-${ARCH}"
# copie du script de configuration
cp auto/config${1} auto/config
# mise en place de la config grub-efi
if [ "$1" == "64" ]; then
mkdir -p config/includes.binary/boot/grub/live-theme
cp efi/theme.txt config/includes.binary/boot/grub/live-theme/
fi
# architecture
lb config --architecture ${ARCH}
## construction
echo "INFO: construction"
......@@ -56,17 +52,11 @@ if test -f live-image-${ARCH}.hybrid.iso; then
mv chroot.packages.install dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.pkgs
mv dflinux.log dfl-${ARCH}/dflinux-${VERSION}-${ARCH}.log
cd dfl-${ARCH} && md5sum dflinux-${VERSION}-${ARCH}.iso > dflinux-${VERSION}-${ARCH}.md5 && cd ../
chown -R $(echo $USERNAME):$(echo $USERNAME) dfl-${ARCH}
Please register or sign in to reply
else
echo "ISO not builded... error ... please conult your logfile"
echo ""
exit 1
fi
## nettoyage -----------------------------------------------------------
echo "INFO: nettoyage"
rm -f auto/config
if [ "$1" == "64" ]; then
rm -Rf config/includes.binary/boot
fi
exit 0
......@@ -4,4 +4,4 @@ Pour toute information, visitez [la page principale du projet](https://lescahier
Pour contribuer, visitez [le guide de contribution](CONTRIBUTING.md).
DIY : direction doc/ ;)
DIY : direction [doc/](doc/) ;)
- first ... [check issues](https://framagit.org/dflinux/DFiso/issues)
- suppression de dfl-doc : la documentation sera intégrée de base + en ligne mais plus en paquet, ça cert à rien en fait :P
- tester gnome-software
- mise à jour de la conf firefox
- tester la compatibilité uefi
- configurer le menu grub-efi en miroir de l'amorce isolinux
- ...
- mise à jour de la documentation utilisateur
- [check issues](https://framagit.org/dflinux/DFiso/issues)
......@@ -2,7 +2,5 @@
lb clean noauto "$@"
rm -f config/binary config/bootstrap config/build \
config/chroot config/common config/source \
config/package-lists/live.list.chroot
config/chroot config/common config/source
find config/hooks/ -type l | xargs --no-run-if-empty rm -f
find config/ -type d | xargs rmdir --ignore-fail-on-non-empty
#!/bin/sh
# build script - dflinux amd64
##############################
# build script - dflinux
########################
lb config noauto \
--mode "debian" \
--system "live" \
--architectures "amd64" \
--distribution "stretch" \
--archive-areas "main contrib non-free" \
--security "true" \
......
#!/bin/sh
# build script - dflinux i386
#############################
lb config noauto \
--mode "debian" \
--system "live" \
--architectures "i386" \
--distribution "stretch" \
--archive-areas "main contrib non-free" \
--security "true" \
--updates "true" \
--backports "false" \
--binary-filesystem "fat32" \
--binary-images "iso-hybrid" \
--apt-indices "true" \
--apt-recommends "true" \
--apt-secure "true" \
--apt-source-archives "false" \
--linux-package "linux-image" \
--bootloader "syslinux" \
--bootappend-live "boot=live components quiet splash username=humain hostname=DFLinux locales=fr_FR.UTF-8" \
--bootappend-install "locales=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg" \
--debian-installer "live" \
--debian-installer-gui "true" \
--firmware-binary "true" \
--firmware-chroot "true" \
--iso-application "dflinux" \
--iso-volume "dflinux" \
--memtest "memtest86+" \
--win32-loader "false" \
--clean \
--debug \
--verbose \
--source "false" \
"${@}"
set default=0
loadfont $prefix/dejavu-bold-16.pf2
loadfont $prefix/dejavu-bold-14.pf2
loadfont $prefix/unicode.pf2
set gfxmode=auto
insmod all_video
insmod gfxterm
insmod png
set color_normal=light-gray/black
set color_highlight=white/black
if [ -e /isolinux/splash.png ]; then
# binary_syslinux modifies the theme file to point to the correct
# background picture
set theme=/boot/grub/live-theme/theme.txt
elif [ -e /boot/grub/splash.png ]; then
set theme=/boot/grub/live-theme/theme.txt
else
set menu_color_normal=cyan/blue
set menu_color_highlight=white/blue
fi
terminal_output gfxterm
insmod play
play 960 440 1 0 4 440 1
# Live boot
menuentry "Tester Debian" {
linux /live/vmlinuz boot=live components quiet splash username=humain hostname=DFLinux locales=fr_FR.UTF-8
initrd /live/initrd.img
}
menuentry "Tester Debian (mode sans échec)" {
linux /live/vmlinuz boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
initrd /live/initrd.img
}
# Installer (if any)
menuentry "Installer Debian sur votre ordinateur" {
linux /install/gtk/vmlinuz video=vesa:ywrap,mtrr vga=788 quiet locales=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg
initrd /install/gtk/initrd.gz
}
submenu 'Advanced options...' {
# More installer entries (if any)
menuentry "Install in text mode" {
linux /install/vmlinuz vga=normal quiet locales=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg
initrd /install/initrd.gz
}
menuentry "Expert install in graphical mode" {
linux /install/gtk/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788 quiet locales=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg
initrd /install/gtk/initrd.gz
}
menuentry "Expert install in text mode" {
linux /install/vmlinuz priority=low vga=normal quiet locales=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg
initrd /install/initrd.gz
}
# Memtest (if any)
menuentry "memtest86+" {
linux16 /live/memtest
}
}
......@@ -4,3 +4,8 @@ label installgui
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 locale=fr_FR.UTF-8 file=/cdrom/install/df-preseed.cfg -- quiet
label expert
menu label Installer en Mode ^Expert
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 -- quiet
......@@ -2,7 +2,7 @@
background = /usr/share/backgrounds/xfce/dflinux-start.png
theme-name = Adwaita
icon-theme-name = gnome-brave
font-name = Droid Sans 10
font-name = DejaVu Sans 10
xft-antialias = true
xft-hintstyle = hintfull
xft-rgba = rgb
......
[Settings]
gtk-theme-name=Adwaita
gtk-icon-theme-name=gnome-brave
gtk-font-name=Droid Sans 10
gtk-font-name=DejaVu Sans 10
gtk-cursor-theme-name=DMZ-Black
gtk-cursor-theme-size=16
gtk-toolbar-style=GTK_TOOLBAR_TEXT
......
......@@ -3,7 +3,7 @@
gtk-theme-name="Adwaita"
gtk-icon-theme-name="gnome-brave"
gtk-font-name="Droid Sans 10"
gtk-font-name="DejaVu Sans 10"
gtk-cursor-theme-name="DMZ-Black"
gtk-cursor-theme-size=16
gtk-toolbar-style=GTK_TOOLBAR_TEXT
......
live-boot
live-config
live-config-systemd
  • pour l'instant, on est confronté au soucis de différence de version entre le noyau de l'installeur et le noyau du système, même en supprimant les proposed-updates.

    donc rien à faire sinon attendre la montée de version du kernel de l'installeur ;)

    à part ça le live fonctionne en BIOS/UEFI avec les entrées personnalisées. j'ai mis la doc à jour en conséquence.

    donc tests en live, config du user etc... on verra l'installation et la fine personnalisation de l'installeur en dernier point :)

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