Skip to content

Commit ac49a44

Browse files
committed
WiP
Signed-off-by: Mateusz Maciejewski <[email protected]>
1 parent bbaea6b commit ac49a44

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

dasharo-compatibility/os-bsd-anysense.robot

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Library OperatingSystem
44
Library Process
55
Library String
66
Library Telnet timeout=20 seconds connection_timeout=120 seconds
7+
Library Dialogs
78

89
Resource ../variables.robot
910
Resource ../keywords.robot
@@ -49,6 +50,8 @@ PFS001.001 pfSense stable (serial output) installation on Hard Disk
4950
[Documentation]
5051
Power On
5152
Boot pfSense Installer
53+
# Enter pfSense Rescue Shell
54+
Install psSense On Sata Drive
5255

5356
PFS001.002 Boot pfSense stable (serial output) from Hard Disk
5457
[Documentation]
@@ -60,13 +63,34 @@ PFS001.002 Boot pfSense stable (serial output) from Hard Disk
6063
#
6164

6265
Boot pfSense Installer
63-
[Documentation] PFEFI -> /EFI/BOOT/bootx64.efi
66+
[Documentation] Run /EFI/BOOT/bootx64.efi file from PFEFI-labeled partition;
67+
... Select console type vt100 and accept the license
6468
Enter Boot From File
6569
Enter Volume In File Explorer PFEFI
6670
Execute File In File Explorer EFI
6771
Execute File In File Explorer BOOT
6872
Execute File In File Explorer bootx64.efi
6973
Read From Terminal Until Console type [vt100]:
74+
Write Into Terminal vt100
75+
Read From Terminal Until [Accept]
76+
Press Enter
77+
78+
Enter pfSense Rescue Shell
79+
${menu}= Read From Terminal Until OK
80+
# end would be 5 but it's 3 due to two empty lines
81+
${construction}= Parse Menu Snapshot Into Construction ${menu} 5 3
82+
Enter Submenu From Snapshot ${construction} Rescue Shell${SPACE * 8}Launch a shell for rescue operations
83+
Write Into Terminal root
84+
Write Into Terminal root
85+
86+
Install psSense On Sata Drive
87+
${welcome_menu}= Read From Terminal Until OK
88+
# end would be 5 but it's 3 due to two empty lines
89+
${welcome_construction}= Parse Menu Snapshot Into Construction ${welcome_menu} 5 3
90+
Enter Submenu From Snapshot ${welcome_construction} Install${SPACE * 13}Install pfSense
91+
${partition_construction}= Get Submenu Construction OK 5 3
92+
Enter Submenu From Snapshot ${partition_construction} Auto (ZFS)${SPACE * 2}Guided Root-on-ZFS
93+
${pool_suspect}= Read From Terminal Until <${SPACE * 2}O
7094

7195
Boot pf Sense
7296
[Documentation] PFBOOT -> /efi/freebsd/loader.efi
@@ -76,5 +100,5 @@ Boot pf Sense
76100
Execute File In File Explorer freebsd
77101
Execute File In File Explorer loader.efi
78102
Read From Terminal Until Enter an option:
79-
Write Into Terminal 8
103+
Write Into Terminal 8
80104
Read From Terminal Until ${PFSENSE_PROMPT}

lib/bios/menus.robot

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,12 @@ Parse Menu Snapshot Into Construction
306306
@{construction}= Create List
307307
FOR ${line} IN @{menu_lines}
308308
# Replace multiple spaces with a single one
309-
${line}= Replace String Using Regexp ${line} ${SPACE}+ ${SPACE}
309+
#${line}= Replace String Using Regexp ${line} ${SPACE}+ ${SPACE}
310310
# Remove leading and trailing spaces
311311
${line}= Strip String ${line}
312+
# Remove FreeBSD installer frames, this affect slicing process due to removing empty lines
313+
#${line}= Remove String ${line} x x
314+
${line}= Remove String Using Regexp ${line} (x x)
312315
# Drop leading and trailing pipes (e.g. in One Time Boot Menu)
313316
${line}= Strip String ${line} characters=|
314317
# Remove leading and trailing spaces

0 commit comments

Comments
 (0)