NTP enhacements

  • The NTP enhacements from here were pulled in the v2.2, and they also work fine on v2.1-RELEASE.

    Do we need to send in pull requests again for v2.1.1, or can the devs apply those on Github directly from what's been pulled on the orther branch?

  • Rebel Alliance Developer Netgate

    As it's a new feature, it is not eligible to be pulled into 2.1.x.

    If you maintain a patch that applies cleanly, others can apply it manually using the system patches package.

  • How to do that?

  • Rebel Alliance Developer Netgate

    If you prepare it like a pull request, github will make a patch for you:


    There are also other ways, such as doing a diff between the standard repo and the repo with your changes. It's a bit off topic for this board though.

  • OK thanks. That requires me to learn more about GIT. So far I dealt all my git things over the GitHub's web interface, but that only allows changing one file per fork.

  • Huh! I've create many pull requests at Github that change more than one file.

  • Using GitHub entirely on-line, when you edit a file you have to press "Commit" (there is no "Save" button). So you get a commit for every edit. But you can do multiple commits for the same file, or different files. Then you do 1 pull request when you are ready.
    When the devs accept your pull request, it does show on the main pfSense repo as multiple commits - but you do only need to work in 1 fork and make 1 pull request.

  • Ah… Does anybody use it that way??? It is far easier to create a local copy of a fork, do all your editing using a local editor, then do a commit of those changes to the local copy, then sync, then create a pull request for that commit. The only part not done with Github online is the editing.

  • Ah… Does anybody use it that way???

    I end up using different computers here and there, so a local copy of the forked repo would be a pest. For changing just a couple of files, I copy them manually from the "raw" github view, edit in Notepad++ (saving them in my DropBox) and paste them back into the GitHub online editor when done.
    I suppose I could put the local copy of the fork into DropBox and edit there - that would let me use it from multiple computers. I hadn't thought of doing that.
    Hmmm - rather drifted off the topic of this thread - sorry.

Log in to reply