aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--carbslinux.org18
-rw-r--r--carbslinux.texi23
-rw-r--r--carbslinux.txt25
-rw-r--r--install.org21
-rw-r--r--install.txt24
5 files changed, 25 insertions, 86 deletions
diff --git a/carbslinux.org b/carbslinux.org
index d65e181..4a03ad3 100644
--- a/carbslinux.org
+++ b/carbslinux.org
@@ -44,7 +44,6 @@ for doing the first.
- [[#download][Download]]
- [[#signature-verification][Signature verification]]
- [[#extracting-the-tarball][Extracting the tarball]]
- - [[#obtain-the-chroot-helper][Obtain the chroot helper]]
- [[#chroot][Chroot]]
- [[#setting-up-repositories][Setting up repositories]]
- [[#updating-packages][Updating packages]]
@@ -211,28 +210,15 @@ mount /dev/sdx1 /mnt
tar xf carbs-rootfs.tar.xz -C /mnt
#+END_SRC
-*** Obtain the chroot helper
-:PROPERTIES:
-:DESCRIPTION: Download the script to easily chroot into the new filesystem
-:END:
-
-You can obtain the =cpt-chroot= script in order to do a simple chroot into your
-new root filesystem.
-
-#+BEGIN_SRC sh
-wget https://dl.carbslinux.org/distfiles/cpt-chroot
-chmod a+x cpt-chroot
-#+END_SRC
-
** Chroot
:PROPERTIES:
:DESCRIPTION: Going inside your new system
:END:
-Chroot into Carbs Linux!
+Chroot into Carbs Linux by running the chroot helper inside the rootfs!
#+BEGIN_SRC sh
-./cpt-chroot /mnt
+/mnt/bin/cpt-chroot /mnt
#+END_SRC
*** Setting up repositories
diff --git a/carbslinux.texi b/carbslinux.texi
index 9345006..fe559a8 100644
--- a/carbslinux.texi
+++ b/carbslinux.texi
@@ -81,7 +81,6 @@ Preparing Environment
* Download:: Download the root filesystem tarball
* Signature verification:: Verify the signature of the rootfs tarball
* Extracting the tarball:: Extracting the root filesystem to the desired location
-* Obtain the chroot helper:: Download the script to easily chroot into the new filesystem
Chroot
@@ -185,7 +184,6 @@ will continue on that point.
* Download:: Download the root filesystem tarball
* Signature verification:: Verify the signature of the rootfs tarball
* Extracting the tarball:: Extracting the root filesystem to the desired location
-* Obtain the chroot helper:: Download the script to easily chroot into the new filesystem
@end menu
@node Download
@@ -217,8 +215,8 @@ wget $URL/carbs-rootfs.tar.xz.sig
The signature file should say something similar to
@example
-untrusted comment: verify with carbslinux-2021.04.pub
-RWTBBPDVQ+aHB3dme2Kerf8XY+vWkIISp7Za2ufKghtlnRXPyObAQQyvEJYrwMVTaCBlPEnSWcnHQz8Nka06YVOIeextNKZY3AQ=
+untrusted comment: verify with carbslinux-2021.07.pub
+RWQ79tImLgmmq5LjSRcelhb0lquuNXOVkLYuaqaH6kDTZAiU/mlc97recADvGJ6UuU38XANqes91KzWiJsncqC2q4SZQO09DWwA=
@end example
@@ -229,7 +227,7 @@ check the validity of the public key from multiple locations, or just copy paste
that portion to a file and use that instead.
@example
-PUBKEY=carbslinux-2021.04.pub
+PUBKEY=carbslinux-2021.07.pub
wget https://dl.carbslinux.org/keys/$PUBKEY
@end example
@@ -257,24 +255,13 @@ mount /dev/sdx1 /mnt
tar xf carbs-rootfs.tar.xz -C /mnt
@end example
-@node Obtain the chroot helper
-@subsection Obtain the chroot helper
-
-You can obtain the @samp{cpt-chroot} script in order to do a simple chroot into your
-new root filesystem.
-
-@example
-wget https://dl.carbslinux.org/distfiles/cpt-chroot
-chmod a+x cpt-chroot
-@end example
-
@node Chroot
@section Chroot
-Chroot into Carbs Linux!
+Chroot into Carbs Linux by running the chroot helper inside the rootfs!
@example
-./cpt-chroot /mnt
+/mnt/bin/cpt-chroot /mnt
@end example
@menu
diff --git a/carbslinux.txt b/carbslinux.txt
index 43dc949..9bd89ac 100644
--- a/carbslinux.txt
+++ b/carbslinux.txt
@@ -15,7 +15,6 @@ _________________
..... 1. Download
..... 2. Signature verification
..... 3. Extracting the tarball
-..... 4. Obtain the chroot helper
.. 2. Chroot
..... 1. Setting up repositories
..... 2. Updating packages
@@ -88,7 +87,6 @@ with the info reader. It is divided into sections and easier to read.
..... 1. Download
..... 2. Signature verification
..... 3. Extracting the tarball
- ..... 4. Obtain the chroot helper
.. 2. Chroot
..... 1. Setting up repositories
..... 2. Updating packages
@@ -159,8 +157,8 @@ with the info reader. It is divided into sections and easier to read.
The signature file should say something similar to
,----
- | untrusted comment: verify with carbslinux-2021.04.pub
- | RWTBBPDVQ+aHB3dme2Kerf8XY+vWkIISp7Za2ufKghtlnRXPyObAQQyvEJYrwMVTaCBlPEnSWcnHQz8Nka06YVOIeextNKZY3AQ=
+ | untrusted comment: verify with carbslinux-2021.07.pub
+ | RWQ79tImLgmmq5LjSRcelhb0lquuNXOVkLYuaqaH6kDTZAiU/mlc97recADvGJ6UuU38XANqes91KzWiJsncqC2q4SZQO09DWwA=
`----
@@ -172,7 +170,7 @@ with the info reader. It is divided into sections and easier to read.
use that instead.
,----
- | PUBKEY=carbslinux-2021.04.pub
+ | PUBKEY=carbslinux-2021.07.pub
| wget https://dl.carbslinux.org/keys/$PUBKEY
`----
@@ -208,25 +206,14 @@ with the info reader. It is divided into sections and easier to read.
[this guide] <https://wiki.archlinux.org/index.php/Partitioning>
-2.1.4 Obtain the chroot helper
-------------------------------
-
- You can obtain the `cpt-chroot' script in order to do a simple chroot
- into your new root filesystem.
-
- ,----
- | wget https://dl.carbslinux.org/distfiles/cpt-chroot
- | chmod a+x cpt-chroot
- `----
-
-
2.2 Chroot
~~~~~~~~~~
- Chroot into Carbs Linux!
+ Chroot into Carbs Linux by running the chroot helper inside the
+ rootfs!
,----
- | ./cpt-chroot /mnt
+ | /mnt/bin/cpt-chroot /mnt
`----
diff --git a/install.org b/install.org
index b5a1234..7cea7b9 100644
--- a/install.org
+++ b/install.org
@@ -1,4 +1,4 @@
-# Created 2021-07-22 Thu 15:50
+# Created 2021-07-23 Fri 11:14
#+TITLE: Carbs Linux Installation Guide
#+AUTHOR: Cem Keylan
These are the step-by-step instructions for installing Carbs Linux. It can be
@@ -50,8 +50,8 @@ it, if you are using a Carbs Linux host, you can also install the package
The signature file should say something similar to
#+results:
-: untrusted comment: verify with carbslinux-2021.04.pub
-: RWTBBPDVQ+aHB3dme2Kerf8XY+vWkIISp7Za2ufKghtlnRXPyObAQQyvEJYrwMVTaCBlPEnSWcnHQz8Nka06YVOIeextNKZY3AQ=
+: untrusted comment: verify with carbslinux-2021.07.pub
+: RWQ79tImLgmmq5LjSRcelhb0lquuNXOVkLYuaqaH6kDTZAiU/mlc97recADvGJ6UuU38XANqes91KzWiJsncqC2q4SZQO09DWwA=
Grab the key (which probably should be the latest one) that is written on the
@@ -61,7 +61,7 @@ check the validity of the public key from multiple locations, or just copy paste
that portion to a file and use that instead.
#+begin_src sh
- PUBKEY=carbslinux-2021.04.pub
+ PUBKEY=carbslinux-2021.07.pub
wget https://dl.carbslinux.org/keys/$PUBKEY
#+end_src
@@ -89,20 +89,11 @@ partition to =/mnt=.
tar xf carbs-rootfs.tar.xz -C /mnt
#+end_src
-** Obtain the chroot helper
-You can obtain the =cpt-chroot= script in order to do a simple chroot into your
-new root filesystem.
-
-#+begin_src sh
- wget https://dl.carbslinux.org/distfiles/cpt-chroot
- chmod a+x cpt-chroot
-#+end_src
-
* Chroot
-Chroot into Carbs Linux!
+Chroot into Carbs Linux by running the chroot helper inside the rootfs!
#+begin_src sh
- ./cpt-chroot /mnt
+ /mnt/bin/cpt-chroot /mnt
#+end_src
** Setting up repositories
diff --git a/install.txt b/install.txt
index 68e8dac..657a0aa 100644
--- a/install.txt
+++ b/install.txt
@@ -18,7 +18,6 @@ can be acquired as plain-text to be viewed offline with a pager from
.. 1. Download
.. 2. Signature verification
.. 3. Extracting the tarball
-.. 4. Obtain the chroot helper
2. Chroot
.. 1. Setting up repositories
..... 1. Obtaining from git
@@ -94,8 +93,8 @@ can be acquired as plain-text to be viewed offline with a pager from
The signature file should say something similar to
,----
- | untrusted comment: verify with carbslinux-2021.04.pub
- | RWTBBPDVQ+aHB3dme2Kerf8XY+vWkIISp7Za2ufKghtlnRXPyObAQQyvEJYrwMVTaCBlPEnSWcnHQz8Nka06YVOIeextNKZY3AQ=
+ | untrusted comment: verify with carbslinux-2021.07.pub
+ | RWQ79tImLgmmq5LjSRcelhb0lquuNXOVkLYuaqaH6kDTZAiU/mlc97recADvGJ6UuU38XANqes91KzWiJsncqC2q4SZQO09DWwA=
`----
@@ -107,7 +106,7 @@ can be acquired as plain-text to be viewed offline with a pager from
use that instead.
,----
- | PUBKEY=carbslinux-2021.04.pub
+ | PUBKEY=carbslinux-2021.07.pub
| wget https://dl.carbslinux.org/keys/$PUBKEY
`----
@@ -143,25 +142,14 @@ can be acquired as plain-text to be viewed offline with a pager from
[this guide] <https://wiki.archlinux.org/index.php/Partitioning>
-1.4 Obtain the chroot helper
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- You can obtain the `cpt-chroot' script in order to do a simple chroot
- into your new root filesystem.
-
- ,----
- | wget https://dl.carbslinux.org/distfiles/cpt-chroot
- | chmod a+x cpt-chroot
- `----
-
-
2 Chroot
========
- Chroot into Carbs Linux!
+ Chroot into Carbs Linux by running the chroot helper inside the
+ rootfs!
,----
- | ./cpt-chroot /mnt
+ | /mnt/bin/cpt-chroot /mnt
`----