I've just borked an installation on a test system. I've borked it due to a lack of understanding. I'm coming from linux. Gentoo to be specific.
After I have:
then I
Then I
And this is where I am failing. specifically on files I've changed that I want to merge. I select "m" from the menu, then I get this "%" prompt, then I press "q", then I press "i".
I end up with empty master.passwd and group files. I clearly am not understanding the man page about mergemaster, or better yet, the diff it is trying to show me.
I don't know what to do at the "%" prompt. When I press the down arrow (to scroll through the file) I get weird characters instead.
So clearly, I am not understanding either what 'diff' is asking me for, or what 'mergemaster' is expecting me to press.
Can someone please point me to a guide (other than a man page, been there and don't understand it).
I've not interacted with 'diff' before if that is where the "%" prompt is coming from.
I want to merge the files, then go back in later and remove what I don't want in it. Kinda opposite of leave it for later and manually modify the files. Especially the master.passwd file.....It's got a lot of terse jibberish as the encryption for the password itself.
So in this process, what keystrokes do I need to issue in the mergemaster process to end up with a truly merged file installed in /etc?
I appreciate your assistance,
Sincerly,
Dave.
After I have:
# make buildworld
then I
# make installworld
Then I
# mergemaster -Ui
And this is where I am failing. specifically on files I've changed that I want to merge. I select "m" from the menu, then I get this "%" prompt, then I press "q", then I press "i".
I end up with empty master.passwd and group files. I clearly am not understanding the man page about mergemaster, or better yet, the diff it is trying to show me.
I don't know what to do at the "%" prompt. When I press the down arrow (to scroll through the file) I get weird characters instead.
So clearly, I am not understanding either what 'diff' is asking me for, or what 'mergemaster' is expecting me to press.
Can someone please point me to a guide (other than a man page, been there and don't understand it).
I've not interacted with 'diff' before if that is where the "%" prompt is coming from.
I want to merge the files, then go back in later and remove what I don't want in it. Kinda opposite of leave it for later and manually modify the files. Especially the master.passwd file.....It's got a lot of terse jibberish as the encryption for the password itself.
So in this process, what keystrokes do I need to issue in the mergemaster process to end up with a truly merged file installed in /etc?
I appreciate your assistance,
Sincerly,
Dave.