Page MenuHomeFreeBSD
Differential D43233

bsdinstall: rename "Live CD" to "Live System"
ClosedPublic
Actions

Authored by khorben_defora.org on Dec 29 2023, 6:39 PM.
Tags
None
Referenced Files
Unknown Object (File)
Jan 27 2025, 5:05 PM
Unknown Object (File)
Jan 27 2025, 4:48 PM
Unknown Object (File)
Jan 26 2025, 11:41 PM
Unknown Object (File)
Jan 26 2025, 8:39 PM
Unknown Object (File)
Jan 26 2025, 8:19 PM
Unknown Object (File)
Jan 26 2025, 6:05 PM
Unknown Object (File)
Jan 25 2025, 5:44 PM
Unknown Object (File)
Jan 25 2025, 4:18 PM
View All 62 Files
Subscribers
imp
rwatson

Details

Reviewers
emaste
bapt
jrtc27
Commits
rG66be60537568: bsdinstall: rename "Live CD" to "Live System"
rG19bb1886be4f: bsdinstall: rename "Live CD" to "Live System"
Summary

This uses more generic wording in the FreeBSD installer, when offering the user to use the system booted without running the installer.

The updated wording is also reflected in freebsd-version(1).

Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

khorben_defora.org created this revision.Dec 29 2023, 6:39 PM
Herald added a subscriber: imp. · View Herald TranscriptDec 29 2023, 6:39 PM
khorben_defora.org requested review of this revision.Dec 29 2023, 6:39 PM
emaste accepted this revision.Dec 29 2023, 6:54 PM
This revision is now accepted and ready to land.Dec 29 2023, 6:54 PM
emaste added a comment.Dec 29 2023, 7:04 PM

also update bin/freebsd-version/freebsd-version.1 I think

khorben_defora.org updated this revision to Diff 131982.Dec 29 2023, 7:50 PM
khorben_defora.org edited the summary of this revision. (Show Details)

Also updated bin/freebsd-version/freebsd-version.1.

This revision now requires review to proceed.Dec 29 2023, 7:50 PM
emaste accepted this revision.Dec 29 2023, 7:58 PM
This revision is now accepted and ready to land.Dec 29 2023, 7:58 PM
Closed by commit rG19bb1886be4f: bsdinstall: rename "Live CD" to "Live System" (authored by khorben_defora.org, committed by emaste). · Explain WhyDec 29 2023, 8:25 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG19bb1886be4f: bsdinstall: rename "Live CD" to "Live System".
emaste added a commit: rG66be60537568: bsdinstall: rename "Live CD" to "Live System".Jan 7 2024, 7:31 PM

Revision Contents
Changeset List

PathSize
bin/
freebsd-version/
2 lines
usr.sbin/
bsdinstall/
8 lines

Diff 131983

View Options

bin/freebsd-version/freebsd-version.1

Show First 20 Lines • Show All 4,183 Lines • ▼ Show 20 Lines KASSERT((orient & MAP_STACK_GROWS_DOWN) == 0 ||
(new_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0, (new_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0,
("new entry lacks MAP_ENTRY_GROWS_DOWN")); ("new entry lacks MAP_ENTRY_GROWS_DOWN"));
KASSERT((orient & MAP_STACK_GROWS_UP) == 0 || KASSERT((orient & MAP_STACK_GROWS_UP) == 0 ||
(new_entry->eflags & MAP_ENTRY_GROWS_UP) != 0, (new_entry->eflags & MAP_ENTRY_GROWS_UP) != 0,
("new entry lacks MAP_ENTRY_GROWS_UP")); ("new entry lacks MAP_ENTRY_GROWS_UP"));
rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE,
VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ? VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ?
MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP)); MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP));
if (rv != KERN_SUCCESS) if (rv == KERN_SUCCESS) {
/*
* Gap can never successfully handle a fault, so
* read-ahead logic is never used for it. Re-use
* next_read of the gap entry to store
* stack_guard_page for vm_map_growstack().
*/
if (orient == MAP_STACK_GROWS_DOWN)
new_entry->prev->next_read = sgp;
else
new_entry->next->next_read = sgp;
} else {
(void)vm_map_delete(map, bot, top); (void)vm_map_delete(map, bot, top);
}
return (rv); return (rv);
} }
/* /*
* Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we
* successfully grow the stack. * successfully grow the stack.
*/ */
static int static int
Show All 24 Lines#endif
* resource limits are applied. * resource limits are applied.
*/ */
if (p != initproc && (map != &p->p_vmspace->vm_map || if (p != initproc && (map != &p->p_vmspace->vm_map ||
p->p_textvp == NULL)) p->p_textvp == NULL))
return (KERN_FAILURE); return (KERN_FAILURE);
MPASS(!map->system_map); MPASS(!map->system_map);
guard = stack_guard_page * PAGE_SIZE;
lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK);
stacklim = lim_cur(curthread, RLIMIT_STACK); stacklim = lim_cur(curthread, RLIMIT_STACK);
vmemlim = lim_cur(curthread, RLIMIT_VMEM); vmemlim = lim_cur(curthread, RLIMIT_VMEM);
retry: retry:
/* If addr is not in a hole for a stack grow area, no need to grow. */ /* If addr is not in a hole for a stack grow area, no need to grow. */
if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry))
return (KERN_FAILURE); return (KERN_FAILURE);
if ((gap_entry->eflags & MAP_ENTRY_GUARD) == 0) if ((gap_entry->eflags & MAP_ENTRY_GUARD) == 0)
Show All 10 Lines if ((gap_entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0) {
if ((stack_entry->eflags & MAP_ENTRY_GROWS_UP) == 0 || if ((stack_entry->eflags & MAP_ENTRY_GROWS_UP) == 0 ||
stack_entry->end != gap_entry->start) stack_entry->end != gap_entry->start)
return (KERN_FAILURE); return (KERN_FAILURE);
grow_amount = round_page(addr + 1 - stack_entry->end); grow_amount = round_page(addr + 1 - stack_entry->end);
grow_down = false; grow_down = false;
} else { } else {
return (KERN_FAILURE); return (KERN_FAILURE);
} }
guard = gap_entry->next_read;
max_grow = gap_entry->end - gap_entry->start; max_grow = gap_entry->end - gap_entry->start;
if (guard > max_grow) if (guard > max_grow)
return (KERN_NO_SPACE); return (KERN_NO_SPACE);
max_grow -= guard; max_grow -= guard;
if (grow_amount > max_grow) if (grow_amount > max_grow)
return (KERN_NO_SPACE); return (KERN_NO_SPACE);
/* /*
▲ Show 20 Lines • Show All 642 Lines • Show Last 20 Lines
View Options

usr.sbin/bsdinstall/startbsdinstall

Show First 20 Lines • Show All 4,183 Lines • ▼ Show 20 Lines KASSERT((orient & MAP_STACK_GROWS_DOWN) == 0 ||
(new_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0, (new_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0,
("new entry lacks MAP_ENTRY_GROWS_DOWN")); ("new entry lacks MAP_ENTRY_GROWS_DOWN"));
KASSERT((orient & MAP_STACK_GROWS_UP) == 0 || KASSERT((orient & MAP_STACK_GROWS_UP) == 0 ||
(new_entry->eflags & MAP_ENTRY_GROWS_UP) != 0, (new_entry->eflags & MAP_ENTRY_GROWS_UP) != 0,
("new entry lacks MAP_ENTRY_GROWS_UP")); ("new entry lacks MAP_ENTRY_GROWS_UP"));
rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE,
VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ? VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ?
MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP)); MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP));
if (rv != KERN_SUCCESS) if (rv == KERN_SUCCESS) {
/*
* Gap can never successfully handle a fault, so
* read-ahead logic is never used for it. Re-use
* next_read of the gap entry to store
* stack_guard_page for vm_map_growstack().
*/
if (orient == MAP_STACK_GROWS_DOWN)
new_entry->prev->next_read = sgp;
else
new_entry->next->next_read = sgp;
} else {
(void)vm_map_delete(map, bot, top); (void)vm_map_delete(map, bot, top);
}
return (rv); return (rv);
} }
/* /*
* Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we
* successfully grow the stack. * successfully grow the stack.
*/ */
static int static int
Show All 24 Lines#endif
* resource limits are applied. * resource limits are applied.
*/ */
if (p != initproc && (map != &p->p_vmspace->vm_map || if (p != initproc && (map != &p->p_vmspace->vm_map ||
p->p_textvp == NULL)) p->p_textvp == NULL))
return (KERN_FAILURE); return (KERN_FAILURE);
MPASS(!map->system_map); MPASS(!map->system_map);
guard = stack_guard_page * PAGE_SIZE;
lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK);
stacklim = lim_cur(curthread, RLIMIT_STACK); stacklim = lim_cur(curthread, RLIMIT_STACK);
vmemlim = lim_cur(curthread, RLIMIT_VMEM); vmemlim = lim_cur(curthread, RLIMIT_VMEM);
retry: retry:
/* If addr is not in a hole for a stack grow area, no need to grow. */ /* If addr is not in a hole for a stack grow area, no need to grow. */
if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry))
return (KERN_FAILURE); return (KERN_FAILURE);
if ((gap_entry->eflags & MAP_ENTRY_GUARD) == 0) if ((gap_entry->eflags & MAP_ENTRY_GUARD) == 0)
Show All 10 Lines if ((gap_entry->eflags & MAP_ENTRY_STACK_GAP_DN) != 0) {
if ((stack_entry->eflags & MAP_ENTRY_GROWS_UP) == 0 || if ((stack_entry->eflags & MAP_ENTRY_GROWS_UP) == 0 ||
stack_entry->end != gap_entry->start) stack_entry->end != gap_entry->start)
return (KERN_FAILURE); return (KERN_FAILURE);
grow_amount = round_page(addr + 1 - stack_entry->end); grow_amount = round_page(addr + 1 - stack_entry->end);
grow_down = false; grow_down = false;
} else { } else {
return (KERN_FAILURE); return (KERN_FAILURE);
} }
guard = gap_entry->next_read;
max_grow = gap_entry->end - gap_entry->start; max_grow = gap_entry->end - gap_entry->start;
if (guard > max_grow) if (guard > max_grow)
return (KERN_NO_SPACE); return (KERN_NO_SPACE);
max_grow -= guard; max_grow -= guard;
if (grow_amount > max_grow) if (grow_amount > max_grow)
return (KERN_NO_SPACE); return (KERN_NO_SPACE);
/* /*
▲ Show 20 Lines • Show All 642 Lines • Show Last 20 Lines