infong/debi
1
0
Fork 0
mirror of https://github.com/bohanyang/debi.git synced 2026-09-27 06:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Bohan Yang
2021-01-15 05:41:47 +00:00
committed by GitHub
parent e8e93767a9
commit f04c54e06e
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debi.sh
+15 -15
View File
@@ -220,7 +220,7 @@ while [ $# -gt 0 ]; do
upgrade=full-upgrade upgrade=full-upgrade
;; ;;
--eth) --eth)
kernel_params=' net.ifnames=0 biosdevname=0' kernel_params="$kernel_params net.ifnames=0 biosdevname=0"
;; ;;
--bbr) --bbr)
bbr=true bbr=true
@@ -270,9 +270,9 @@ save_preseed='cat'
if [ "$dry_run" = false ]; then if [ "$dry_run" = false ]; then
[ "$(id -u)" -ne 0 ] && err 'root privilege is required' [ "$(id -u)" -ne 0 ] && err 'root privilege is required'
rm -rf "$installer_directory" rm -rf "$installer_directory"
mkdir -p "$installer_directory/initrd" mkdir -p "$installer_directory"
cd "$installer_directory" cd "$installer_directory"
save_preseed='tee -a initrd/preseed.cfg' save_preseed='tee -a preseed.cfg'
fi fi
$save_preseed << 'EOF' $save_preseed << 'EOF'
@@ -355,7 +355,7 @@ if [ "$account_setup" = true ]; then
password_hash= password_hash=
if command_exists mkpasswd; then if command_exists mkpasswd; then
password_hash=$(mkpasswd -m sha-512 "$password") password_hash=$(mkpasswd -m sha-512 "$password")
elif command_exists busybox && busybox mkpasswd --help >/dev/null 2>&1; then elif command_exists busybox && busybox mkpasswd --help > /dev/null 2>&1; then
password_hash=$(busybox mkpasswd -m sha512 "$password") password_hash=$(busybox mkpasswd -m sha512 "$password")
elif command_exists python3; then elif command_exists python3; then
password_hash=$(python3 -c 'import crypt, sys; print(crypt.crypt(sys.argv[1], crypt.mksalt(crypt.METHOD_SHA512)))' "$password") password_hash=$(python3 -c 'import crypt, sys; print(crypt.crypt(sys.argv[1], crypt.mksalt(crypt.METHOD_SHA512)))' "$password")
@@ -560,22 +560,19 @@ if [ "$dry_run" = false ]; then
wget "$base_url/linux" "$base_url/initrd.gz" wget "$base_url/linux" "$base_url/initrd.gz"
[ "$firmware" = true ] && wget "$firmware_url" [ "$firmware" = true ] && wget "$firmware_url"
elif command_exists curl; then elif command_exists curl; then
curl -f -L -O "$base_url/linux" -O "$base_url/initrd.gz" curl -fLO "$base_url/linux" -O "$base_url/initrd.gz"
[ "$firmware" = true ] && curl -f -L -O "$firmware_url" [ "$firmware" = true ] && curl -fLO "$firmware_url"
elif command_exists busybox && busybox wget --help >/dev/null 2>&1; then elif command_exists busybox && busybox wget --help > /dev/null 2>&1; then
busybox wget "$base_url/linux" "$base_url/initrd.gz" busybox wget "$base_url/linux" "$base_url/initrd.gz"
[ "$firmware" = true ] && busybox wget "$firmware_url" [ "$firmware" = true ] && busybox wget "$firmware_url"
else else
err 'Could not find "wget" or "curl" or "busybox wget" command to download files' err 'Could not find "wget" or "curl" or "busybox wget" command to download files'
fi fi
cd initrd gzip -d initrd.gz
# cpio reads a list of file names from the standard input
gzip -d -c ../initrd.gz | cpio -i -d --no-absolute-filenames echo preseed.cfg | cpio -o -H newc -A -F initrd
[ "$firmware" = true ] && gzip -d -c ../firmware.cpio.gz | cpio -i -d --no-absolute-filenames gzip -9 initrd
find . | cpio -o -H newc | gzip -9 > ../initrd.gz
cd ..
mkdir -p /etc/default/grub.d mkdir -p /etc/default/grub.d
tee /etc/default/grub.d/zz-debi.cfg 1>&2 << EOF tee /etc/default/grub.d/zz-debi.cfg 1>&2 << EOF
@@ -609,12 +606,15 @@ installer_directory="$boot_directory$installer"
mem=$(grep ^MemTotal: /proc/meminfo | { read -r x y z; echo "$y"; }) mem=$(grep ^MemTotal: /proc/meminfo | { read -r x y z; echo "$y"; })
[ $((mem / 1024)) -lt 483 ] && kernel_params="$kernel_params lowmem/low=" [ $((mem / 1024)) -lt 483 ] && kernel_params="$kernel_params lowmem/low="
initrd="$installer_directory/initrd.gz"
[ "$firmware" = true ] && initrd="$initrd $installer_directory/firmware.cpio.gz"
$save_grub_cfg 1>&2 << EOF $save_grub_cfg 1>&2 << EOF
menuentry 'Debian Installer' --id debi { menuentry 'Debian Installer' --id debi {
insmod part_msdos insmod part_msdos
insmod part_gpt insmod part_gpt
insmod ext2 insmod ext2
linux $installer_directory/linux$kernel_params linux $installer_directory/linux$kernel_params
initrd $installer_directory/initrd.gz initrd $initrd
} }
EOF EOF