Skip to content
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

Windows installation with puavo-install #756

Open
wants to merge 15 commits into
base: puavo-reset-windows-prepare-for-installation-use
Choose a base branch
from
Open

Windows installation with puavo-install #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e639f59
New script: puavo-get-disk-of-filepath
tuomasjjrasanen Jan 10, 2025
d9c3508
puavo-reset-windows: add install-boot-dir mode
tuomasjjrasanen Dec 6, 2024
f51f127
puavo-reset-windows: add install-c-partition mode
tuomasjjrasanen Oct 30, 2024
0db18b7
puavo-reset-windows: add install-re-partition mode
tuomasjjrasanen Jan 11, 2025
7149632
puavo-manage-efi: [refactor] rename g_umount_on_exit => g_esp_mount_path
tuomasjjrasanen Nov 16, 2024
8272f02
puavo-manage-efi: add support for installing Windows boot manager
tuomasjjrasanen Dec 6, 2024
b01bd4d
puavo-manage-efi: require excplicit disk devpath as arg
tuomasjjrasanen Jan 10, 2025
0277344
puavo-setup-filesystems: add support for Windows partitioning
tuomasjjrasanen Sep 11, 2024
435a7d2
puavo-install: add create-bcd library script
tuomasjjrasanen Oct 20, 2024
35d76d8
puavo-install: install Windows if there's a Windows filesystem
tuomasjjrasanen Oct 9, 2024
5c12b67
puavo-install: install Windows Recovery Environment when installing W…
tuomasjjrasanen Jan 11, 2025
2b953a1
puavo-install: improve logging
tuomasjjrasanen Jan 10, 2025
16b5a48
[testing]: hard-coded wim.json path for locally modified wim.json
tuomasjjrasanen Jan 10, 2025
a05e0ab
puavo-manage-efi: create Windows boot entry only if one does not alre…
tuomasjjrasanen Jan 16, 2025
9fcc08f
puavo-manage-efi: improve logging
tuomasjjrasanen Jan 16, 2025
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
2 changes: 2 additions & 0 deletions debs/puavo-os/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,14 @@ Depends: ${misc:Depends},
pv,
python3,
python3-dbus,
python3-hivex,
python3-notify2,
rdiff,
ruby-dbus,
ruby-highline,
secure-delete,
sudo,
util-linux,
wget
Description: Bits and pieces needed inside the LTSP chroot image.
Bits and pieces needed inside the LTSP chroot image.
Expand Down
11 changes: 9 additions & 2 deletions parts/core/puavo-conf/scripts/setup_grub_environment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,19 @@ setup_timeout() {
}

setup_windows_enabled() {
local grubdisk

grubdisk=$(puavo-get-disk-of-filepath /images) || {
echo 'ERROR: failed to get disk of images' >&2
return 1
}

if [ "$(puavo-conf puavo.grub.windows.enabled)" = 'true' ]; then
puavo-manage-efi --no-efi-is-ok enable-windows || return 1
puavo-manage-efi --no-efi-is-ok enable-windows "${grubdisk}" || return 1
grubedit set "puavo_grub_windows_enabled=true" || return 1
else
grubedit unset puavo_grub_windows_enabled || return 1
puavo-manage-efi --no-efi-is-ok disable-windows || return 1
puavo-manage-efi --no-efi-is-ok disable-windows "${grubdisk}" || return 1
fi

return 0
Expand Down
5 changes: 5 additions & 0 deletions parts/ltsp/puavo-install/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ install : installdirs
puavo-client-daemon \
puavo-disk-clone \
puavo-disk-erase \
puavo-get-disk-of-filepath \
puavo-install \
puavo-install-and-update-ltspimages \
puavo-install-grub \
Expand All @@ -51,7 +52,11 @@ install : installdirs
$(INSTALL_DATA) -t $(DESTDIR)$(datarootdir)/dbus-1/system-services \
dbus-1/org.puavo.client.Daemon.service

$(INSTALL_DATA) -t $(DESTDIR)$(libdir)/puavo-ltsp-install \
lib/minimal-bcd

$(INSTALL_PROGRAM) -t $(DESTDIR)$(libdir)/puavo-ltsp-install \
lib/create-bcd \
lib/is-update-available \
lib/ls-old-images-and-rdiffs \
lib/puavo-image-preinst \
Expand Down
Loading