From 501172e6d04cb3c91867f550011eb036882bc74e Mon Sep 17 00:00:00 2001 From: Jacob Pyke Date: Mon, 14 Sep 2020 08:15:12 +1000 Subject: [PATCH] Update README.md --- README.md | 101 +++++++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 8c55bab..b9b1530 100644 --- a/README.md +++ b/README.md @@ -45,48 +45,47 @@ systemctl start systemd-timesyncd.service 9. Click Manual Partitioning 10. Click on `/dev/nvme0n1p1` then press edit at the bottom of the install window, change the Change the Mount Point: `/boot`, after that click okay. 11. Usually, the MacOS partition is mounted to `/dev/nvme0n1p2` (Double check this, the Installer should recognize this partition as an `Apple APFS` Partition). Ignore the MacOS partition. -13. Delete the partition you created before, this is usually mounted to `/dev/nvme0n1p3`. -14. These next steps involve partitioning the `/`(Root) and `/home`(Home) partitions of your Linux filesystem, if you know what you are doing feel free to skip to the next step (15). +12. Delete the partition you created before, this is usually mounted to `/dev/nvme0n1p3`. +13. These next steps involve partitioning the `/`(Root) and `/home`(Home) partitions of your Linux filesystem, if you know what you are doing feel free to skip to the next step (15). - a. Create a `51200 MiB` partition with `ext4` as the file system. Change the mount point to `/` and click okay. - - b. Use the remaining disk space to create an `ext4` file system. Change the mount point to `/home`. - -15. Click Next, on the next screen a warning will appear about EFI System Partition Configuration. Just ignore it and click okay. -16. Continue the rest of the setup as normal. Once the installer has finished do not restart the system. -17. Open a terminal, and type: + - Create a `51200 MiB` partition with `ext4` as the file system. Change the mount point to `/` and click okay. + - Use the remaining disk space to create an `ext4` file system. Change the mount point to `/home`. + +14. Click Next, on the next screen a warning will appear about EFI System Partition Configuration. Just ignore it and click okay. +15. Continue the rest of the setup as normal. Once the installer has finished do not restart the system. +16. Open a terminal, and type: ``` sudo fdisk -l. ``` The root password is 'manjaro' -18. Scroll up to the disk named /dev/nvme0n1. Note down the names of the 50G Linux partition and the 300M EFI SYSTEM partition. +17. Scroll up to the disk named /dev/nvme0n1. Note down the names of the 50G Linux partition and the 300M EFI SYSTEM partition. In my case these were mounted at /dev/nvme0n1p1 (EFI System) and /dev/nvme0n1p3 (Linux Filesystem). -19. Copy this command into a terminal, substitute the two fields in { } with your EFI System and Linux Filesystem names +18. Copy this command into a terminal, substitute the two fields in { } with your EFI System and Linux Filesystem names ``` sudo mount {Linux Filesystem} /mnt; sudo mount {EFI System} /mnt/boot ``` -20. Run this command, take note of the UUID (Note this command has a space in the grep command `"/ "`, It is there for a reason) +19. Run this command, take note of the UUID (Note this command has a space in the grep command `"/ "`, It is there for a reason) ``` cat /mnt/etc/fstab | grep "/ " ``` -21. Open a new terminal, and run this command +20. Open a new terminal, and run this command ``` manjaro-chroot /mnt ``` -22. Run this command to install systemd-boot +21. Run this command to install systemd-boot ``` bootctl --path=/boot --no-variables install ``` -23. and then this one to mask systemd from not touching a EFI var (Causes a kernel panic) +22. and then this one to mask systemd from not touching a EFI var (Causes a kernel panic) ``` systemctl mask systemd-boot-system-token.service ``` -24. Open the file /boot/loader/entries/manjaro.conf in your favorite text editor (If you are a beginner use the command below) +23. Open the file /boot/loader/entries/manjaro.conf in your favorite text editor (If you are a beginner use the command below) ``` nano /boot/loader/entries/manjaro.conf ``` -25. Paste in the block of text below (Note for beginners to paste into a terminal its usually control + shift + v) +24. Paste in the block of text below (Note for beginners to paste into a terminal its usually control + shift + v) ``` title Manjaro Linux linux /vmlinuz-5.7-x86_64-mbp @@ -94,14 +93,14 @@ initrd /intel-ucode.img initrd /initramfs-5.7-x86_64-mbp.img options root="UUID={change_this_value}" rw ``` -26. Change back to your other terminal with the values, And copy the UUID from the other terminal, replacing {change_this_value} (Including the brackets). -27. Save the file (Use ctrl+x if you copied my command from above, press the y button and then press enter). -28. Run the command below: +25. Change back to your other terminal with the values, And copy the UUID from the other terminal, replacing {change_this_value} (Including the brackets). +26. Save the file (Use ctrl+x if you copied my command from above, press the y button and then press enter). +27. Run the command below: ``` echo -e 'default manjaro.conf\rtimeout 4\rconsole-mode max\reditor no' > /boot/loader/loader.conf ``` -29. Press control + d -30. Run this command: +28. Press control + d +29. Run this command: ``` sudo umount -R /mnt ``` @@ -211,14 +210,14 @@ sudo sed -i 's/http:\/\/jacobpyke.xyz:8080/https:\/\/jacobpyke.xyz/' /etc/pacman ## Building for yourself -### Option 1: Docker +### Option 1: Docker - All Linux Distros First, you need to ensure that docker isn't using `overlay` or `overlay2` filesystems. This can be verified by running `docker info`. And will be shown next to `Storage Driver`. In the event that you are running `overlay`, [Look at this docker documentation](https://docs.docker.com/storage/storagedriver/vfs-driver/) on how to switch to VFS. *Note, this doesn't work on OSX or Windows, I am working closely with the Manjaro Devs on this one.* -**Quick Docker Install Script - Tested on Arch** +**Quick Docker Install Script - For Linux** ``` sh -c "$(curl -fsSL "https://raw.githubusercontent.com/JPyke3/mbp-manjaro/master/build-in-docker.sh")" ``` @@ -258,37 +257,22 @@ Clone the repository to your home directory git clone https://github.com/JPyke3/mbp-manjaro ~/iso-profiles ``` run a command corrisponding to your preferred version of Manjaro: -##### xfce + ``` -buildiso -f -p xfce -k linux56-mbp +buildiso -f -p {edition} -k linux57-mbp ``` -##### GNOME + +*Available Options are:* ``` -buildiso -f -p gnome -k linux56-mbp -``` -##### KDE-Plasma -``` -buildiso -f -p kde -k linux56-mbp -``` -##### i3wm -``` -buildiso -f -p i3 -k linux56-mbp -``` -##### Cinnamon -``` -buildiso -f -p cinnamon -k linux56-mbp -``` -##### Budgie -``` -buildiso -f -p budgie -k linux56-mbp +architect gnome kde nxd xfce awesome bspwm-mate cinnamon i3 lxqt openbox webdad bspwm budgie deepin lxde mate ukui ``` #### File Locations -Navigate to the directory for your iso file. If Using xfce GNOME or KDE go to: +Navigate to the directory for your iso file. If Using a official edition go to: ``` cd /var/cache/manjaro-tools/iso/manjaro/{NAME_OF_EDITION}/20.0.3/ ``` -If on i3wm Cinnamon or Budige navigate to: +If using a community edition to: ``` cd /var/cache/manjaro-tools/iso/community/{NAME_OF_EDITION}/20.0.3/ ``` @@ -298,15 +282,11 @@ cd /var/cache/manjaro-tools/iso/community/{NAME_OF_EDITION}/20.0.3/ All TTY's will overscan on these models. This is known and being actively worked on. ## Notable Resources -Build Manjaro ISOs with Buildiso: https://wiki.manjaro.org/Build_Manjaro_ISOs_with_buildiso - -Apple BCE DKMS Git: https://aur.archlinux.org/packages/apple-bce-dkms-git/ - -Manjaro Core Packages: https://gitlab.manjaro.org/packages/core - -2018+ MBP Discord Server: https://discord.gg/fgDd8Vr - -Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073253c774be3 +* Build Manjaro ISOs with Buildiso: https://wiki.manjaro.org/Build_Manjaro_ISOs_with_buildiso +* Apple BCE DKMS Git: https://aur.archlinux.org/packages/apple-bce-dkms-git/ +* Manjaro Core Packages: https://gitlab.manjaro.org/packages/core +* 2018+ MBP Discord Server: https://discord.gg/fgDd8Vr +* Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073253c774be3 ## Noteworthy Helpers * Aunali1 (Arch Linux MBP and DKMS Modules): https://github.com/aunali1 @@ -324,14 +304,3 @@ Arch MBP 2018 (Out of Date): https://gist.github.com/TRPB/437f663b545d23cc8a2073 * Ubuntu: https://github.com/marcosfad/mbp-ubuntu * Fedora: https://github.com/mikeeq/mbp-fedora * Arch: https://github.com/aunali1/linux-mbp-arch - -## TODO -- [ ] Fix KDE and Budgie Versions -- [ ] Automate WiFi Installation -- [ ] Test Installer on Every Edition - - [x] xfce - - [x] GNOME - - [ ] KDE-Plasma - - [x] Cinnamon - - [ ] Budige -