diff -Nru boot-repair-4ppa196/debian/changelog boot-repair-4ppa200/debian/changelog --- boot-repair-4ppa196/debian/changelog 2022-02-24 20:55:00.000000000 +0000 +++ boot-repair-4ppa200/debian/changelog 2022-03-06 21:55:00.000000000 +0000 @@ -1,3 +1,30 @@ +boot-repair (4ppa200) focal; urgency=low + + * hide the redundant Advices in log + * add ${CHROOTCMD}modprobe efivars + + -- Yann MRN 6 Mar 2022 23:55:00 +0200 + +boot-repair (4ppa199) focal; urgency=low + + * show only once the errors on mount -r + * display free space only when > 10MiB + + -- Yann MRN 28 Feb 2022 23:55:00 +0200 + +boot-repair (4ppa198) focal; urgency=low + + * fix secure boot display + + -- Yann MRN 27 Feb 2022 23:55:00 +0200 + +boot-repair (4ppa197) focal; urgency=low + + * strenghten secure boot detection via mokutil + * added BIOS version + + -- Yann MRN 27 Feb 2022 22:55:00 +0200 + boot-repair (4ppa196) focal; urgency=low * block repair if zfsutils older than version 2.x diff -Nru boot-repair-4ppa196/debian/control boot-repair-4ppa200/debian/control --- boot-repair-4ppa196/debian/control 2022-02-24 16:46:41.000000000 +0000 +++ boot-repair-4ppa200/debian/control 2022-03-06 21:55:00.000000000 +0000 @@ -17,7 +17,7 @@ Package: boot-repair Architecture: all Depends: - boot-sav (>=4ppa196), + boot-sav (>=4ppa200), ${misc:Depends} Recommends: ntfsprogs | ntfs-3g (>=1:2011.4.12AR.4), @@ -37,7 +37,7 @@ Package: os-uninstaller Architecture: all Depends: - boot-sav (>=4ppa196), + boot-sav (>=4ppa200), ${misc:Depends} Homepage: https://launchpad.net/os-uninstaller Description: Operating System Uninstaller @@ -55,7 +55,7 @@ Package: boot-info Architecture: all Depends: - boot-sav (>=4ppa196), + boot-sav (>=4ppa200), ${misc:Depends} Homepage: https://launchpad.net/boot-info Description: Diagnose the boot of the computer @@ -91,6 +91,7 @@ efibootmgr, lshw, gdisk, + mokutil, os-prober, pastebinit, syslinux-common | syslinux | mbr, diff -Nru boot-repair-4ppa196/usr/share/boot-sav/b-i-s-functions.sh boot-repair-4ppa200/usr/share/boot-sav/b-i-s-functions.sh --- boot-repair-4ppa196/usr/share/boot-sav/b-i-s-functions.sh 2022-02-01 21:31:40.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/b-i-s-functions.sh 2022-03-01 01:16:52.000000000 +0000 @@ -2251,7 +2251,7 @@ if [[ -d "$temp" ]];then title_gen "${name}: ls -l /etc/grub.d/ $FILTERED" >> "${Log1}" if [[ "$FILTERED" ]];then - ls -l "$temp" | grep -v README | grep -v total | grep -v 00_header | grep -v 05_debian | grep -v 20_memtest >> "${Log1}" + LANG=C ls -l "$temp" | grep -v README | grep -v total | grep -v 00_header | grep -v 05_debian | grep -v 20_memtest >> "${Log1}" for temp3 in $(ls $temp);do if [[ "$(echo $temp3 | grep -v README | grep -v 00_header | grep -v 05_debian | grep -v 10_linux | \ grep -v 20_linux | grep -v memtest | grep -v 30_os-prober | grep -v 30_uefi-firmware)" ]] \ @@ -2264,7 +2264,7 @@ fi done else - ls -l "$temp" >> "${Log1}" + LANG=C ls -l "$temp" >> "${Log1}" for temp3 in $(ls $temp);do if [[ -f "$temp$temp3" ]];then title_gen "${name}/etc/grub.d/$temp3" >> "${Log1}" diff -Nru boot-repair-4ppa196/usr/share/boot-sav/b-i-s.sh boot-repair-4ppa200/usr/share/boot-sav/b-i-s.sh --- boot-repair-4ppa196/usr/share/boot-sav/b-i-s.sh 2022-01-26 17:55:02.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/b-i-s.sh 2022-03-01 01:16:50.000000000 +0000 @@ -732,16 +732,21 @@ fi [[ "$DEBBUG" ]] && echo "[debug] print free space" -printf "\nFree space $FILTERED: _________________________________________________________\n\n" >> "${Log}" +t="\nFree space $([ "$FILTERED" ] && echo ">10MiB"): ______________________________________________________________\n\n" +printfreespace="" for drivez in ${All_Hard_Drives} ; do if [[ "$FILTERED" ]];then while read line; do - [[ "$line" =~ /dev/ ]] || [[ "$line" =~ ':free;' ]] && echo "$line" | sed 's|/dev/||g' >> "${Log}" - done < <(LANGUAGE=C LC_ALL=C sudo parted $drivez -ms unit MiB print free 2>/dev/null ) + line="${line%:free*}"; a=${line##*MiB:}; a=${a%.*} + [ "${a#[0-9]}" ] && t="$t${drivez#/dev/*}: ${line#*:}\n" && printfreespace=y + done < <(LANGUAGE=C LC_ALL=C parted $drivez -ms unit MiB print free 2>/dev/null | grep ':free;' ) else - LANGUAGE=C LC_ALL=C sudo parted $drivez -ms unit MiB print free 2>/dev/null >> "${Log}" + printfreespace=y + t="$t$(LANGUAGE=C LC_ALL=C parted $drivez -ms unit MiB print free 2>/dev/null )" fi done +[ "$printfreespace" ] && printf "$t" >> "${Log}" + [[ "$DEBBUG" ]] && echo "[debug] print sgdisk -p" [[ ! "$FILTERED" ]] && printf "\nsgdisk $FILTERED: ______________________________________________________________\n\n" >> "${Log}" @@ -771,7 +776,7 @@ fi [[ "$DEBBUG" ]] && echo "[debug] print df / findmnt" -printf "\nMount points $FILTERED: _________________________________________________________________\n\n" >> "${Log}" +printf "\nMount points $FILTERED: _______________________________________________________\n\n" >> "${Log}" #while read line; do # [[ "$line" ]] && [[ ! "$line" =~ '/dev/loop' ]] && [[ ! "$line" =~ 'tmpfs' ]] && echo "$line" >> "${Log}" #done < <(LANGUAGE=C LC_ALL=C df -Th ) @@ -787,7 +792,7 @@ ## Mount points. ## [[ "$DEBBUG" ]] && echo "[debug] print mount options" -printf "\nMount options $FILTERED: ________________________________________________________________\n\n" >> "${Log}" +printf "\nMount options $FILTERED: ______________________________________________________\n\n" >> "${Log}" if [[ "$FILTERED" ]];then LANGUAGE=C LC_ALL=C findmnt -l -o SOURCE,FSTYPE,OPTIONS | grep / | sed -e '/tmpfs/d' -e '/quashfs/d' | grep -v v/loop | grep -v v/fuse | grep -v v/sr[0-9] | grep -v /cow | sort >> "${Log}" else @@ -798,14 +803,14 @@ if [[ "$DEBBUG" ]];then if [ $(ls -l /dev/disk/by-id 2>> ${Trash} | wc -l) -gt 1 ] ; then title_gen "ls -l /dev/disk/by-id" >> "${Log}"; - ls -l /dev/disk/by-id >> "${Log}"; + LANG=C ls -l /dev/disk/by-id >> "${Log}"; fi fi [[ "$DEBBUG" ]] && echo "[debug] ls mapper" if [ $(ls -R /dev/mapper 2>> ${Trash} | wc -l) -gt 2 ] ; then title_gen "ls -R /dev/mapper/" >> "${Log}"; - ls -R /dev/mapper >> "${Log}"; + LANG=C ls -R /dev/mapper >> "${Log}"; fi diff -Nru boot-repair-4ppa196/usr/share/boot-sav/bs-cmd_terminal.sh boot-repair-4ppa200/usr/share/boot-sav/bs-cmd_terminal.sh --- boot-repair-4ppa196/usr/share/boot-sav/bs-cmd_terminal.sh 2022-02-24 16:40:31.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/bs-cmd_terminal.sh 2022-03-06 21:55:00.000000000 +0000 @@ -149,73 +149,87 @@ ############################# CHECK EFI DMSG AND SECUREBOOT ##################### check_efi_dmesg_and_secureboot() { #http://forum.ubuntu-fr.org/viewtopic.php?id=742721 -local ue="$(dmesg | grep EFI | grep -v Variables )" -SECUREBOOT='maybe enabled' +local ue="$(dmesg | grep EFI | grep -v Variables )" SPECIALSB="" +SECUREBOOT=disabled +EFIDMESG="" +( [[ -f /sys/class/dmi/id/bios_vendor ]] || [[ -f /sys/class/dmi/id/bios_version ]] ) \ +&& EFIDMESG="BIOS/UEFI firmware: $(head -n 1 /sys/class/dmi/id/bios_version 2>/dev/null)$([[ -f /sys/class/dmi/id/bios_release ]] && echo "($(head -n 1 /sys/class/dmi/id/bios_release))") from $(head -n 1 /sys/class/dmi/id/bios_vendor 2>/dev/null) +" if [[ -d /sys/firmware/efi ]];then - EFIDMESG="The firmware is EFI-compatible, and is set in EFI-mode for this $LIVESESSION-session." - [[ ! "$ue" ]] && EFIDMESG="$EFIDMESG No EFI in dmseg." + modprobe efivars #cf geole / ubuntu-fr + EFIDMESG="${EFIDMESG}The firmware is EFI-compatible, and is set in EFI-mode for this $LIVESESSION-session. +" + [[ ! "$ue" ]] && EFIDMESG="${EFIDMESG}No EFI in dmseg. +" #SecureBoot http://launchpadlibrarian.net/119223180/ubiquity_2.12.8_2.12.9.diff.gz #https://fr.opensuse.org/openSUSE:UEFI#Comment_savoir_si_le_Secure_Boot_est_activ.C3.A9 local efi_vars sb_var efi_vars=/sys/firmware/efi/vars sb_var="$efi_vars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c/data" sb_var2="$efi_vars/SecureBoot-a8be4df61-93ca-11d2-aa0d-00e098032b8c/data" - if [[ ! -d $efi_vars ]];then - SECUREBOOT=disabled - elif [[ -e "$sb_var" ]];then + if [[ -e "$sb_var" ]];then #[[ "$(printf %x \'"$(cat "$sb_var")")" = 1 ]] && SECUREBOOT=enabled || SECUREBOOT=disabled #https://stackoverflow.com/questions/46163678/get-rid-of-warning-command-substitution-ignored-null-byte-in-input - [[ "$(printf %x \'"$(tr -d '\0' < "$sb_var")")" = 1 ]] && SECUREBOOT=enabled || SECUREBOOT=disabled + [[ "$(printf %x \'"$(tr -d '\0' < "$sb_var")")" = 1 ]] && SECUREBOOT=enabled elif [[ -e "$sb_var2" ]];then - [[ "$(printf %x \'"$(tr -d '\0' < "$sb_var2")")" = 1 ]] && SECUREBOOT=enabled || SECUREBOOT=disabled + [[ "$(printf %x \'"$(tr -d '\0' < "$sb_var2")")" = 1 ]] && SECUREBOOT=enabled else - [[ -f "$sb_var" ]] || [[ -f "$sb_var2" ]] && EFIDMESG="$EFIDMESG -Warning: sbvar. $PLEASECONTACT" for tst in $(ls $efi_vars );do - if [[ "$tst" =~ "Secure" ]];then + if [[ "$tst" =~ "SecureBoot" ]];then if [ -e "$efi_vars/$tst/data" ];then - [ "$(printf %x \'"$(tr -d '\0' < "$efi_vars/$tst/data")")" = 1 ] && SECUREBOOT=enabled || SECUREBOOT=disabled - EFIDMESG="$EFIDMESG -Found $efi_vars/$tst/data. $PLEASECONTACT" - elif [[ -f "$efi_vars/$tst/data" ]];then - SECUREBOOT=disabled - EFIDMESG="$EFIDMESG -Warning: $tst/data . $PLEASECONTACT" + [ "$(printf %x \'"$(tr -d '\0' < "$efi_vars/$tst/data")")" = 1 ] && SECUREBOOT=enabled && SPECIALSB=yes + EFIDMESG="${EFIDMESG}Found $efi_vars/$tst/data. $PLEASECONTACT +" fi fi done -# a=""; for b in $(ls $efi_vars);do a="$b, $a";done -# EFIDMESG="$EFIDMESG -#ls $efi_vars -#$a" fi - if [[ "$SECUREBOOT" = 'maybe enabled' ]] && [[ "$(grep signed /proc/cmdline)" ]];then - SECUREBOOT=enabled + if [[ "$SECUREBOOT" = disabled ]] && [[ "$(grep signed /proc/cmdline)" ]];then + SPECIALSB=yes a=""; for b in $(ls $efi_vars);do a="$b,$a";done - EFIDMESG="$EFIDMESG -Special SecureBoot - $PLEASECONTACT -ls $efi_vars : $a" + EFIDMESG="${EFIDMESG}Special SecureBoot - $PLEASECONTACT +grep signed /proc/cmdline: $(grep signed /proc/cmdline) +ls $efi_vars : $a +" fi - [[ "$SECUREBOOT" != 'maybe enabled' ]] && EFIDMESG="$EFIDMESG -SecureBoot $SECUREBOOT." + local FUNCTION=SB-detect PACKAGELIST=mokutil FILETOTEST=mokutil + [[ "$SPECIALSB" ]] && [[ ! "$(type -p $FILETOTEST)" ]] && installpackagelist + if [[ "$(type -p mokutil)" ]];then + if [[ "$SECUREBOOT" = disabled ]];then + if [[ "$(mokutil --sb-state 2>&1)" =~ 'Secure Boot is enabled' ]];then + SECUREBOOT="enabled according to mokutil - $PLEASECONTACT" + elif [[ "$(mokutil --sb-state 2>&1)" =~ 'Failed to read' ]] || [[ "$(mokutil --sb-state 2>&1)" =~ 'system doesn' ]];then + SECUREBOOT="disabled - $(mokutil --sb-state 2>&1)" + else + SECUREBOOT="disabled - $(mokutil --sb-state 2>&1) - $PLEASECONTACT" + fi + elif [[ "$SECUREBOOT" = enabled ]] && [[ ! "$(mokutil --sb-state 2>&1)" =~ 'Secure Boot is enabled' ]];then + SECUREBOOT="enabled but mokutil says: $(mokutil --sb-state 2>&1) - $PLEASECONTACT" + fi + fi + EFIDMESG="${EFIDMESG}SecureBoot $SECUREBOOT. +" + local FUNCTION=UEFI PACKAGELIST=efibootmgr FILETOTEST=efibootmgr + [[ ! "$(type -p $FILETOTEST)" ]] && installpackagelist if [[ "$(type -p efibootmgr)" ]];then - EFIDMESG="$EFIDMESG - -$(LANGUAGE=C LC_ALL=C efibootmgr -v)" # | sed 's|\\|\\\\|g' + EFIDMESG="${EFIDMESG}$(LANGUAGE=C LC_ALL=C efibootmgr -v)" # | sed 's|\\|\\\\|g' else - EFIDMESG="$EFIDMESG -Please install package efibootmgr and retry." + EFIDMESG="${EFIDMESG}Please install package efibootmgr and retry." fi else #[[ "$LIVESESSION" = installed ]] && SECUREBOOT=disabled if [[ "$WINEFIFILEPRESENCE" ]];then - EFIDMESG="The firmware is EFI-compatible, but this $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode)." + EFIDMESG="${EFIDMESG}The firmware is EFI-compatible, but this $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode). +" elif [[ "$ue" ]];then - EFIDMESG="The firmware seems EFI-compatible, but this $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode)." + EFIDMESG="${EFIDMESG}The firmware seems EFI-compatible, but this $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode). +" elif [[ "$(lsb_release -is)" = Debian ]];then - EFIDMESG="This $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode). See https://wiki.debian.org/UEFI" + EFIDMESG="${EFIDMESG}This $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode). See https://wiki.debian.org/UEFI +" else - EFIDMESG="This $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode)." + EFIDMESG="${EFIDMESG}This $LIVESESSION-session is in Legacy/BIOS/CSM mode (not in EFI mode). +" fi fi } diff -Nru boot-repair-4ppa196/usr/share/boot-sav/bs-common.sh boot-repair-4ppa200/usr/share/boot-sav/bs-common.sh --- boot-repair-4ppa196/usr/share/boot-sav/bs-common.sh 2022-02-16 10:07:18.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/bs-common.sh 2022-02-28 21:20:54.000000000 +0000 @@ -525,11 +525,12 @@ MOUNTCODE="$?" fi if [[ "$MOUNTCODE" != 0 ]];then - ECHO_LVM_RAID_PREPAR="$ECHO_LVM_RAID_PREPAR + mount -r /dev/${LISTOFPARTITIONS[$i]} "${BLKIDMNT_POINT[$i]}" 2>/dev/null + [[ "$DEBBUG" ]] && ECHO_LVM_RAID_PREPAR="$ECHO_LVM_RAID_PREPAR Error code $MOUNTCODE -mount -r /dev/${LISTOFPARTITIONS[$i]} ${BLKIDMNT_POINT[$i]} $(mount -r /dev/${LISTOFPARTITIONS[$i]} "${BLKIDMNT_POINT[$i]}")" - MOUNTCODE="$?" - if [[ "$MOUNTCODE" != 0 ]];then +mount -r /dev/${LISTOFPARTITIONS[$i]} ${BLKIDMNT_POINT[$i]} $(mount -r /dev/${LISTOFPARTITIONS[$i]} "${BLKIDMNT_POINT[$i]}")" \ + && MOUNTCODE="$?" + if [[ "$DEBBUG" ]] && [[ "$MOUNTCODE" != 0 ]];then ECHO_LVM_RAID_PREPAR="$ECHO_LVM_RAID_PREPAR mount -r /dev/${LISTOFPARTITIONS[$i]} : Error code $MOUNTCODE" [[ "$(echo "$BLKID" | grep ext | grep "${LISTOFPARTITIONS[$i]}:" )" ]] && MOUNTERROR="$MOUNTCODE" #http://ubuntuforums.org/showthread.php?t=2068280 diff -Nru boot-repair-4ppa196/usr/share/boot-sav/gui-actions-grub.sh boot-repair-4ppa200/usr/share/boot-sav/gui-actions-grub.sh --- boot-repair-4ppa196/usr/share/boot-sav/gui-actions-grub.sh 2022-02-21 23:10:42.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/gui-actions-grub.sh 2022-03-06 21:55:00.000000000 +0000 @@ -212,6 +212,7 @@ fi [[ "$GSVERSION" =~ 0 ]] && ATA="" if [[ "$GRUBPACKAGE" =~ efi ]];then + [ -d /sys/firmware/efi ] && echo "${CHROOTCMD}modprobe efivars $(LC_ALL=C ${CHROOTCMD}modprobe efivars)" #cf geole / ubuntu-fr [[ "$GSVERSION" =~ 0 ]] || [[ "$GSVERSION" =~ 1 ]] && [[ ! "$GVERSION" =~ "1.99-21" ]] && [[ "$GRUBPACKAGE" =~ signed ]] \ && echo "GRUB too old for SecureBoot. Defaulting to grub-efi. $PLEASECONTACT" && GRUBPACKAGE=grub-efi echo " @@ -494,9 +495,9 @@ for gg in /usr/sbin/ /usr/bin/ /sbin/ /bin/ /usr/sbin/lib*/*/*/ /usr/bin/lib*/*/*/ /sbin/lib*/*/*/ /bin/lib*/*/*/;do #not sure "type" is available in all distros for gi in grub-install grub2-install grub-install.unsupported;do if [[ -f "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" ]];then - ls -l "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" + LANG=C ls -l "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" chmod a+x "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" - ls -l "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" + LANG=C ls -l "${BLKIDMNT_POINT[$REGRUB_PART]}$gg$gi" fi done done @@ -998,7 +999,6 @@ mount -B /$w "${BLKIDMNT_POINT[$REGRUB_PART]}/$w" done #ubuntuforums.org/showthread.php?t=1965163 fi - [ -d /sys/firmware/efi ] && echo "modprobe efivars $(modprobe efivars)" #cf geole / ubuntu-fr CHROOTCMD="chroot ${BLKIDMNT_POINT[$REGRUB_PART]} " CHROOTUSR="chroot \"${BLKIDMNT_POINT[$REGRUB_PART]}\" " #CHROOTCMD='chroot "${BLKIDMNT_POINT[$REGRUB_PART]}" ' diff -Nru boot-repair-4ppa196/usr/share/boot-sav/gui-actions.sh boot-repair-4ppa200/usr/share/boot-sav/gui-actions.sh --- boot-repair-4ppa196/usr/share/boot-sav/gui-actions.sh 2022-02-16 10:05:18.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/gui-actions.sh 2022-02-25 16:43:34.000000000 +0000 @@ -536,7 +536,7 @@ fi if [[ "$NVRAMLOCKED" ]];then FUNCTION=Locked-NVram; OPTION5=SecureBoot; update_translations - [[ "$SECUREBOOT" = disabled ]] && TEXTEND="$FUNCTION_detected + [[ "${SECUREBOOT%% *}" = disabled ]] && TEXTEND="$FUNCTION_detected " || TEXTEND="$TEXTEND$FUNCTION_detected $Please_disable_OPTION5_in_BIOS $Then_try_again " fi @@ -579,7 +579,7 @@ " fi fi - if [[ "$SECUREBOOT" = enabled ]] && [[ "$QUANTITY_OF_REAL_WINDOWS" != 0 ]] && [[ ! "$GRUBPACKAGE" =~ sign ]] && [[ "$GRUBPACKAGE" =~ efi ]];then + if [[ "${SECUREBOOT%% *}" = enabled ]] && [[ "$QUANTITY_OF_REAL_WINDOWS" != 0 ]] && [[ ! "$GRUBPACKAGE" =~ sign ]] && [[ "$GRUBPACKAGE" =~ efi ]];then OPTION5=SecureBoot; update_translations TEXTEND="$TEXTEND$Please_disable_OPTION5_in_BIOS " diff -Nru boot-repair-4ppa196/usr/share/boot-sav/gui-scan.sh boot-repair-4ppa200/usr/share/boot-sav/gui-scan.sh --- boot-repair-4ppa196/usr/share/boot-sav/gui-scan.sh 2022-02-24 17:11:04.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/gui-scan.sh 2022-02-27 23:30:24.000000000 +0000 @@ -38,7 +38,7 @@ check_part_types $1 #After mount_all_blkid_partitions_except_df & determine_part_uuid & determine_part_with_os check_efi_dmesg_and_secureboot #Ideally after check_efi_parts #[[ "$GUI" ]] && echo "SET@_label0.set_text('''$Scanning_systems. $Please_wait''')" -[[ "$GUI" ]] && echo "SET@_label0.set_text('''$LAB ($([[ -d /sys/firmware/efi ]] && echo "SecureBoot $SECUREBOOT" || echo "BIOS-session" )). $Please_wait''')" +[[ "$GUI" ]] && echo "SET@_label0.set_text('''$LAB ($([[ -d /sys/firmware/efi ]] && echo "SecureBoot ${SECUREBOOT%%ed*}ed" || echo "BIOS-session" )). $Please_wait''')" paragraph_part_info } diff -Nru boot-repair-4ppa196/usr/share/boot-sav/gui-tab-loca.sh boot-repair-4ppa200/usr/share/boot-sav/gui-tab-loca.sh --- boot-repair-4ppa196/usr/share/boot-sav/gui-tab-loca.sh 2022-02-03 21:23:43.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/gui-tab-loca.sh 2022-02-25 16:43:35.000000000 +0000 @@ -208,7 +208,7 @@ set_efi() { GRUBPACKAGE=grub-efi [[ "$GUI" ]] && echo 'SET@_checkbutton_signed.show()' -if [[ "$SECUREBOOT" = enabled ]] && [[ "$ARCHIPC" != 32 ]] ;then #&& [[ "${ARCH_OF_PART[... != 32 ]] -> added as blockers before repair +if [[ "${SECUREBOOT%% *}" != disabled ]] && [[ "$ARCHIPC" != 32 ]] ;then #&& [[ "${ARCH_OF_PART[... != 32 ]] -> added as blockers before repair set_signed [[ "$GUI" ]] && echo 'SET@_checkbutton_signed.set_active(True)' else #there is currently no grub-efi-ia32-signed diff -Nru boot-repair-4ppa196/usr/share/boot-sav/gui-tab-main.sh boot-repair-4ppa200/usr/share/boot-sav/gui-tab-main.sh --- boot-repair-4ppa196/usr/share/boot-sav/gui-tab-main.sh 2022-02-24 20:55:00.000000000 +0000 +++ boot-repair-4ppa200/usr/share/boot-sav/gui-tab-main.sh 2022-03-06 21:55:00.000000000 +0000 @@ -319,7 +319,7 @@ [[ "$GUI" ]] && zenity --width=400 --warning --title="$APPNAME2" --text="$ATEXT" 2>/dev/null [[ "$GUI" ]] && echo 'SET@_mainwindow.show()' elif [[ "$TEXT" ]];then - printf "\nAdvices: _______________________________________________________________________\n" + [[ "$DEBBUG" ]] && printf "\nAdvices: _______________________________________________________________________\n" end_pulse tmanswer=yes if [[ ! "$FORCEYES" ]];then @@ -330,7 +330,7 @@ [[ "$response" =~ y ]] || tmanswer=no fi fi - echo "$TEXT $tmanswer" + [[ "$DEBBUG" ]] && echo "$TEXT $tmanswer" [[ "$tmanswer" = yes ]] && mainapplypulsate || unmount_all_partitions_and_quit_glade else actions @@ -440,7 +440,7 @@ TEXT="$TEXT$You_have_installed_on_PARTITION1_EFI_incompat $You_may_want_install_64os " fi -# if [[ "$SECUREBOOT" = enabled ]] && [[ "$WINEFIFILEPRESENCE" ]];then ## à passer dans le message final ??? +# if [[ "${SECUREBOOT%% *}" = enabled ]] && [[ "$WINEFIFILEPRESENCE" ]];then ## à passer dans le message final ??? # MODE1=Secure; MODE2=non-Secure; update_translations; # TEXT="$TEXT$Boot_is_MODE1_may_need_change_to_MODE2 #"