ereuse/workbench-script
8
0
Fork 0
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Pxe: miscellaneous changes #9

Open
rskthomas wants to merge 9 commits from bugfix/nfs into main
pull from: bugfix/nfs
merge into: ereuse:main
Conversation 0 Commits 9 Files changed 6 +102 -38
rskthomas commented 2024-12-11 16:10:16 +00:00
Owner
Copy link

Small changes like:

  • A color revamp of the pxe boot menu
  • some obscure dependency only needed when installing the pxe server from an unsigned os
  • a dockerfile for running deploy-workbench.sh, which I did back when I was running opensuse
  • a Makefile method for deleting pxe config/folders/libraries
Small changes like: - A color revamp of the pxe boot menu - some obscure dependency only needed when installing the pxe server from an unsigned os - a dockerfile for running deploy-workbench.sh, which I did back when I was running opensuse - a Makefile method for deleting pxe config/folders/libraries
rskthomas added 5 commits 2024-12-11 16:10:16 +00:00
pedro force-pushed bugfix/nfs from 2a0d5db355 to fde7173ea5 2024-12-11 18:50:30 +00:00 Compare
pedro added 1 commit 2024-12-12 00:33:40 +00:00 
remove install deps in deploy script, centralize them
pedro added 1 commit 2024-12-12 00:38:39 +00:00
This pull request has changes conflicting with the target branch.
  • install-dependencies.sh
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin bugfix/nfs:bugfix/nfs
git checkout bugfix/nfs

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff bugfix/nfs
git checkout main
git merge --ff-only bugfix/nfs
git checkout bugfix/nfs
git rebase main
git checkout main
git merge --no-ff bugfix/nfs
git checkout main
git merge --squash bugfix/nfs
git checkout main
git merge --ff-only bugfix/nfs
git checkout main
git merge bugfix/nfs
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ereuse/workbench-script#9
No description provided.
Delete branch "bugfix/nfs"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?