shorten message

update MOTD
update homepage
2024-09-19 19:40:37 +02:00 · 2023-07-07 20:51:48 +02:00 · 2023-07-07 20:13:51 +02:00 · 2023-07-07 20:07:46 +02:00 · 2023-07-07 16:39:35 +02:00 · 2023-07-07 16:29:48 +02:00
3 changed files with 25 additions and 37 deletions
--- a/usr/lib/initcpio/install/archboot_motd
+++ b/usr/lib/initcpio/install/archboot_motd
@ -31,10 +31,8 @@ if  echo "${HOOKS[@]}" | grep -qw archboot_installer; then
    echo -e "\e[1mManage Archboot Environment:\e[m" >> "${MOTD}"
    echo -e "  - Use the \e[1;92m'update'\e[m script." >> "${MOTD}"
    #shellcheck disable=SC2129
-    echo -e "\e[1mInstallation:\e[m" >> "${MOTD}"
-    echo -e "  - Use the \e[92m'setup'\e[m script." >> "${MOTD}"
-    echo -e "\e[1mInstallation For Experts:\e[m" >> "${MOTD}"
-    echo -e "  - Use the \e[1;92m'quickinst'\e[m script." >> "${MOTD}"
+    echo -e "\e[1mInstallation Or Installation For Experts:\e[m" >> "${MOTD}"
+    echo -e "  - Use the \e[92m'setup'\e[m or \e[1;92m'quickinst'\e[m script." >> "${MOTD}"
 fi
    chmod 644 "${MOTD}"
    add_file "${MOTD}" "/etc/motd"
--- a/usr/share/archboot/base/init
+++ b/usr/share/archboot/base/init
@ -3,7 +3,7 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 _title() {
    echo -e "\e[1mInitializing\e[m \e[1;96mArchboot\e[m \e[1m- Arch Linux Environment:\e[m"
-    echo -e "\e[1;93mPlease keep the boot medium inserted, until the process has finished! \e[m"
+    echo -e "\e[1;93mPlease keep the boot medium inserted...\e[m"
 }
 _emergency_shell() {
    echo -e "\e[1;91mArchboot Emergeny Shell:\e[m"
--- a/usr/share/archboot/doc/archboot.html
+++ b/usr/share/archboot/doc/archboot.html
@ -14,7 +14,7 @@
 <body>
 <p><span><img src="/web/logo.png" alt="Logo"></span></p>
 <h1>Archboot Project | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=Z7GXKW4MKHK7C"><img src="/web/donate.png" alt="Donate"></a></h1>
-<p><strong>&copy; 2006 - 2023 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong><br>Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a><br>Last update: 07.07.2023 11:57</strong></p>
+<p><strong>&copy; 2006 - 2023 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong><br>Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a><br>Last update: 07.07.2023 20:07</strong></p>
 <nav id="TOC" role="doc-toc">
 <ul>
 <li><a href="#introduction" id="toc-introduction"><strong><span class="toc-section-number">1.</span> Introduction</strong></a></li>
@ -30,7 +30,7 @@
 <li><a href="#archboot-in-a-nutshell" id="toc-archboot-in-a-nutshell"><strong><span class="toc-section-number">3.</span> Features In A Nutshell</strong></a></li>
 <li><ul>
 <li><a href="#graphical-environment-vnc" id="toc-graphical-environment-vnc"><span class="toc-section-number">3.1</span> Graphical Environments / VNC</a></li>
-<li><a href="#remote-access" id="toc-remote-access"><span class="toc-section-number">3.2</span> Remote Access</a></li>
+<li><a href="#remote-terminal-access" id="toc-remote-terminal-access"><span class="toc-section-number">3.2</span> Remote Terminal Access</a></li>
 <li><a href="#secure-boot-support" id="toc-secure-boot-support"><span class="toc-section-number">3.3</span> Secure Boot - MOK / Machine Owner Key</a></li>
 <li><a href="#switch-to-complete-arch-linux-system" id="toc-switch-to-complete-arch-linux-system"><span class="toc-section-number">3.4</span> Switch To Complete Arch Linux System</a></li>
 <li><a href="#interactive-setup" id="toc-interactive-setup"><span class="toc-section-number">3.5</span> Interactive Setup</a></li>
@ -45,19 +45,9 @@
 <li><strong><a href="#development" id="toc-development"><span class="toc-section-number">6.</span> Development: GIT And Bugtracker</a></strong></li>
 <li><a href="#package-installation" id="toc-usage"><strong><span class="toc-section-number">7.</span> Package - Repository / Installation / Usage</strong></a>
 <li><ul>
-<li><a href="#create-rescue-system" id="toc-create-rescue-system"><strong><span class="toc-section-number">7.1</span> Create Rescue System Out Of The Running System</strong></a></li>
-<li><a href="#create-image-files" id="toc-create-image-files"><strong><span class="toc-section-number">7.2</span> Create Image Files</strong></a>
-<li><ul>
-<li><a href="#requirements" id="toc-requirements"><span class="toc-section-number">7.2.1</span> Requirement</a></li>
-<li><a href="#create-image-files-without-modifications" id="toc-create-image-files-without-modifications"><span class="toc-section-number">7.2.2</span> Create Image Files Without Modifications</a></li>
-<li><a href="#create-image-files-with-modifications" id="toc-create-image-files-with-modifications"><span class="toc-section-number">7.2.3</span> Create Image Files With Modifications</a></li>
-</ul></li>
-<li><a href="#setting-up-an-archboot-image-server" id="toc-setting-up-an-archboot-image-server"><strong><span class="toc-section-number">7.3</span> Setting Up An Image Server</strong></a></li>
-<li><ul>
-<li><a href="#requirements-1" id="toc-requirements-1"><span class="toc-section-number">7.3.1</span> Requirements</a></li>
-<li><a href="#configuration-file" id="toc-configuration-file"><span class="toc-section-number">7.3.2</span> Configuration File</a></li>
-<li><a href="#running-commands" id="toc-running-commands"><span class="toc-section-number">7.3.3</span> Running Commands</a></li>
-</ul></li>
+<li><a href="#create-rescue-system" id="toc-create-rescue-system"><span class="toc-section-number">7.1</span> Create Rescue System Out Of The Running System</a></li>
+<li><a href="#create-image-files" id="toc-create-image-files"><span class="toc-section-number">7.2</span> Create Image Files</a>
+<li><a href="#setting-up-an-archboot-image-server" id="toc-setting-up-an-archboot-image-server"><span class="toc-section-number">7.3</span> Setting Up An Image Server</a></li>
 </ul></li>
 <li><a href="#testing-image-and-files-with-qemu" id="toc-testing-image-and-files-with-qemu"><strong><span class="toc-section-number">8.</span> Testing Image And Files With QEMU</strong></a></li>
 <li><ul>
@ -86,7 +76,7 @@
 <li><strong>Supported Glibc Locales</strong>: be, bg, cs, da, de, en, el, es, fi, fr, hu, it, lt, lv, mk, nl, nn, pl, pt, ro, ru, sk, sr, sv, uk</li>
 </ul>
 <h3 data-number="2.1" id="iso"><span class="header-section-number">2.1</span> <strong>ISOs - USB / CD / Virtual Machine</strong></h3>
-<a href="https://archlinuxarm.org/"><strong>Arch Linux ARM aarch64</strong></a>
+<a href="https://archlinuxarm.org/"><strong>Arch Linux ARM - aarch64</strong></a>
 <table>
 <thead>
 <tr class="header">
@ -105,7 +95,7 @@
 </tbody>
 </table>
 <p>The ISO supports <strong>aarch64, Apple Mac M1 and higher</strong> for virtual machines eg. <a href="https://wiki.archlinux.org/title/Parallels_Desktop" title="Parallels Desktop"><strong>Parallels Desktop</strong></a>, <a href="https://mac.getutm.app/" title="UTM MacOS"><strong>UTM</strong></a> and <a href="https://wiki.archlinux.org/title/VMware" title="VMware"><strong>VMware</strong></a></p>
-<a href="https://archriscv.felixc.at/"><strong>Arch Linux RISC-V riscv64</strong></a>
+<a href="https://archriscv.felixc.at/"><strong>Arch Linux RISC-V - riscv64</strong></a>
 <table>
 <thead>
 <tr class="header">
@ -122,7 +112,7 @@
 </tbody>
 </table>
 <p>The ISO supports <strong>riscv64</strong> and needs <a href="https://www.denx.de/wiki/U-Boot" title="U-Boot"><strong>U-Boot</strong></a> to launch. Recommended <strong>only</strong> for testing in a virtual machine.</p>
-<a href="https://archlinux.org/"><strong>Arch Linux X64 x86_64</strong></a>
+<a href="https://archlinux.org/"><strong>Arch Linux X64 - x86_64</strong></a>
 <table>
 <thead>
 <tr class="header">
@ -140,7 +130,7 @@
 <td><a href="https://bbs.archlinux.org/viewtopic.php?id=182439"><strong>Check</strong></a></td>
 </tbody>
 </table>
-<p>The ISO for <strong>x86_64</strong>. Use it for <strong>real</strong> machines <strong>and/or</strong> virtual machines.</p>
+<p>The ISO supports <strong>x86_64</strong>. Use it for <strong>real</strong> machines <strong>and/or</strong> virtual machines.</p>
 <h3 data-number="2.2" id="unified-kernel-image"><span class="header-section-number">2.2 </span> UKIs - <a href="https://wiki.archlinux.org/title/Unified_kernel_image" title="UKI"><strong>Unified Kernel Images</strong></a></h3>
 <!--
 <table>
@ -432,13 +422,13 @@
 </tr>
 </tbody>
 </table>
-<h3 data-number="3.2" id="remote-access"><span class="header-section-number">3.2</span> <strong>Remote Access</strong></h3>
-<h4 data-number="3.2.1" id="remote-access-openssh"><span class="header-section-number">3.2.1</span> <strong>OpenSSH</strong></h4>
-<p>root <a href="https://wiki.archlinux.org/title/Password" title="Password"><strong>password</strong></a> is <strong>not</strong> set by default! If you need security during installation set a <a href="https://wiki.archlinux.org/title/Password" title="Password"><strong>password</strong></a>.</p>
+<h3 data-number="3.2" id="remote-terminal-access"><span class="header-section-number">3.2</span> <strong>Remote Terminal Access</strong></h3>
+<h4 data-number="3.2.1" id="remote-access-openssh"><span class="header-section-number">3.2.1</span> <strong>OpenSSH Terminal</strong></h4>
+<p>Access the terminal with <a href="https://wiki.archlinux.org/title/OpenSSH" title="Password"><strong>OpenSSH</strong></a>.<br><strong>Attention:</strong> root <a href="https://wiki.archlinux.org/title/Password" title="Password"><strong>password</strong></a> is <strong>not set/empty</strong> by default!</p>
 <table>
 <thead>
 <tr class="header">
-<th>Connect as root user to archboot:</th>
+<th>Connect with ssh as root user:</th>
 </tr>
 </thead>
 <tbody>
@ -448,11 +438,11 @@
 </tbody>
 </table>
 <h4 data-number="3.2.2" id="remote-access-ttyd"><span class="header-section-number">3.2.2</span> <strong>HTTP Browser Terminal - TTYD</strong></h4>
-<p>Get a <a href="https://github.com/tsl0922/ttyd" title="ttyd"><strong>ttyd terminal</strong></a> in your browser window.</p>
+<p>Access the <a href="https://github.com/tsl0922/ttyd" title="ttyd"><strong>ttyd</strong></a> terminal in your <strong>browser</strong>.</p>
 <table>
 <thead>
 <tr class="header">
-<th>Connect with your favourite browser to archboot:</th>
+<th>Connect with your favourite browser:</th>
 </tr>
 </thead>
 <tbody>
@ -480,7 +470,7 @@
 </table>
 <p>Please read <a href="https://www.rodsbooks.com/efi-bootloaders/secureboot.html#initial_shim"><strong>Roderick Smith’s guide</strong></a> for initial shim setup first.</p>
 <p>The included tools for key management: <strong>KeyTool, HashTool, mokutil, sbsigntools, sbctl</strong> and <strong>mkkeys.sh</strong></p>
-<h4 data-number="3.3.1" id="secure-boot-iso"><span class="header-section-number">3.3.1</span> <strong>Boot ISO</strong></h4>
+<h4 data-number="3.3.1" id="secure-iso-boot"><span class="header-section-number">3.3.1</span> <strong>Secure Boot - ISO Booting</strong></h4>
 <p>On initial <a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot</strong></a> setup MOK manager is launched:</p>
 <table>
 <thead>
@ -494,7 +484,7 @@
 </tr>
 </tbody>
 </table>
-<h4 data-number="3.3.2" id="secure-boot-setup"><span class="header-section-number">3.3.2</span> <strong>Setup Routine</strong></h4>
+<h4 data-number="3.3.2" id="secure-boot-auto-setup"><span class="header-section-number">3.3.2</span> <strong>Secure Boot - Automatic Setup Routine</strong></h4>
 <p>The setup script supports the following <a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot</strong></a> layout:</p>
 <ul>
 <li>The <strong><a href="https://kojipkgs.fedoraproject.org/packages/shim/" title="Fedora Shim">fedora's signed shim</a></strong> is copied to the installed system</li>
@ -505,7 +495,7 @@
 <li>On <strong>first</strong> boot you need to <strong>enroll</strong> the used personal key as <strong>MOK</strong>.</li>
 <li>Then your installed system is dual boot <strong>ready</strong>.</li>
 </ul>
-<h4 data-number="3.3.3" id="secure-boot-create-mok"><span class="header-section-number">3.3.3</span> <strong>Create MOK</strong></h4>
+<h4 data-number="3.3.3" id="secure-boot-manual-create-mok"><span class="header-section-number">3.3.3</span> <strong>Secure Boot - Manual Create MOK</strong></h4>
 <table>
 <thead>
 <tr class="header">
@ -518,7 +508,7 @@
 </tr>
 </tbody>
 </table>
-<h4 data-number="3.3.4" id="secure-boot-reset-mok"><span class="header-section-number">3.3.4</span> <strong>Reset MOK</strong></h4>
+<h4 data-number="3.3.4" id="secure-boot-reset-mok"><span class="header-section-number">3.3.4</span> <strong>Secure Boot - Reset MOK</strong></h4>
 <p>In order to <strong>reset</strong> the MOK setup:</p>
 <ul>
 <li>Turn <strong>off</strong> Secure Boot in firmware</li>
@ -538,7 +528,7 @@
 </table>
 <ul>
 <li>Reboot and turn <strong>on</strong> Secure Boot again in firmware.</li>
-<li>Start again at <a href="#secure-boot-iso"><strong>3.3.1 Boot ISO</strong></a>.</li>
+<li>Start again at point <a href="#secure-iso-boot"><strong>3.3.1</strong></a>.</li>
 </ul>
 <h3 data-number="3.4" id="switch-to-complete-arch-linux-system"><span class="header-section-number">3.4</span> <strong>Switch To Complete Arch Linux System</strong></h3>
 <ul>
@ -768,7 +758,7 @@ The calculated size to boot the image follows the formula:<br>
 <table>
 <thead>
 <tr class="header">
-<th>Feature</th>
+<th></th>
 <th>Archboot</th>
 <th>Archiso</th>
 </tr>
@ -799,7 +789,7 @@ The calculated size to boot the image follows the formula:<br>
 <td class="MyYes">&#10004;</td>
 <td class="MyNo">&#10006;</td>
 <tr class="odd">
-<td><a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot MOK support</strong></a><br>with Microsoft certificates<br>supported by <strong><a href="https://kojipkgs.fedoraproject.org/packages/shim/" title="Fedora Shim">fedora signed shim</a></strong></td>
+<td><a href="https://wiki.archlinux.org/title/Secure_Boot" title="Secure Boot"><strong>Secure Boot MOK support</strong></a><br>with Microsoft certificates<br>supported by <strong><a href="https://kojipkgs.fedoraproject.org/packages/shim/" title="Fedora Shim">fedora's signed shim</a></strong></td>
 <td class="MyYes">&#10004;</td>
 <td class="MyNo">&#10006;</td>
 </tr>
Author	SHA1	Message	Date
Tobias Powalowski	dc239f8f03	shorten message	2023-07-07 20:51:48 +02:00
Tobias Powalowski	a8e863e7af	update MOTD	2023-07-07 20:13:51 +02:00
Tobias Powalowski	9df1ffdab4	update homepage	2023-07-07 20:07:46 +02:00
Tobias Powalowski	4a15de4ac0	update homepage	2023-07-07 16:39:35 +02:00
Tobias Powalowski	797a37de52	update homepage	2023-07-07 16:29:48 +02:00
Tobias Powalowski	dc4d50fa3c	update homepage	2023-07-07 15:16:28 +02:00