Merge branch 'mmdebstrap' into 'main'

(Probably) final changes for first release

See merge request !13

reform2-imx8mq/mkuserland.sh

@@ -74,7 +74,7 @@ dpkg --configure -a
 apt update
 apt install -y apt apt-utils gnupg ca-certificates
 
-apt install -y cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs
+apt install -y cpio bsdmainutils init-system-helpers procps gpgv debian-archive-keyring readline-common cron netbase iproute2 ifupdown isc-dhcp-client iptables iputils-ping locales less net-tools curl wget nano micro vim coreutils parted file git sudo console-setup console-data unicode-data kbd gpm systemd libpam-systemd systemd-sysv bash-completion ncurses-term alsa-utils brightnessctl brightness-udev usbutils pciutils fbset netcat-traditional nfacct traceroute wpasupplicant htop ncdu ntpdate ntp screen tmux telnet lm-sensors rfkill dosfstools e2fsprogs
 
 # add MNT Research/Reform apt repository
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 376511EB67AD7BAF
@@ -82,8 +82,8 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 376511EB67AD7BAF
 echo "deb https://mntre.com/reform-debian sid/" >>/etc/apt/sources.list
 apt update
 
-# install essential MNT Reform system management scripts
-apt install -y reform-tools
+# install essential MNT Reform system management scripts and docs
+apt install -y reform-tools reform-handbook
 
 apt install -y sway grim slurp xwayland xterm xfce4-terminal rofi arc-theme thunar policykit-1 libblockdev-dm2 libblockdev-crypto2 gnome-disk-utility cryptsetup  gnome-system-monitor eog evince mpv gedit engrampa connman-gtk gnome-icon-theme breeze-icon-theme fonts-noto-color-emoji lxpolkit mesa-utils w3m man-db pulseaudio pavucontrol python3-psutil ircii
 

reform2-imx8mq/mkuserland3.sh

@@ -20,7 +20,7 @@ export LANG=C
 
 # install applications
 
-apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker
+apt install -y libreoffice libreoffice-gtk3 inkscape firefox-esr emacs gimp wmaker x11-utils
 apt install -y chromium evolution freecad ardour sxiv neverball scummvm dosbox wf-recorder wev linphone-desktop
 
 # install patched software from mntre

reform2-imx8mq/reform-tools_1.0-4/DEBIAN/control → reform2-imx8mq/reform-tools_1.0-5/DEBIAN/control

 Package: reform-tools
-Version: 1.0-4
+Version: 1.0-5
 Section: base
 Priority: required
 Architecture: arm64
 Depends: bash
+Recommends: reform-handbook
 Maintainer: Lukas F. Hartmann <lukas@mntre.com>
 Description: MNT Reform System Tools
  A number of scripts for managing boot media, displays, standby, plus a few help texts and gadgets for the customized sway desktop. Also contains /sbin/reform-init, a boot manager script that gets loaded by u-boot and which in turn launches the real /sbin/init after mounting an (encrypted) boot medium.

reform2-imx8mq/reform-tools_1.0-4/etc/reform-desktop-help → reform2-imx8mq/reform-tools_1.0-5/etc/reform-desktop-help

@@ -3,7 +3,6 @@ Windows don't normally float around. Instead, a new window occupies
 the full screen or a division of the screen. For example, if you
 open another window now, both windows will take half of the screen.
 
-This terminal is autostarted near the end of the sway config.
 To open another terminal, press SUPER+ENTER.
 
 To go to a workspace, press SUPER+1 to SUPER+9.
@@ -18,9 +17,11 @@ To find a program by typing its name, press SUPER+D.
 
 To configure the network, click on NET in the title bar.
 
-You can make windows float, split vertically or be ordered as
-tabs and more. Check out the sway configuration file:
+You can make windows float, split vertically and more. 
+Check out the sway configuration file:
 gedit ~/.config/sway/config.
 
 To learn more about the command line, enter: reform-help.
 This help can be reached by entering: reform-desktop-help.
+Read the MNT Reform handbook in a browser: reform-handbook.
+

reform2-imx8mq/reform-tools_1.0-4/etc/reform-help → reform2-imx8mq/reform-tools_1.0-5/etc/reform-help

@@ -15,6 +15,7 @@ List hardware/peripherals:         lsblk
                                    lspci
                                    ip a
 View this message again:           reform-help
+Read the Operator Handbook:        reform-handbook (press % to fix contrast, Q to quit)
 Set keyboard layout and timezone:  reform-config
 Chat in Reform community:          reform-chat
 Select boot device:                reform-boot-config
@@ -26,5 +27,6 @@ View a text file:                  less filename
 Edit a text file:                  micro filename
 Log out:                           exit
 
-Most programs can be quit with Ctrl+C or Q.
+Most programs can be quit with Ctrl+C, Q, or Ctrl+Q.
 Exit the chat with /quit.
+

reform2-imx8mq/reform-tools_1.0-4/etc/reform-root-help → reform2-imx8mq/reform-tools_1.0-5/etc/reform-root-help

@@ -9,9 +9,10 @@ Afterwards, to be able to become root by using sudo, enter:
 
   adduser your-name sudo
 
-Then, log out using exit and log in as your-name.
+Then, log out using exit and log in as your-name.
 
-To learn more about GNU/Linux, enter:
+To read the MNT Reform Operator Handbook, enter:
 
-  man intro
+  reform-handbook   # (in the browser, press %
+                    # to fix contrast, Q to quit)
 

reform2-imx8mq/reform-tools_1.0-5/lib/systemd/system-shutdown/reform-poweroff

+#!/bin/sh
+
+sync
+echo 'xPWR0' > /dev/hidraw0
+
+