Allow newer versions of debian
This commit is contained in:
lionel
parent
c58b5232ac
commit
ecd0b39dc9
@ -2,7 +2,6 @@ sudo
|
||||
screen
|
||||
usbutils
|
||||
file
|
||||
python
|
||||
python2
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
@ -5,7 +5,8 @@ mdadm
|
||||
ntfs-3g
|
||||
dosfstools
|
||||
mtools
|
||||
exfat-utils
|
||||
#exfat-utils
|
||||
exfatprogs
|
||||
cryptsetup-bin
|
||||
libblockdev-crypto2
|
||||
libblockdev-lvm2
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
firmware-amd-graphics
|
||||
firmware-ath9k-htc
|
||||
#firmware-ath9k-htc
|
||||
firmware-atheros
|
||||
firmware-bnx2
|
||||
firmware-bnx2x
|
||||
@ -26,4 +26,4 @@ firmware-siano
|
||||
firmware-ti-connectivity
|
||||
firmware-zd1211
|
||||
amd64-microcode
|
||||
intel-microcode
|
||||
intel-microcode
|
||||
|
||||
@ -19,5 +19,6 @@ user-setup
|
||||
keyboard-configuration
|
||||
console-data
|
||||
console-setup
|
||||
lsb-release
|
||||
fake-hwclock
|
||||
ntp
|
||||
|
||||
135
make.sh
135
make.sh
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
baseDir=/media/Accensio/live
|
||||
baseDir=$(pwd)
|
||||
|
||||
build=$baseDir/build
|
||||
|
||||
@ -14,23 +14,9 @@ then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
_usage()
|
||||
{
|
||||
cat <<"EOF"
|
||||
-f Make full live image
|
||||
-x Make xfce live image
|
||||
-c Make cinnamon live image
|
||||
-v Make xfce-vm live image
|
||||
EOF
|
||||
}
|
||||
debian_version="bullseye"
|
||||
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
_usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
KERNEL_PARAM="boot=live components lang=fr_FR.UTF-8 locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-model=pc105 timezone=Europe/Paris utc=yes"
|
||||
type_list=(full xfce cinnamon vmxfce vmfull)
|
||||
|
||||
pack_full=(live cli disk net firmware xfce4 cinnamon dm-common gui gui_opt)
|
||||
|
||||
@ -40,7 +26,25 @@ pack_cinnamon=(live cli disk net firmware cinnamon dm-common gui)
|
||||
|
||||
pack_vmxfce=(live cli disk net firmware xfce4 dm-common gui vm)
|
||||
|
||||
export http_proxy="http://192.168.110.1:3142"
|
||||
pack_vmfull=(live cli disk net firmware xfce4 cinnamon dm-common gui vm)
|
||||
|
||||
_usage()
|
||||
{
|
||||
cat <<EOF
|
||||
-t Specifie type in list: $(printf "\e[96m${type_list[*]}\e[0m\n")
|
||||
-v Specifie Debian codename
|
||||
EOF
|
||||
}
|
||||
|
||||
if [ -z "$1" ]
|
||||
then
|
||||
_usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#export http_proxy="http://192.168.110.1:3142"
|
||||
|
||||
KERNEL_PARAM="boot=live components lang=fr_FR.UTF-8 locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-model=pc105 timezone=Europe/Paris utc=yes"
|
||||
|
||||
_config()
|
||||
{
|
||||
@ -61,7 +65,7 @@ _config()
|
||||
#--apt-http-proxy "http://192.168.110.1:3142" \
|
||||
lb config noauto \
|
||||
--architectures amd64 \
|
||||
--distribution bullseye \
|
||||
--distribution $debian_version \
|
||||
--binary-images iso-hybrid \
|
||||
--archive-areas "main contrib non-free" \
|
||||
--debian-installer none \
|
||||
@ -157,42 +161,13 @@ _delete()
|
||||
rm -r $build
|
||||
}
|
||||
|
||||
while getopts "fxcv" OPTION; do
|
||||
while getopts "t:v:" OPTION; do
|
||||
case $OPTION in
|
||||
f)
|
||||
type="full"
|
||||
printf "\e[96mMake $type\e[0m\n"
|
||||
_config
|
||||
_build
|
||||
_create_squashfs
|
||||
_delete
|
||||
;;
|
||||
x)
|
||||
type="xfce"
|
||||
printf "\e[96mMake $type\e[0m\n"
|
||||
_config
|
||||
_build
|
||||
mkdir -p $build/chroot/etc/skel/.ssh
|
||||
cp /home/lionel/.ssh/{config,key_rsa_majalis,key_rsa_majalis.pub} $build/chroot/etc/skel/.ssh
|
||||
sudo -u $SUDO_USER ssh-keygen -H -F netdldata.net > $build/chroot/etc/skel/.ssh/known_hosts
|
||||
_create_squashfs
|
||||
_delete
|
||||
t)
|
||||
type=${OPTARG}
|
||||
;;
|
||||
v)
|
||||
type="vmxfce"
|
||||
printf "\e[96mMake $type\e[0m\n"
|
||||
_config
|
||||
_build
|
||||
_create_iso
|
||||
_delete
|
||||
;;
|
||||
c)
|
||||
type="cinnamon"
|
||||
printf "\e[96mMake $type\e[0m\n"
|
||||
_config
|
||||
_build
|
||||
_create_iso
|
||||
_delete
|
||||
debian_version=${OPTARG}
|
||||
;;
|
||||
*)
|
||||
_usage
|
||||
@ -201,7 +176,61 @@ while getopts "fxcv" OPTION; do
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -z "$type" ]
|
||||
if ! [[ "${type_list[*]}" =~ "$type" ]]
|
||||
then
|
||||
printf "Cannot proceed \e[96m$type\e[0m\n\n"
|
||||
_usage
|
||||
exit
|
||||
fi
|
||||
|
||||
printf "\e[96mMake $type\e[0m\n"
|
||||
printf "\e[96mDebian version of live system: $debian_version\e[0m\n"
|
||||
|
||||
read -p "Continue ? " -n 1 -r
|
||||
echo
|
||||
if ! [[ $REPLY =~ ^[YyOo]$ ]]
|
||||
then
|
||||
echo "Cancel"
|
||||
exit
|
||||
fi
|
||||
|
||||
case $type in
|
||||
"full")
|
||||
_config
|
||||
_build
|
||||
_create_squashfs
|
||||
_delete
|
||||
;;
|
||||
"xfce")
|
||||
_config
|
||||
_build
|
||||
mkdir -p $build/chroot/etc/skel/.ssh
|
||||
cp -v /home/lionel/.ssh/{config,key_rsa_majalis,key_rsa_majalis.pub} $build/chroot/etc/skel/.ssh
|
||||
sudo -u $SUDO_USER ssh-keygen -H -F netdldata.net > $build/chroot/etc/skel/.ssh/known_hosts
|
||||
_create_squashfs
|
||||
_delete
|
||||
;;
|
||||
"vmxfce")
|
||||
_config
|
||||
_build
|
||||
_create_iso
|
||||
_delete
|
||||
;;
|
||||
"vmfull")
|
||||
_config
|
||||
_build
|
||||
_create_iso
|
||||
_delete
|
||||
;;
|
||||
"cinnamon")
|
||||
_config
|
||||
_build
|
||||
_create_iso
|
||||
_delete
|
||||
;;
|
||||
*)
|
||||
_usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user