| @@ -69,4 +69,18 @@ OK I'm expecting this to break midway through. | |||
| 69 | 69 | ||
| 70 | 70 | ``` | |
| 71 | 71 | # pkg -o ABI=FreeBSD:15:amd64 install -r pkg-base -g FreeBSD-\* | |
| 72 | - | ``` | |
| 72 | + | ``` | |
| 73 | + | ||
| 74 | + | OK it didn't lets clean up | |
| 75 | + | ||
| 76 | + | ``` | |
| 77 | + | # rm -rf (fd pkgsave / |grep -v /etc |head -10000) | |
| 78 | + | # rm -rf (fd pkgsave / |grep -v /etc |head -10000) | |
| 79 | + | # rm -rf (fd pkgsave / |grep -v /etc |head -10000) | |
| 80 | + | ``` | |
| 81 | + | ||
| 82 | + | now etc | |
| 83 | + | ||
| 84 | + | ``` | |
| 85 | + | # rm /etc/rc.d/*.pkgsave defaults/*.pkgsave ssl/*.pkgsave mtree/*.pkgsave rc.*.pkgsave ttys.pkgsave | |
| 86 | + | ``` | |
| @@ -0,0 +1,72 @@ | |||
| 1 | + | # Naive Upgrade 14.3 non-pkgbase to 15 pkgbase | |
| 2 | + | ||
| 3 | + | This would almost certainly be better with pkgbasify but YOLO gotta YOLO | |
| 4 | + | ||
| 5 | + | ``` | |
| 6 | + | # pkg -o ABI=FreeBSD:15:amd64 upgrade -r pkg-base FreeBSD-kernel-generic | |
| 7 | + | # shutdown -r now | |
| 8 | + | ``` | |
| 9 | + | ||
| 10 | + | That worked, let's keep going. Gotta bootstrap pkg first tho.. nope why | |
| 11 | + | isn't ABI respected? | |
| 12 | + | ||
| 13 | + | ``` | |
| 14 | + | ||
| 15 | + | # pkg -o ABI=FreeBSD:15:amd64 bootstrap -f | |
| 16 | + | pkg: Setting ABI requires setting OSVERSION, guessing the OSVERSION as: 1500000 | |
| 17 | + | pkg: Warning: Major OS version upgrade detected. Running "pkg bootstrap -f" recommended | |
| 18 | + | pkg(8) is already installed. Forcing reinstallation through pkg(7). | |
| 19 | + | The package management tool is not yet installed on your system. | |
| 20 | + | Do you want to fetch and install it now? [y/N]: y | |
| 21 | + | Bootstrapping pkg from pkg+https://pkg.FreeBSD.org/FreeBSD:14:amd64/latest, please wait... | |
| 22 | + | ^C | |
| 23 | + | ||
| 24 | + | # pkg-static -o ABI=FreeBSD:15:amd64 bootstrap -f | |
| 25 | + | pkg-static: Setting ABI requires setting OSVERSION, guessing the OSVERSION as: 1500000 | |
| 26 | + | pkg-static: Warning: Major OS version upgrade detected. Running "pkg bootstrap -f" recommended | |
| 27 | + | pkg(8) is already installed. Forcing reinstallation through pkg(7). | |
| 28 | + | The package management tool is not yet installed on your system. | |
| 29 | + | Do you want to fetch and install it now? [y/N]: y | |
| 30 | + | Bootstrapping pkg from pkg+https://pkg.FreeBSD.org/FreeBSD:14:amd64/latest, please wait... | |
| 31 | + | ^C | |
| 32 | + | ``` | |
| 33 | + | ||
| 34 | + | ``` | |
| 35 | + | # pkg -o ABI=FreeBSD:15:amd64 update | |
| 36 | + | pkg: Setting ABI requires setting OSVERSION, guessing the OSVERSION as: 1500000 | |
| 37 | + | pkg: Warning: Major OS version upgrade detected. Running "pkg bootstrap -f" recommended | |
| 38 | + | Updating FreeBSD repository catalogue... | |
| 39 | + | pkg: Repository FreeBSD has a wrong packagesite, need to re-create database | |
| 40 | + | Fetching meta.conf: 100% 179 B 0.2kB/s 00:01 | |
| 41 | + | Fetching data.pkg: 100% 10 MiB 1.1MB/s 00:10 | |
| 42 | + | Processing entries: 0% | |
| 43 | + | Newer FreeBSD version for package ztop: | |
| 44 | + | To ignore this error set IGNORE_OSVERSION=yes | |
| 45 | + | - package: 1500063 | |
| 46 | + | - running userland: 1500000 | |
| 47 | + | Ignore the mismatch and continue? [y/N]: y | |
| 48 | + | Processing entries: 100% | |
| 49 | + | FreeBSD repository update completed. 36250 packages processed. | |
| 50 | + | Updating FreeBSD-base repository catalogue... | |
| 51 | + | Fetching meta.conf: 100% 179 B 0.2kB/s 00:01 | |
| 52 | + | Fetching data.pkg: 100% 60 KiB 61.9kB/s 00:01 | |
| 53 | + | Processing entries: 100% | |
| 54 | + | FreeBSD-base repository update completed. 572 packages processed. | |
| 55 | + | Updating pkg-base repository catalogue... | |
| 56 | + | pkg-base repository is up to date. | |
| 57 | + | Updating pkg repository catalogue... | |
| 58 | + | pkg: Repository pkg has a wrong packagesite, need to re-create database | |
| 59 | + | Fetching meta.conf: 100% 179 B 0.2kB/s 00:01 | |
| 60 | + | Fetching data.pkg: 100% 438 KiB 448.4kB/s 00:01 | |
| 61 | + | Processing entries: 100% | |
| 62 | + | pkg repository update completed. 1427 packages processed. | |
| 63 | + | All repositories are up to date. | |
| 64 | + | ``` | |
| 65 | + | ||
| 66 | + | that seems better? | |
| 67 | + | ||
| 68 | + | OK I'm expecting this to break midway through. | |
| 69 | + | ||
| 70 | + | ``` | |
| 71 | + | # pkg -o ABI=FreeBSD:15:amd64 install -r pkg-base -g FreeBSD-\* | |
| 72 | + | ``` | |
| @@ -5,9 +5,9 @@ NB I built my own pkgbase set, based off stable/15 @ 0b3d82579a01db4c5d874cda1ac | |||
| 5 | 5 | The overall plan is: | |
| 6 | 6 | ||
| 7 | 7 | 1. upgrade only the GENERIC kernel package from my pkgbase set | |
| 8 | - | 1. update the EFI boot loader /boot/efi/EFI/FreeBSD/current.efi in my case | |
| 9 | 8 | 1. reboot | |
| 10 | 9 | 1. upgrade all the remaining base system packages from my pkgbase set | |
| 10 | + | 1. update the EFI boot loader from the just-installed FreeBSD-bootloader | |
| 11 | 11 | 1. re-bootstrap pkg for the new userland from the public pkg.freebsd.org packages | |
| 12 | 12 | 1. delete all non-base system packages to remove a few years of cruft | |
| 13 | 13 | 1. install my minimal useful package list | |
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | # upgrade just the kernel first, and reboot | |
| 2 | 2 | ||
| 3 | 3 | ``` | |
| 4 | - | pkg upgrade -r pkg-base FreeBSD-kernel-generic | |
| 4 | + | # pkg upgrade -r pkg-base FreeBSD-kernel-generic | |
| 5 | 5 | Updating pkg-base repository catalogue... | |
| 6 | 6 | pkg-base repository is up to date. | |
| 7 | 7 | pkg-base is up to date. | |
| @@ -117,12 +117,11 @@ pkg: Impossible to merge configuration file: /etc/ssh/moduli <----------- woops | |||
| 117 | 117 | [500/500] Installing FreeBSD-zfs-man-15.0.1.20250906130029... | |
| 118 | 118 | [500/500] Extracting FreeBSD-zfs-man-15.0.1.20250906130029: 100% | |
| 119 | 119 | ``` | |
| 120 | - | ||
| 121 | - | ## update my custom EFI loader | |
| 120 | + | ## update EFI loader from FreeBSD-bootloader package | |
| 122 | 121 | ||
| 123 | 122 | ``` | |
| 124 | 123 | # cp /boot/efi/EFI/FreeBSD/current.efi /boot/efi/EFI/FreeBSD/lastgood.efi | |
| 125 | - | # cp /boot/loader.efi /boot/efi/EFI/FreeBSD/ | |
| 124 | + | # cp /boot/loader.efi /boot/efi/EFI/FreeBSD/current.efi | |
| 126 | 125 | ``` | |
| 127 | 126 | ||
| 128 | 127 | ## delete userland | |
| @@ -1,13 +1,15 @@ | |||
| 1 | - | # updating 15.0-CURRENT from ~ 3 weeks ago to 15.0-AlPHA1 | |
| 1 | + | # updating 15.0-CURRENT from ~ 3 weeks ago to 15.0-ALPHA1 | |
| 2 | + | ||
| 3 | + | NB I built my own pkgbase set, based off stable/15 @ 0b3d82579a01db4c5d874cda1ac468bb8f26c109 | |
| 2 | 4 | ||
| 3 | 5 | The overall plan is: | |
| 4 | 6 | ||
| 5 | - | 1. upgrade only the GENERIC kernel package | |
| 7 | + | 1. upgrade only the GENERIC kernel package from my pkgbase set | |
| 6 | 8 | 1. update the EFI boot loader /boot/efi/EFI/FreeBSD/current.efi in my case | |
| 7 | 9 | 1. reboot | |
| 8 | - | 1. upgrade all the remaining base system packages | |
| 9 | - | 1. re-bootstrap pkg for the new userland | |
| 10 | - | 1. delete all non-base system packages | |
| 10 | + | 1. upgrade all the remaining base system packages from my pkgbase set | |
| 11 | + | 1. re-bootstrap pkg for the new userland from the public pkg.freebsd.org packages | |
| 12 | + | 1. delete all non-base system packages to remove a few years of cruft | |
| 11 | 13 | 1. install my minimal useful package list | |
| 12 | 14 | 1. reboot again | |
| 13 | 15 | 1. install all the toys | |
| @@ -130,17 +130,18 @@ pkg: Impossible to merge configuration file: /etc/ssh/moduli <----------- woops | |||
| 130 | 130 | ``` | |
| 131 | 131 | # pkg prime-origins | sort | uniq > /etc/15.lst | |
| 132 | 132 | ### trim a few things | |
| 133 | - | # pkg delete (grep -v \# /etc/15.lst) | |
| 133 | + | # pkg delete $(egrep -v \# /etc/15.lst) | |
| 134 | 134 | # pkg autoremove | |
| 135 | 135 | Checking integrity... done (0 conflicting) | |
| 136 | 136 | Deinstallation has been requested for the following 521 packages: | |
| 137 | 137 | ||
| 138 | 138 | Installed packages to be REMOVED: | |
| 139 | 139 | Box2D: 2.4.1 | |
| 140 | - | FreeBSD-libsqlite3-lib32: 15.snap20250815041637 <--- interesting | |
| 140 | + | ... FreeBSD-libsqlite3-lib32: 15.snap20250815041637 <--- interesting | |
| 141 | 141 | FreeBSD-runtime-lib32: 15.snap20250825085356 <--- interesting | |
| 142 | + | ... | |
| 142 | 143 | ||
| 143 | - | # pkg delete (pkg info |egrep -v ^FreeBSD | cut -wf 1 | grep -v pkg-) | |
| 144 | + | # pkg delete $(pkg info |egrep -v ^FreeBSD | cut -wf 1 | egrep -v pkg-) | |
| 144 | 145 | Checking integrity... done (0 conflicting) | |
| 145 | 146 | Deinstallation has been requested for the following 532 packages (of 0 packages in the universe): | |
| 146 | 147 | ||
| @@ -157,18 +158,6 @@ Proceed with deinstalling packages? [y/N]:y | |||
| 157 | 158 | ||
| 158 | 159 | # pkg info |egrep -v ^FreeBSD | cut -wf 1 | |
| 159 | 160 | pkg-2.2.2 | |
| 160 | - | root@wintermute /h/dch# pkg delete pkgconf | |
| 161 | - | Checking integrity... done (0 conflicting) | |
| 162 | - | Deinstallation has been requested for the following 1 packages (of 0 packages in the universe): | |
| 163 | - | ||
| 164 | - | Installed packages to be REMOVED: | |
| 165 | - | pkgconf: 2.4.3,1 | |
| 166 | - | ||
| 167 | - | Number of packages to be removed: 1 | |
| 168 | - | ||
| 169 | - | Proceed with deinstalling packages? [y/N]: y | |
| 170 | - | [1/1] Deinstalling pkgconf-2.4.3,1... | |
| 171 | - | [1/1] Deleting files for pkgconf-2.4.3,1: 100% | |
| 172 | 161 | ``` | |
| 173 | 162 | ||
| 174 | 163 | ## bootstrap pkg again and essential tools | |
| @@ -180,7 +169,8 @@ The package management tool is not yet installed on your system. | |||
| 180 | 169 | Do you want to fetch and install it now? [y/N]: y | |
| 181 | 170 | Bootstrapping pkg from pkg+https://pkg.FreeBSD.org/FreeBSD:15:amd64/latest, please wait... | |
| 182 | 171 | ||
| 183 | - | # pkg install -r FreeBSD tmux rsync neovim htop fish ripgrep fd-find zoxide doas tarsnap ca_root_nss haproxy-lua zerotier | |
| 172 | + | # pkg install -r FreeBSD tmux rsync neovim htop fish ripgrep fd-find zoxide doas tarsnap \ | |
| 173 | + | ca_root_nss haproxy-lua zerotier | |
| 184 | 174 | Updating FreeBSD repository catalogue... | |
| 185 | 175 | FreeBSD repository is up to date. | |
| 186 | 176 | FreeBSD is up to date. | |
| @@ -201,5 +191,4 @@ Proceed with this action? [y/N]: y | |||
| 201 | 191 | ||
| 202 | 192 | ## reboot here & see if this all works | |
| 203 | 193 | ||
| 204 | - | Indeed it does. Install the rest while enjoying a well-deserved beverage. | |
| 205 | - | ||
| 194 | + | Indeed it does. Install the rest while enjoying a well-deserved beverage. | |
Diff is too large to be shown
| @@ -0,0 +1,16 @@ | |||
| 1 | + | # updating 15.0-CURRENT from ~ 3 weeks ago to 15.0-AlPHA1 | |
| 2 | + | ||
| 3 | + | The overall plan is: | |
| 4 | + | ||
| 5 | + | 1. upgrade only the GENERIC kernel package | |
| 6 | + | 1. update the EFI boot loader /boot/efi/EFI/FreeBSD/current.efi in my case | |
| 7 | + | 1. reboot | |
| 8 | + | 1. upgrade all the remaining base system packages | |
| 9 | + | 1. re-bootstrap pkg for the new userland | |
| 10 | + | 1. delete all non-base system packages | |
| 11 | + | 1. install my minimal useful package list | |
| 12 | + | 1. reboot again | |
| 13 | + | 1. install all the toys | |
| 14 | + | 1. celebrate | |
| 15 | + | ||
| 16 | + | In practice I didn't quite follow this recipe, but close enough. | |
| @@ -0,0 +1,26 @@ | |||
| 1 | + | # upgrade just the kernel first, and reboot | |
| 2 | + | ||
| 3 | + | ``` | |
| 4 | + | pkg upgrade -r pkg-base FreeBSD-kernel-generic | |
| 5 | + | Updating pkg-base repository catalogue... | |
| 6 | + | pkg-base repository is up to date. | |
| 7 | + | pkg-base is up to date. | |
| 8 | + | The following 1 package(s) will be affected (of 0 checked): | |
| 9 | + | ||
| 10 | + | Installed packages to be UPGRADED: | |
| 11 | + | FreeBSD-kernel-generic: 15.snap20250610163850 -> 15.0.1.20250906130029 [pkg-base] | |
| 12 | + | ||
| 13 | + | Number of packages to be upgraded: 1 | |
| 14 | + | ||
| 15 | + | The operation will free 5 MiB. | |
| 16 | + | 45 MiB to be downloaded. | |
| 17 | + | ||
| 18 | + | Proceed with this action? [y/N]: y | |
| 19 | + | [1/1] Fetching FreeBSD-kernel-generic-15.0.1.20250906130029.pkg: 100% 45 MiB 9.4MB/s 00:05 | |
| 20 | + | Checking integrity... done (0 conflicting) | |
| 21 | + | [1/1] Upgrading FreeBSD-kernel-generic from 15.snap20250610163850 to 15.0.1.20250906130029... | |
| 22 | + | [1/1] Extracting FreeBSD-kernel-generic-15.0.1.20250906130029: 100% | |
| 23 | + | ``` | |
| 24 | + | ||
| 25 | + | ## reboot ok | |
| 26 | + | ||