diff --git a/deskbar/src/deskbar.c b/deskbar/src/deskbar.c index 0da5c48..61df494 100644 --- a/deskbar/src/deskbar.c +++ b/deskbar/src/deskbar.c @@ -572,7 +572,7 @@ static const char *S1_CMD[] = { #define NS1 5 static const MI MENU[] = { - { "Install OrionOS...", "alacritty -e bash -c 'sudo skyinstall; exec bash' &", 0, 0,-1 }, + { "Install OrionOS...", "alacritty -e bash -c 'sudo orioninstall-gui 2>/dev/null || sudo orioninstall; exec bash' &", 0, 0,-1 }, { NULL, NULL, 1, 0,-1 }, { "Applications", NULL, 0, 1, 0 }, { "Settings", NULL, 0, 1, 1 }, diff --git a/installer/orioninstall b/installer/orioninstall index 27d6c97..7b36793 100644 --- a/installer/orioninstall +++ b/installer/orioninstall @@ -141,7 +141,7 @@ ok "Partitioned." progress 10 "Formatting partitions…" info "Formatting..." if [[ "$BOOT_MODE" == "uefi" ]]; then - mkfs.fat -F32 -n SKYEFI "$EFI_PART" + mkfs.fat -F32 -n ORIONEFI "$EFI_PART" ok "EFI: FAT32 ($EFI_PART)" fi mkfs.ext4 -L OrionOS "$ROOT_PART" @@ -160,9 +160,28 @@ ok "Mounted." # ── 4. Copy live system ─────────────────────────────────────────────── progress 18 "Copying live system (this takes a few minutes)…" info "Copying live system to disk..." -rsync -ax \ - --exclude={/proc,/sys,/dev,/run,/mnt,/media,/tmp,/lost+found} \ - / /mnt/ + +# On archiso live systems the squashfs is already mounted at +# /run/archiso/airootfs. Copy from there: it's the clean base system +# (no live-session overlay junk) and it's much faster and more reliable +# than rsyncing the overlayfs root. +SFS_ROOT="/run/archiso/airootfs" +if [[ -d "$SFS_ROOT" ]] && [[ -f "$SFS_ROOT/etc/os-release" ]]; then + info "Copying from squashfs mount at $SFS_ROOT..." + rsync -axHAXS "$SFS_ROOT/" /mnt/ +else + info "Squashfs not found; falling back to live root copy..." + rsync -axHAXS \ + --exclude=/proc/ \ + --exclude=/sys/ \ + --exclude=/dev/ \ + --exclude=/run/ \ + --exclude=/mnt/ \ + --exclude=/media/ \ + --exclude=/tmp/ \ + --exclude=/lost+found \ + / /mnt/ +fi ok "Files copied." # ── 5. fstab ───────────────────────────────────────────────────────── diff --git a/wm/src/menu.c b/wm/src/menu.c index 6066907..080f17f 100644 --- a/wm/src/menu.c +++ b/wm/src/menu.c @@ -18,6 +18,7 @@ static const MenuItem MENU_ITEMS[] = { { "Display Settings", "arandr &" }, { "──────────────────", NULL }, { "Change Wallpaper", "orionwallpaper --reset &" }, + { "Install OrionOS", "alacritty -e bash -c 'sudo orioninstall-gui 2>/dev/null || sudo orioninstall; exec bash' &" }, { "──────────────────", NULL }, { "Restart OrionWM", "pkill orionwm; sleep 0.2; orionwm &" }, { "Quit OrionOS", "pkill orionwm" },