Skip to content

Harden installer disk target validation and live-media exclusion #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+55 −15
Open

Harden installer disk target validation and live-media exclusion #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6fcf13
Initial plan
Copilot May 31, 2026
77c73be
fix installer disk validation from PR review comments
Copilot May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 55 additions & 15 deletions scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,19 @@ parse_args() {
echo -e " Run ${CYAN}sudo bash install.sh --help${NC} for usage."
exit 1
fi
if [[ "$(lsblk -ndo TYPE "$2" 2>/dev/null)" != "disk" ]]; then
echo -e "${RED}[ERROR]${NC} '$2' must be a whole-disk device (e.g. /dev/sda, /dev/nvme0n1)."
echo -e " Available disks:"
lsblk -dno NAME,SIZE,MODEL | grep -vE "^(loop|sr|rom|fd|zram)" | \
awk '{printf " /dev/%-10s %s\n", $1, $2}'
echo -e " Run ${CYAN}sudo bash install.sh --help${NC} for usage."
exit 1
fi
if is_live_boot_disk "$2"; then
echo -e "${RED}[ERROR]${NC} '$2' is the live boot medium. You cannot install to it."
echo -e " Select a different disk."
exit 1
fi
DISK="$2"
shift 2
;;
Expand Down Expand Up @@ -274,6 +287,32 @@ show_overall_progress() {
echo -e "${NC} ${BOLD}${percent}%${NC}"
}

# Detect whether a disk is the currently booted live medium
is_live_boot_disk() {
local dev="$1"
local dev_basename
dev_basename=$(basename "$dev")

if findmnt -n -o SOURCE /run/archiso/bootmnt 2>/dev/null | grep -q "$dev_basename"; then
return 0
fi

if lsblk -no LABEL "$dev" 2>/dev/null | awk 'NF {print toupper($0)}' | grep -qE '^(ARCHISO|CVH_LINUX_|CODEVERSE_)'; then
return 0
fi

return 1
}

get_installable_disks() {
local disk
for disk in $(lsblk -dno NAME | grep -vE "^(loop|sr|rom|fd|zram)"); do
if ! is_live_boot_disk "/dev/$disk"; then
echo "$disk"
fi
done
}

# Check if running as root
check_root() {
if [[ $EUID -ne 0 ]]; then
Expand Down Expand Up @@ -459,27 +498,28 @@ select_disk() {
return
fi

echo " Available disks:"
echo
# Filter and display disks with nice formatting
local i=1
while IFS= read -r line; do
local name=$(echo "$line" | awk '{print $1}')
local size=$(echo "$line" | awk '{print $2}')
local model=$(echo "$line" | awk '{$1=$2=""; print $0}' | xargs)
printf " ${BOLD}%d)${NC} /dev/%-8s ${CYAN}%8s${NC} %s\n" "$i" "$name" "$size" "$model"
((i++))
done < <(lsblk -dno NAME,SIZE,MODEL | grep -vE "^(loop|sr|rom|fd|zram)")
echo

# Get list of disks
local disks=($(lsblk -dno NAME | grep -vE "^(loop|sr|rom|fd|zram)"))
local disks=()
while IFS= read -r disk; do
[[ -n "$disk" ]] && disks+=("$disk")
done < <(get_installable_disks)

if [[ ${#disks[@]} -eq 0 ]]; then
log_error "No suitable disks found!"
exit 1
fi

echo " Available disks:"
echo
local i=1
for disk in "${disks[@]}"; do
local size model
size=$(lsblk -dno SIZE "/dev/$disk" 2>/dev/null | xargs)
model=$(lsblk -dno MODEL "/dev/$disk" 2>/dev/null | xargs)
printf " ${BOLD}%d)${NC} /dev/%-8s ${CYAN}%8s${NC} %s\n" "$i" "$disk" "${size:-??}" "$model"
((i++))
done
echo

read -r -p " Enter disk number: " disk_num

if [[ ! "$disk_num" =~ ^[0-9]+$ ]] || [[ $disk_num -lt 1 ]] || [[ $disk_num -gt ${#disks[@]} ]]; then
Expand Down