Compare commits

..

1 Commits

Author SHA1 Message Date
0132dda9d7 Fix build for MATE 21 2022-09-13 22:29:37 +02:00
4 changed files with 46 additions and 33 deletions

View File

@ -9,7 +9,7 @@ Cloner le repository: `git clone https://hipstercat.fr/gogs/hipstercat/lis67-iso
Installer les dépendances: Installer les dépendances:
``` ```
sudo apt install rsync syslinux-utils fuseiso squashfuse coreutilssquashfs-tools sudo apt install rsync syslinux-utils
``` ```
## Utilisation ## Utilisation

View File

@ -11,7 +11,7 @@ set menu_color_normal=white/black
set menu_color_highlight=black/light-gray set menu_color_highlight=black/light-gray
set timeout=0 set timeout=0
menuentry "Demarrer ou installer Linux Mint 20.1 MATE 64-bit LIS67" --class linuxmint { menuentry "Demarrer ou installer Linux Mint LIS67" --class linuxmint {
set gfxpayload=keep set gfxpayload=keep
linux /casper/vmlinuz file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=${iso_path} quiet splash -- linux /casper/vmlinuz file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=${iso_path} quiet splash --
initrd /casper/initrd.lz initrd /casper/initrd.lz

View File

@ -22,41 +22,41 @@ WORKDIR="$SPATH/$iso_wo_ext"
echo "==== Prepare CD ====" echo "==== Prepare CD ===="
mkdir /tmp/livecd || : mkdir /tmp/livecd || :
fuseiso "$1" /tmp/livecd sudo mount -o loop "$1" /tmp/livecd
mkdir -p "$WORKDIR" mkdir -p "$WORKDIR"
# rsync --exclude=/casper/filesystem.squashfs -a /tmp/livecd/ "$WORKDIR/cd" rsync --exclude=/casper/filesystem.squashfs -a /tmp/livecd/ "$WORKDIR/cd"
mkdir "$WORKDIR/squashfs" mkdir "$WORKDIR/squashfs" "$WORKDIR/custom"
squashfuse /tmp/livecd/casper/filesystem.squashfs "$WORKDIR/squashfs/" sudo modprobe squashfs
sudo mount -t squashfs -o loop /tmp/livecd/casper/filesystem.squashfs "$WORKDIR/squashfs/"
echo "==== Copy squashfs contents to $WORKDIR/squashfs/squashfs-root ====" echo "==== Copy squashfs contents to $WORKDIR/custom ===="
nprocs=$(($(nproc)-1)) # leave 1 proc for use sudo cp -a "$WORKDIR"/squashfs/* "$WORKDIR/custom"
unsquashfs -p$nprocs -no-xattrs /tmp/livecd/casper/filesystem.squashfs
# network access # network access
cp /etc/resolv.conf /etc/hosts "$WORKDIR/squashfs/squashfs-root/etc/" sudo cp /etc/resolv.conf /etc/hosts "$WORKDIR/custom/etc/"
# mount proc, sys, opens a shell (for changes), and clean everything after # mount proc, sys, opens a shell (for changes), and clean everything after
echo "==== CHROOT ====" echo "==== CHROOT ===="
cat "$SPATH/tasks.sh" | chroot "$WORKDIR/squashfs/squashfs-root" /bin/bash cat "$SPATH/tasks.sh" | sudo chroot "$WORKDIR/custom" /bin/bash
echo "==== Copy custom background ====" echo "==== Copy custom background ===="
sudo cp background/sele_ring_lis67.jpg "$WORKDIR/squashfs/squashfs-root/usr/share/backgrounds/linuxmint/sele_ring_lis67.jpg" sudo cp background/sele_ring_lis67.jpg "$WORKDIR/custom/usr/share/backgrounds/linuxmint/sele_ring_lis67.jpg"
echo "==== Copy Firefox settings ====" echo "==== Copy Firefox settings ===="
sudo cp "$SPATH/firefox/distribution.ini" "$WORKDIR/squashfs/squashfs-root/usr/lib/firefox/distribution/distribution.ini" sudo cp "$SPATH/firefox/distribution.ini" "$WORKDIR/custom/usr/lib/firefox/distribution/distribution.ini"
sudo cp "$SPATH/firefox/distribution.ini" "$WORKDIR/squashfs/squashfs-root/usr/share/ubuntu-system-adjustments/firefox/distribution.ini" sudo cp "$SPATH/firefox/distribution.ini" "$WORKDIR/custom/usr/share/ubuntu-system-adjustments/firefox/distribution.ini"
sudo cp "$SPATH/firefox/vendor-firefox.js" "$WORKDIR/squashfs/squashfs-root/usr/lib/firefox/browser/defaults/preferences/vendor-firefox.js" # sudo cp "$SPATH/firefox/vendor-firefox.js" "$WORKDIR/custom/usr/lib/firefox/browser/defaults/preferences/vendor-firefox.js"
sudo cp "$SPATH/firefox/vendor-firefox.js" "$WORKDIR/squashfs/squashfs-root/usr/share/ubuntu-system-adjustments/firefox/firefox.js" sudo cp "$SPATH/firefox/vendor-firefox.js" "$WORKDIR/custom/usr/share/ubuntu-system-adjustments/firefox/firefox.js"
echo "==== Disable Yahoo, enable Startpage on Firefox ====" echo "==== Disable Yahoo, enable Startpage on Firefox ===="
cd "$SPATH/firefox" cd "$SPATH/firefox"
sudo zip "$WORKDIR/squashfs/squashfs-root/usr/lib/firefox/browser/omni.ja" defaults/settings/main/search-config.json sudo zip "$WORKDIR/custom/usr/lib/firefox/browser/omni.ja" defaults/settings/main/search-config.json
cd - cd -
echo "==== Install extensions ====" echo "==== Install extensions ===="
sudo cp "$SPATH/firefox/extensions/"* "$WORKDIR/squashfs/squashfs-root/usr/lib/firefox/distribution/extensions/" sudo cp "$SPATH/firefox/extensions/"* "$WORKDIR/custom/usr/lib/firefox/distribution/extensions/"
echo "==== Mod ISOLINUX (BIOS) AND GRUB (EFI) ====" echo "==== Mod ISOLINUX (BIOS) AND GRUB (EFI) ===="
if [[ -d isolinux ]]; then if [[ -d isolinux ]]; then
@ -73,9 +73,9 @@ fi
# setup iso # setup iso
echo "==== Setup ISO ====" echo "==== Setup ISO ===="
chmod +w "$WORKDIR/cd/casper/filesystem.manifest" chmod +w "$WORKDIR/cd/casper/filesystem.manifest"
sudo chroot "$WORKDIR/squashfs/squashfs-root" dpkg-query -W --showformat='${Package} ${Version}\n' > "$WORKDIR/cd/casper/filesystem.manifest" sudo chroot "$WORKDIR/custom" dpkg-query -W --showformat='${Package} ${Version}\n' > "$WORKDIR/cd/casper/filesystem.manifest"
sudo cp "$WORKDIR/cd/casper/filesystem.manifest" "$WORKDIR/cd/casper/filesystem.manifest-desktop" sudo cp "$WORKDIR/cd/casper/filesystem.manifest" "$WORKDIR/cd/casper/filesystem.manifest-desktop"
sudo mksquashfs "$WORKDIR/squashfs/squashfs-root" "$WORKDIR/cd/casper/filesystem.squashfs" sudo mksquashfs "$WORKDIR/custom" "$WORKDIR/cd/casper/filesystem.squashfs"
sudo rm "$WORKDIR/cd/MD5SUMS" sudo rm "$WORKDIR/cd/MD5SUMS"
sudo chmod +w "$WORKDIR/cd" sudo chmod +w "$WORKDIR/cd"
sudo bash -c 'cd '"$WORKDIR"'/cd && find . -type f -exec md5sum {} +' > "$WORKDIR"/cd/MD5SUMS sudo bash -c 'cd '"$WORKDIR"'/cd && find . -type f -exec md5sum {} +' > "$WORKDIR"/cd/MD5SUMS

View File

@ -47,30 +47,43 @@ sed -i 's/us/fr/g' /etc/default/keyboard
# install custom packages # install custom packages
# ANCESTRIS # ANCESTRIS
#sudo add-apt-repository -y ppa:ancestris/ancestris-stable sudo add-apt-repository -y ppa:ancestris/ancestris-stable
#sudo apt-get update sudo apt-get update
#sudo apt-get install -y ancestris sudo apt-get install -y ancestris
# ABRICOTINE # ABRICOTINE
#wget "https://github.com/brrd/abricotine/releases/download/1.0.0/abricotine-1.0.0-ubuntu-debian-x64.deb" wget "https://github.com/brrd/abricotine/releases/download/1.0.0/abricotine-1.0.0-ubuntu-debian-x64.deb"
#sudo dpkg -i abricotine-1.0.0-ubuntu-debian-x64.deb sudo dpkg -i abricotine-1.0.0-ubuntu-debian-x64.deb
#rm abricotine-1.0.0-ubuntu-debian-x64.deb rm abricotine-1.0.0-ubuntu-debian-x64.deb
# BAOBAB # BAOBAB
#sudo apt-get install -y baobab sudo apt-get install -y baobab
# SCRIBUS # SCRIBUS
#sudo apt-get install -y scribus sudo apt-get install -y scribus
# KEEPASSXC # KEEPASSXC
#sudo add-apt-repository -y ppa:phoerious/keepassxc sudo add-apt-repository -y ppa:phoerious/keepassxc
#sudo apt-get update sudo apt-get update
#sudo apt-get install -y keepassxc sudo apt-get install -y keepassxc
# clean - do not touch # clean - do not touch
rm -rf /tmp/* rm -rf /tmp/*
rm -f /etc/hosts /etc/resolv.conf
# fix hosts for live cd
cat <<EOF > /etc/hosts
127.0.0.1 localhost.localdomain localhost
::1 localhost.localdomain localhost
EOF
# fix resolv.conf for live cd
cat <<EOF > /etc/resolv.conf
nameserver 127.0.0.53
EOF
# fix firefox not starting correctly after modifications
sudo apt install --reinstall firefox
umount /proc/ umount /proc/
umount /sys/ umount /sys/
umount /dev/pts umount /dev/pts