diff --git a/README.md b/README.md index 827a173..2774571 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ Then and adjust the following files: Build [de-p1st-repo](pkg/de-p1st-repo) ... ```shell -sudo docker-compose run makepkg de-p1st-repo +cd build-pkg +sudo docker-compose run --rm makepkg de-p1st-repo ``` ... and install it on your build-machine and your mirror-server: diff --git a/build-archiso/docker-compose.yml b/build-archiso/docker-compose.yml index 1935535..f79d6f2 100644 --- a/build-archiso/docker-compose.yml +++ b/build-archiso/docker-compose.yml @@ -15,4 +15,4 @@ services: #stdin_open: true # docker run -i #tty: true # docker run -t - privileged: true + privileged: true # allow container to mount (-> airootfs) diff --git a/pkg/de-p1st-installer/README.md b/pkg/de-p1st-installer/README.md index 5c5e453..e62914c 100644 --- a/pkg/de-p1st-installer/README.md +++ b/pkg/de-p1st-installer/README.md @@ -2,23 +2,28 @@ ## Running the installer -### via custom livemedium +### Via custom livemedium -1) Build the ISO: Run script found in the base of this git repo: +1) Build custom [archiso](https://gitlab.archlinux.org/archlinux/archiso) live medium using docker in privileged mode: ```shell -./build-archiso/run.sh +# dependencies: docker, docker-compose + +cd build-archiso +sudo docker-compose run archiso +ls out/out_dir/*.iso ``` -2) Boot into the live medium and (optionally) run `screen` (to be able to scroll back in case of any errors) -3) Adjust `/etc/de-p1st-installer/installer.cfg` (or delete for interactive mode) -4) Run the installer +2) Boot into the live medium +3) (Optional) Run `screen` (to be able to scroll back in case of any errors) +4) Adjust `/etc/de-p1st-installer/installer.cfg` (or delete it for interactive mode) +5) Run the installer ```shell de-p1st-installer ``` -### via official livemedium +### Via official livemedium 1) Boot into the live medium from [archlinux.org](https://archlinux.org) 2) Add to `/etc/pacman.conf`: @@ -29,11 +34,18 @@ SigLevel = Optional TrustAll Server = https://arch.p1st.de ``` -3) (Optional) Start screen with long scrollback history (to be able to scroll back in case of any errors) +3) (Optional) Install screen with a `screenrc` configuration file for long scrollback history ```shell pacman -Sy pacman -S de-p1st-screen -screen ``` -4) Continue with step (3) of "via custom livemedium" + +4) Install `de-p1st-installer` to get the install script + +```shell +pacman -Sy +pacman -S de-p1st-installer +``` + +5) Continue with step (3) of "Via custom livemedium"