mirror of
https://github.com/nchevsky/systemrescue-zfs.git
synced 2026-01-12 03:30:41 +01:00
Compare commits
1 commit
master
...
v10.01+2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
aaf018df1e |
48
ChangeLog
48
ChangeLog
|
|
@ -1,54 +1,6 @@
|
|||
SystemRescue ChangeLog
|
||||
======================
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
12.00 (2025-03-15):
|
||||
------------------------------------------------------------------------------
|
||||
* Updated the kernel to the Long-Term-Supported linux-6.12.19
|
||||
* Support for bcachefs (kernel module + file system tools + support in GParted)
|
||||
* Applied workaround to avoid possible display issues affecting grub (#399)
|
||||
* Updated disk utilities: GParted-1.7.0, nwipe-0.38, dump-0.4b49
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
11.03 (2024-12-07):
|
||||
------------------------------------------------------------------------------
|
||||
* Updated the kernel to the Long-Term-Supported linux-6.6.63
|
||||
* Updated custom packages: blocksync-fast-1.0.6, firefox-esr-128.5.1
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
11.02 (2024-08-29):
|
||||
------------------------------------------------------------------------------
|
||||
* Updated the kernel to the Long-Term-Supported linux-6.6.47
|
||||
* Updated custom packages: blocksync-fast-1.0.5, firefox-esr-128.1.0, nwipe-0.37
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
11.01 (2024-05-04):
|
||||
------------------------------------------------------------------------------
|
||||
* Updated the kernel to the Long-Term-Supported linux-6.6.30
|
||||
* Added helper script to add support for ZFS in a custom SystemRescue ISO (#359)
|
||||
* Added firmwares for Qlogic Cards: linux-firmware-qlogic (#374)
|
||||
* Updated disk utilities: GParted-1.6.0, nwipe 0.36
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
11.00 (2024-01-28):
|
||||
------------------------------------------------------------------------------
|
||||
* Updated the kernel to the Long-Term-Supported linux-6.6.14
|
||||
* Added option "ssh_known_hosts" in yaml config to trust SSH CAs signatures on host keys
|
||||
* Fix the "findroot" boot option when /sbin/init is an absolute symlink (#340)
|
||||
* Fix the "findroot" loop when the password to any encrypted device is unknown (#342)
|
||||
* Update XFCE Configuration (enabled screen saver, added battery icon)
|
||||
* Package "dstat" has been replaced with "dool" which is a fork of dstat
|
||||
* Added bcachefs-tools (file system utilities for bcachefs, no kernel module yet)
|
||||
* Added blocksync-fast (block device sync tool for block-based backups) (#361)
|
||||
* Added sleuthkit (tools for raw file system inspection) (#349)
|
||||
* Added timeshift (snapshot-based backup program) (#350)
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
10.02 (2023-09-16):
|
||||
------------------------------------------------------------------------------
|
||||
* Added nmon (Nigel's Performance Monitoring tool for Linux) (#351)
|
||||
* Added libldm (Tools for managing Microsoft Windows Dynamic Disks) (#348)
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
10.01 (2023-05-27):
|
||||
------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
custom: ['http://cash.app/$nchevsky', 'http://paypal.me/nchevsky', 'https://account.venmo.com/u/nchevsky']
|
||||
github: nchevsky
|
||||
17
README.md
17
README.md
|
|
@ -1,11 +1,12 @@
|
|||
# Overview
|
||||
|
||||
**SystemRescue+ZFS** is a fork of the [SystemRescue](http://www.system-rescue.org/) distribution (based on [Arch Linux](https://archlinux.org/)) with the following improvements:
|
||||
**SystemRescue+ZFS** is a fork of the [SystemRescue](http://www.system-rescue.org/) distribution (based on [Arch Linux](https://www.archlinux.org)) with the following improvements:
|
||||
|
||||
- [ZFS](https://github.com/archzfs/archzfs/) supported out of the box
|
||||
- [Serial console](#serial-console) enabled for all boot options, including [Memtest86+](https://www.memtest.org/)
|
||||
- EFI boot progress indicators for the kernel/initramfs/system stages
|
||||
- [ISO image](https://github.com/nchevsky/systemrescue-zfs/releases) below 1 GiB in size
|
||||
- Headers and done vs. skipped indicators for each build step
|
||||
- Extra polish
|
||||
|
||||
# Serial console
|
||||
|
||||
|
|
@ -23,16 +24,14 @@ A serial terminal is enabled out of the box on `ttyS0`/`COM1` at 115,200 baud. I
|
|||
|
||||
# Building
|
||||
|
||||
```sh
|
||||
$ sudo ./build.sh [-d] [-v]
|
||||
```
|
||||
`$ sudo ./build.sh [-d] [-v]`
|
||||
|
||||
- `-d`: Use fast compression, significantly speeding up development builds.
|
||||
- `-d`: Turn off compression, significantly speeding up development builds.
|
||||
- `-v`: Print more information while building (strongly recommended).
|
||||
|
||||
## Dependencies
|
||||
|
||||
[Arch Linux](https://archlinux.org/download/) with the following packages installed:
|
||||
[Arch Linux](https://www.archlinux.org) with the following packages installed:
|
||||
- `arch-install-scripts`
|
||||
- `archiso` from the custom [SystemRescue repository](https://sysrescuerepo.system-rescue.org/) ⚠️
|
||||
- `base-devel`
|
||||
|
|
@ -48,9 +47,7 @@ The state of successful [build steps](#steps) is persisted in `work/build.make_*
|
|||
|
||||
### Full rebuild
|
||||
|
||||
```sh
|
||||
$ sudo rm work/build.make_*
|
||||
```
|
||||
`$ sudo rm work/build.make_*`
|
||||
|
||||
### Partial rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -17,15 +17,12 @@ run_hook() {
|
|||
if cryptsetup isLuks ${curdev} >/dev/null 2>&1
|
||||
then
|
||||
echo "A passphrase is required to access device ${curdev}:"
|
||||
local cryptname="luks-${curdev##*/}"
|
||||
local cryptname="${curdev##*/}"
|
||||
local cryptargs=""
|
||||
if ! cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs}; then
|
||||
if ! cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs}; then
|
||||
# each cryptsetup call offers 3 tries to enter a valid password
|
||||
# all 6 failed failed, so continue with the next device
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
while ! eval cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs}
|
||||
do
|
||||
sleep 2;
|
||||
done
|
||||
if [ ! -e "/dev/mapper/${cryptname}" ]
|
||||
then
|
||||
err "Password succeeded but ${cryptname} creation failed, aborting..."
|
||||
|
|
@ -48,15 +45,7 @@ run_hook() {
|
|||
echo "Checking for ${init} on device ${curdev} ..."
|
||||
if mount -r ${curdev} ${newroot} 2>/dev/null
|
||||
then
|
||||
# check if /sbin is a symlink and if it is absolute or relative
|
||||
if test -L "${newroot}/sbin" && readlink "${newroot}/sbin" | grep -q "^/"
|
||||
then
|
||||
echo "Absolute /sbin symlink on device ${curdev}"
|
||||
echo "This usrmerge layout is currently not supported by findroot."
|
||||
umount ${newroot}
|
||||
continue
|
||||
fi
|
||||
if test -x ${newroot}/${init} || test -L ${newroot}/${init}
|
||||
if test -x ${newroot}/${init}
|
||||
then
|
||||
echo "Found ${init} on device ${curdev}"
|
||||
rootcount=$((rootcount + 1))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
\e[01;31m============== \e[01;37m%ISO_APPLICATION% %ISO_VERSION%\e[01;31m --- \e[01;37m\l \e[01;31m==============
|
||||
\e[01;31m%ISO_URL%
|
||||
\e[01;31m%ISO_URL%
|
||||
|
||||
\e[00;31m*\e[01;31m Console environment:\e[00;37m
|
||||
Run \e[01;37msetkmap\e[00;37m or press ↑ to choose the keyboard layout.
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
\e[00;31m*\e[01;31m Graphical environment:\e[00;37m
|
||||
Run \e[01;37mstartx\e[00;37m to start the graphical environment.
|
||||
X.Org comes with the XFCE environment and several graphical tools:
|
||||
\e[00;31m-\e[00;37m Partition manager: \e[01;37mGParted\e[00;37m
|
||||
\e[00;31m-\e[00;37m Web browser: \e[01;37mWeb\e[00;37m
|
||||
\e[00;31m-\e[00;37m Text editor: \e[01;37mMousepad\e[00;37m
|
||||
\e[00;31m-\e[00;37m Partition manager: \e[01;37mgparted\e[00;37m
|
||||
\e[00;31m-\e[00;37m Web browser: \e[01;37mfirefox\e[00;37m
|
||||
\e[00;31m-\e[00;37m Text editor: \e[01;37mfeatherpad\e[00;37m
|
||||
|
||||
|
|
|
|||
|
|
@ -92,3 +92,5 @@ Include = /etc/pacman.d/mirrorlist
|
|||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
|
|
|||
|
|
@ -90,3 +90,5 @@ Include = /etc/pacman.d/mirrorlist-snapshot
|
|||
[extra]
|
||||
Include = /etc/pacman.d/mirrorlist-snapshot
|
||||
|
||||
[community]
|
||||
Include = /etc/pacman.d/mirrorlist-snapshot
|
||||
|
|
|
|||
|
|
@ -404,38 +404,6 @@ if 'sysconfig' in config and 'authorized_keys' in config['sysconfig'] and \
|
|||
print(e)
|
||||
errcnt+=1
|
||||
|
||||
# ==============================================================================
|
||||
# configure SSH known hosts
|
||||
# do this after late-loading SRMs because we want to add to what is contained in a SRM
|
||||
# ==============================================================================
|
||||
|
||||
if 'sysconfig' in config and 'ssh_known_hosts' in config['sysconfig'] and \
|
||||
config['sysconfig']['ssh_known_hosts'] and isinstance(config['sysconfig']['ssh_known_hosts'], dict):
|
||||
print(f"====> Adding SSH known hosts ...")
|
||||
# create list of key lines we want to add
|
||||
keylines = []
|
||||
for key, value in config['sysconfig']['ssh_known_hosts'].items():
|
||||
keylines.append(f"{key} {value}")
|
||||
|
||||
try:
|
||||
if os.path.exists("/etc/ssh/ssh_known_hosts"):
|
||||
# check if we already have one of our keylines in the file: don't add it again
|
||||
with open("/etc/ssh/ssh_known_hosts", "r") as khfile:
|
||||
for line in khfile:
|
||||
line = line.strip()
|
||||
# iterate backwards through the list to make deletion safe
|
||||
for i in range(len(keylines)-1, -1, -1):
|
||||
if line == keylines[i]:
|
||||
del keylines[i]
|
||||
if keylines:
|
||||
with open("/etc/ssh/ssh_known_hosts", "a") as khfile:
|
||||
# append all our keylines
|
||||
for line in keylines:
|
||||
khfile.write(f"{line}\n")
|
||||
except Exception as e:
|
||||
print(e)
|
||||
errcnt+=1
|
||||
|
||||
# ==============================================================================
|
||||
# configure bash_history
|
||||
# do this after late-loading SRMs because we want to add to what is contained in a SRM
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
[Default Applications]
|
||||
application/pdf=org.gnome.Epiphany.desktop
|
||||
x-scheme-handler/http=org.gnome.Epiphany.desktop
|
||||
x-scheme-handler/https=org.gnome.Epiphany.desktop
|
||||
application/pdf=firefox-esr.desktop
|
||||
|
||||
[Added Associations]
|
||||
application/pdf=firefox-esr.desktop;
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
WebBrowser=epiphany
|
||||
WebBrowser=custom-WebBrowser
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=Manual
|
||||
Comment=SystemRescue manual
|
||||
Exec=epiphany file:///usr/share/sysrescue/html/manual/index.html
|
||||
Exec=firefox-esr file:///usr/share/sysrescue/html/manual/index.html
|
||||
Icon=help-browser
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
[Desktop Entry]
|
||||
Name=Mousepad
|
||||
Name=FeatherPad
|
||||
GenericName=Text Editor
|
||||
Comment=Simple Text Editor
|
||||
Exec=mousepad
|
||||
Icon=org.xfce.mousepad
|
||||
Comment=Lightweight Qt5 text editor
|
||||
Exec=featherpad %F
|
||||
Icon=featherpad
|
||||
Terminal=false
|
||||
Type=Application
|
||||
MimeType=text/plain;
|
||||
Categories=Utility;TextEditor;
|
||||
Categories=Qt;Utility;TextEditor;
|
||||
X-KDE-StartupNotify=false;
|
||||
Keywords=Text;Editor;Plaintext;
|
||||
Actions=new-window;
|
||||
X-XFCE-Source=file:///usr/share/applications/featherpad.desktop
|
||||
|
||||
[Desktop Action new-window]
|
||||
Name=New Window
|
||||
Exec=featherpad --win
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
<property name="<Primary>Escape" type="string" value="xfdesktop --menu"/>
|
||||
<property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
|
||||
<property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
|
||||
<property name="<Primary><Alt>f" type="string" value="firefox-esr"/>
|
||||
<property name="<Primary><Alt>g" type="string" value="gparted"/>
|
||||
<property name="<Primary><Alt>t" type="string" value="xfce4-terminal"/>
|
||||
<property name="override" type="bool" value="true"/>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<channel name="xfce4-notifyd" version="1.0">
|
||||
<property name="log-max-size-enabled" type="bool" value="true"/>
|
||||
<property name="applications" type="empty">
|
||||
<property name="known_applications" type="array">
|
||||
<value type="string" value="org.freedesktop.network-manager-applet"/>
|
||||
<value type="string" value="Xfce volume control"/>
|
||||
<value type="string" value="xfce4-power-manager"/>
|
||||
<value type="string" value="xfce4-settings-helper"/>
|
||||
</property>
|
||||
</property>
|
||||
</channel>
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
<value type="int" value="11"/>
|
||||
<value type="int" value="6"/>
|
||||
<value type="int" value="7"/>
|
||||
<value type="int" value="8"/>
|
||||
<value type="int" value="9"/>
|
||||
<value type="int" value="10"/>
|
||||
</property>
|
||||
|
|
@ -35,7 +36,7 @@
|
|||
</property>
|
||||
<property name="plugin-3" type="string" value="launcher">
|
||||
<property name="items" type="array">
|
||||
<value type="string" value="/usr/share/applications/org.gnome.Epiphany.desktop"/>
|
||||
<value type="string" value="15552315792.desktop"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="plugin-4" type="string" value="launcher">
|
||||
|
|
@ -58,21 +59,17 @@
|
|||
<property name="expand" type="bool" value="true"/>
|
||||
<property name="style" type="uint" value="0"/>
|
||||
</property>
|
||||
<property name="plugin-8" type="string" value="pulseaudio">
|
||||
<property name="enable-keyboard-shortcuts" type="bool" value="true"/>
|
||||
</property>
|
||||
<property name="plugin-9" type="string" value="systray">
|
||||
<property name="icon-size" type="int" value="0"/>
|
||||
<property name="known-legacy-items" type="array">
|
||||
<value type="string" value="network"/>
|
||||
<value type="string" value="networkmanager applet"/>
|
||||
<value type="string" value="xfce4-power-manager"/>
|
||||
</property>
|
||||
<property name="known-items" type="array">
|
||||
<value type="string" value="nm-applet"/>
|
||||
</property>
|
||||
</property>
|
||||
<property name="plugin-10" type="string" value="clock">
|
||||
<property name="digital-format" type="string" value="%T"/>
|
||||
<property name="digital-time-format" type="string" value="%T"/>
|
||||
<property name="digital-layout" type="uint" value="3"/>
|
||||
<property name="digital-format" type="string" value="%T">
|
||||
</property>
|
||||
</property>
|
||||
</channel>
|
||||
|
|
|
|||
|
|
@ -5,14 +5,9 @@
|
|||
<property name="power-button-action" type="uint" value="4"/>
|
||||
<property name="blank-on-ac" type="int" value="0"/>
|
||||
<property name="blank-on-battery" type="int" value="0"/>
|
||||
<property name="dpms-on-ac-sleep" type="uint" value="5"/>
|
||||
<property name="dpms-on-battery-sleep" type="uint" value="5"/>
|
||||
<property name="dpms-on-ac-sleep" type="uint" value="0"/>
|
||||
<property name="dpms-on-battery-sleep" type="uint" value="0"/>
|
||||
<property name="dpms-on-ac-off" type="uint" value="0"/>
|
||||
<property name="dpms-on-battery-off" type="uint" value="0"/>
|
||||
<property name="brightness-switch-restore-on-exit" type="int" value="0"/>
|
||||
<property name="brightness-switch" type="int" value="0"/>
|
||||
<property name="brightness-on-battery" type="uint" value="9"/>
|
||||
<property name="general-notification" type="bool" value="true"/>
|
||||
<property name="show-tray-icon" type="bool" value="true"/>
|
||||
</property>
|
||||
</channel>
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
|
|||
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
|
||||
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
|
||||
|
||||
# PulseAudio takes care of volume restore
|
||||
ln -sf /dev/null /etc/udev/rules.d/90-alsa-restore.rules
|
||||
|
||||
# config symlink
|
||||
mkdir -p /etc/sysrescue/
|
||||
ln -sf /run/archiso/config/sysrescue-effective-config.json /etc/sysrescue/sysrescue-effective-config.json
|
||||
|
|
@ -39,6 +42,7 @@ systemctl enable sshd.service
|
|||
systemctl enable sysrescue-initialize-prenet.service
|
||||
systemctl enable sysrescue-initialize-whilenet.service
|
||||
systemctl enable sysrescue-autorun.service
|
||||
systemctl enable qemu-guest-agent.service
|
||||
systemctl enable var-lib-pacman\\x2drolling-local.mount
|
||||
systemctl set-default multi-user.target
|
||||
|
||||
|
|
@ -58,9 +62,6 @@ ln -sf /dev/null /etc/systemd/system-generators/systemd-gpt-auto-generator
|
|||
|
||||
# setup pacman signing key storage
|
||||
/usr/bin/pacman-key --init
|
||||
pacman-key --recv-keys 3A9917BF0DED5C13F69AC68FABEC0A1208037BE9 DDF7DB817396A49B2A2723F7403BD972F75D9D76 # archzfs (experimental, stable)
|
||||
pacman-key --lsign-key 3A9917BF0DED5C13F69AC68FABEC0A1208037BE9 # archzfs (experimental)
|
||||
pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76 # archzfs (stable)
|
||||
/usr/bin/pacman-key --populate
|
||||
rm -f /etc/pacman.d/gnupg/*~
|
||||
|
||||
|
|
@ -96,10 +97,11 @@ rm -f /usr/share/qt/translations/*
|
|||
|
||||
# Cleanup XFCE menu
|
||||
sed -i '2 i NoDisplay=true' /usr/share/applications/{xfce4-mail-reader,xfce4-web-browser}.desktop
|
||||
sed -i "s/^\(Categories=\).*\$/Categories=Utility;/" /usr/share/applications/{*ristretto*,*GHex*}.desktop
|
||||
sed -i "s/^\(Categories=\).*\$/Categories=Utility;/" /usr/share/applications/{geany,*ristretto*,*GHex*}.desktop
|
||||
|
||||
# nm-applet with application indicator enabled gives better integration with xfce4-panel's systray
|
||||
mkdir -p /usr/local/share/applications/
|
||||
mkdir -p /root/.config/autostart/ /usr/local/share/applications/
|
||||
sed 's/^Exec=nm-applet$/& --indicator/' /etc/xdg/autostart/nm-applet.desktop > /root/.config/autostart/nm-applet.desktop
|
||||
sed 's/^Exec=nm-applet$/& --indicator/' /usr/share/applications/nm-applet.desktop > /usr/local/share/applications/nm-applet.desktop
|
||||
|
||||
# Remove large/irrelevant firmwares
|
||||
|
|
@ -112,14 +114,6 @@ then
|
|||
/usr/bin/localepurge
|
||||
fi
|
||||
|
||||
# remove ZFS build dependencies
|
||||
if [ ! -L "/etc/pacman.d/hooks/71-dkms-remove.hook" ]; then
|
||||
mkdir -p /etc/pacman.d/hooks
|
||||
ln -s /dev/null /etc/pacman.d/hooks/71-dkms-remove.hook # suppress automatic removal of zfs-dkms
|
||||
fi
|
||||
pacman --noconfirm -Rdds dkms linux-lts-headers || true
|
||||
rm /etc/pacman.d/hooks/71-dkms-remove.hook
|
||||
|
||||
# Update pacman.conf
|
||||
sed -i -e '/# ==== BEGIN sysrescuerepo ====/,/# ==== END sysrescuerepo ====/d' /etc/pacman.conf
|
||||
|
||||
|
|
@ -129,6 +123,11 @@ sed -i -e '/# ==== BEGIN sysrescuerepo ====/,/# ==== END sysrescuerepo ====/d' /
|
|||
# Customizations
|
||||
/usr/bin/updatedb
|
||||
|
||||
# Trust archzfs key
|
||||
pacman-key --init
|
||||
pacman-key -r DDF7DB817396A49B2A2723F7403BD972F75D9D76
|
||||
pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76
|
||||
|
||||
# Packages
|
||||
pacman -Q > /root/packages-list.txt
|
||||
expac -H M -s "%-30n %m" | sort -rhk 2 > /root/packages-size.txt
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ errcnt=0
|
|||
|
||||
for curfile in /usr/bin/{*btrfs*,*xfs*,dislocker*,udp*,dump,restore} \
|
||||
/usr/bin/{ghex,growpart*,hardinfo,*lshw*,ms-sys,nwipe,whdd,zerofree} \
|
||||
/opt/firefox*/firefox* \
|
||||
/usr/lib/ntfs-3g/ntfs-plugin*.so \
|
||||
/usr/lib/libgbm.so* \
|
||||
/usr/lib/xorg/modules/drivers/modesetting_drv.so \
|
||||
|
|
|
|||
14
build.sh
14
build.sh
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
set -e -u
|
||||
|
||||
|
|
@ -9,8 +9,8 @@ consoles='console=ttyS0,115200 console=tty0'
|
|||
iso_application="SystemRescue+ZFS"
|
||||
iso_version="$(<${version_file})"
|
||||
iso_name=$(echo "$iso_application" | tr '[:upper:]' '[:lower:]')
|
||||
iso_label=$(echo "${iso_application}_${iso_version}" | tr "[:lower:].+ -" "[:upper:]_")
|
||||
iso_url="https://github.com/nchevsky/systemrescue-zfs"
|
||||
iso_label="${iso_application}_${iso_version}"
|
||||
iso_url="http://oss.blazis.com/systemrescue+zfs"
|
||||
iso_publisher="Nick Chevsky <${iso_url}>"
|
||||
install_dir=sysresccd
|
||||
image_info_file="${install_dir}/.imageinfo"
|
||||
|
|
@ -27,7 +27,7 @@ snapshot_date=""
|
|||
default_kernel_param="iomem=relaxed"
|
||||
documentation_dir="/usr/share/sysrescue/html"
|
||||
mkinitcpio_comp_algo="xz"
|
||||
mkinitcpio_comp_opts="-9e --threads=0 --verbose"
|
||||
mkinitcpio_comp_opts="--threads=0 --verbose"
|
||||
mkinitcpio_comp_algo_devel="zstd"
|
||||
mkinitcpio_comp_opts_devel="--threads=0 --fast --verbose"
|
||||
|
||||
|
|
@ -43,6 +43,7 @@ case ${arch} in
|
|||
mirrorlist_url='https://archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
|
||||
archive_prefix='https://archive.archlinux.org/repos/'
|
||||
archive_mirrorlist_file='mirrorlist-snapshot-x86_64'
|
||||
mkinitcpio_comp_opts="--threads=0 --lzma2=preset=9e,dict=128MiB --verbose"
|
||||
;;
|
||||
i686)
|
||||
efiarch="i386-efi"
|
||||
|
|
@ -51,6 +52,7 @@ case ${arch} in
|
|||
mirrorlist_url='https://archlinux32.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
|
||||
archive_prefix='https://archive.archlinux32.org/repos/'
|
||||
archive_mirrorlist_file='mirrorlist-snapshot-i686'
|
||||
mkinitcpio_comp_opts="--threads=0 --verbose"
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: Unsupported architecture: '${arch}'"
|
||||
|
|
@ -177,7 +179,7 @@ make_documentation() {
|
|||
rm -rf website/content/Download
|
||||
|
||||
# parameters are all relative to --source dir
|
||||
/usr/bin/hugo build --source "website/" --config "config-offline.toml" --gc \
|
||||
/usr/bin/hugo --source "website/" --config "config-offline.toml" --gc --verbose \
|
||||
--destination "../${work_dir}/${arch}/airootfs/${documentation_dir}"
|
||||
RET=$?
|
||||
|
||||
|
|
@ -297,6 +299,7 @@ make_boot() {
|
|||
# Add other aditional/extra files to ${install_dir}/boot/
|
||||
make_boot_extra() {
|
||||
cp ${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
|
||||
cp ${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
|
||||
cp ${work_dir}/${arch}/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img
|
||||
cp ${work_dir}/${arch}/airootfs/usr/share/licenses/intel-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE
|
||||
cp ${work_dir}/${arch}/airootfs/boot/amd-ucode.img ${work_dir}/iso/${install_dir}/boot/amd_ucode.img
|
||||
|
|
@ -311,6 +314,7 @@ make_syslinux() {
|
|||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||
s|%CONSOLES%|${consoles}|g;
|
||||
s|%ISO_APPLICATION%|${iso_application}|g;
|
||||
s|%ISO_URL%|${iso_url}|g;
|
||||
s|%ISO_VERSION%|${iso_version}|g;
|
||||
s|%ISO_ARCH%|${arch}|g;
|
||||
s|%DEFAULT_KERNEL_PARAM%|${default_kernel_param}|g;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM docker.io/archlinux/archlinux:latest
|
||||
FROM archlinux:latest
|
||||
RUN mkdir -p /workspace
|
||||
COPY tmpfiles/pacman.conf /etc/pacman.conf
|
||||
RUN pacman -Syyu --noconfirm strace vim archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
# Parameters validation
|
||||
if [ -z "${sysrescuearch}" ] ; then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
# Parameters validation
|
||||
if [ -z "${sysrescuearch}" ] ; then
|
||||
|
|
@ -35,7 +35,7 @@ if ! findmnt ${pkgcache} >/dev/null; then
|
|||
fi
|
||||
|
||||
# Run the build process in the container
|
||||
docker run --rm --pids-limit=4096 --user 0:0 --privileged -it --workdir /workspace \
|
||||
docker run --rm --user 0:0 --privileged -it --workdir /workspace \
|
||||
--volume=${repodir}:/workspace \
|
||||
--volume=${pkgcache}:/var/cache/pacman/pkg \
|
||||
${dockerimg} setarch ${sysrescuearch} /bin/bash /workspace/build.sh "$@"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ if [ -z "$srcd_skip_init" ]; then
|
|||
insmod all_video
|
||||
insmod videotest
|
||||
insmod videoinfo
|
||||
echo "Switching to gfxterm"
|
||||
terminal_output gfxterm
|
||||
fi
|
||||
|
||||
|
|
@ -49,14 +48,6 @@ menuentry 'Boot %ISO_APPLICATION% %ISO_VERSION% using default options' {
|
|||
echo 'Booting...'
|
||||
}
|
||||
|
||||
menuentry 'Boot %ISO_APPLICATION% %ISO_VERSION% with the firewall disabled (nofirewall)' {
|
||||
echo 'Loading kernel...'
|
||||
linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% $archiso_param %DEFAULT_KERNEL_PARAM% %CONSOLES% nofirewall
|
||||
echo 'Loading initramfs...'
|
||||
initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img
|
||||
echo 'Booting...'
|
||||
}
|
||||
|
||||
menuentry 'Boot %ISO_APPLICATION% %ISO_VERSION% and copy system to RAM (copytoram)' {
|
||||
set gfxpayload=keep
|
||||
echo 'Loading kernel...'
|
||||
|
|
|
|||
59
packages
59
packages
|
|
@ -1,17 +1,17 @@
|
|||
acpi
|
||||
alsa-utils
|
||||
amd-ucode
|
||||
archinstall
|
||||
arch-install-scripts
|
||||
at
|
||||
atop
|
||||
b43-fwcutter
|
||||
bash
|
||||
bash-completion
|
||||
bc
|
||||
bcachefs-tools
|
||||
beep
|
||||
bind-tools
|
||||
binutils
|
||||
blocksync-fast
|
||||
borg
|
||||
btrfs-progs
|
||||
busybox
|
||||
|
|
@ -29,17 +29,19 @@ crda
|
|||
cronie
|
||||
cryptsetup
|
||||
curl
|
||||
darkhttpd
|
||||
dd_rescue
|
||||
ddrescue
|
||||
dhclient
|
||||
dialog
|
||||
diffutils
|
||||
discount
|
||||
dislocker
|
||||
dmidecode
|
||||
dmraid
|
||||
dnsmasq
|
||||
dool
|
||||
dosfstools
|
||||
dstat
|
||||
dump
|
||||
dvd+rw-tools
|
||||
e2fsprogs
|
||||
|
|
@ -47,20 +49,24 @@ efibootmgr
|
|||
efitools
|
||||
efivar
|
||||
elinks
|
||||
systemrescue+zfs/epiphany
|
||||
ethtool
|
||||
exfatprogs
|
||||
expac
|
||||
ext4magic
|
||||
f2fs-tools
|
||||
fatresize
|
||||
featherpad
|
||||
file
|
||||
findutils
|
||||
firefox-esr-bin
|
||||
flashrom
|
||||
foremost
|
||||
fsarchiver
|
||||
galculator
|
||||
gawk
|
||||
systemrescue+zfs/ghex
|
||||
geany
|
||||
ghex
|
||||
git
|
||||
gnu-netcat
|
||||
gnupg
|
||||
gpart
|
||||
|
|
@ -72,7 +78,7 @@ grml-zsh-config
|
|||
growpartfs
|
||||
grsync
|
||||
grub
|
||||
gsettings-desktop-schemas
|
||||
gsettings-desktop-schemas-dummy
|
||||
gsmartcontrol
|
||||
gzip
|
||||
hardinfo
|
||||
|
|
@ -90,18 +96,19 @@ ipmitool
|
|||
iproute2
|
||||
iptables
|
||||
iputils
|
||||
irssi
|
||||
jfsutils
|
||||
jq
|
||||
keepassxc
|
||||
kexec-tools
|
||||
less
|
||||
lftp
|
||||
libfaketime
|
||||
libisoburn
|
||||
libldm
|
||||
libvncserver
|
||||
systemrescue+zfs/linux-firmware
|
||||
linux-atm
|
||||
linux-firmware
|
||||
linux-firmware-bnx2x
|
||||
linux-firmware-qlogic
|
||||
linux-firmware-marvell
|
||||
linux-lts
|
||||
linux-lts-headers
|
||||
|
|
@ -118,6 +125,7 @@ lvm2
|
|||
lz4
|
||||
lzip
|
||||
lzop
|
||||
m4
|
||||
man-db
|
||||
man-pages
|
||||
mc
|
||||
|
|
@ -125,13 +133,12 @@ mdadm
|
|||
memtest86+
|
||||
memtest86+-efi
|
||||
memtester
|
||||
systemrescue+zfs/mesa-minimal
|
||||
mesa-minimal
|
||||
minicom
|
||||
mkinitcpio
|
||||
mkinitcpio-nfs-utils
|
||||
mlocate
|
||||
moreutils
|
||||
mousepad
|
||||
ms-sys
|
||||
mtools
|
||||
mtr
|
||||
|
|
@ -150,7 +157,6 @@ nfs-utils
|
|||
nilfs-utils
|
||||
nmap
|
||||
nm-connection-editor
|
||||
nmon
|
||||
ntfs-3g
|
||||
ntfs-3g-system-compression
|
||||
ntp
|
||||
|
|
@ -169,6 +175,7 @@ parted
|
|||
partimage
|
||||
pass
|
||||
patch
|
||||
pavucontrol
|
||||
pciutils
|
||||
pcre
|
||||
perl
|
||||
|
|
@ -183,18 +190,22 @@ ppp
|
|||
pptpclient
|
||||
procps-ng
|
||||
psmisc
|
||||
pulseaudio-alsa
|
||||
pv
|
||||
python
|
||||
python-llfuse
|
||||
python-pip
|
||||
python-pythondialog
|
||||
python-yaml
|
||||
qemu-guest-agent
|
||||
qemu-img
|
||||
qtpass
|
||||
rclone
|
||||
rdesktop
|
||||
rdiff-backup
|
||||
readline
|
||||
refind
|
||||
reiserfsprogs
|
||||
remmina
|
||||
ristretto
|
||||
rkhunter
|
||||
|
|
@ -208,11 +219,11 @@ sdparm
|
|||
sed
|
||||
sg3_utils
|
||||
shadow
|
||||
sleuthkit
|
||||
smartmontools
|
||||
smbclient
|
||||
socat
|
||||
speedtest-cli
|
||||
sqlite
|
||||
squashfs-tools
|
||||
sshfs
|
||||
strace
|
||||
|
|
@ -223,10 +234,11 @@ sudo
|
|||
syslinux
|
||||
sysstat
|
||||
tar
|
||||
tcl
|
||||
tcpdump
|
||||
testdisk
|
||||
thunar-archive-plugin
|
||||
timeshift
|
||||
tk
|
||||
tmux
|
||||
traceroute
|
||||
tree
|
||||
|
|
@ -235,6 +247,7 @@ udftools
|
|||
udpcast
|
||||
unrar
|
||||
unzip
|
||||
usb_modeswitch
|
||||
usbutils
|
||||
util-linux
|
||||
vi
|
||||
|
|
@ -254,7 +267,9 @@ wqy-microhei
|
|||
wvdial
|
||||
x11vnc
|
||||
xarchiver
|
||||
xfburn
|
||||
xfce4
|
||||
xfce4-pulseaudio-plugin
|
||||
xfce4-screenshooter
|
||||
xfce4-taskmanager
|
||||
xfsdump
|
||||
|
|
@ -262,24 +277,14 @@ xfsprogs
|
|||
xkbsel
|
||||
xkeyboard-config
|
||||
xl2tpd
|
||||
xorg-apps
|
||||
xorg-drivers
|
||||
xorg-server
|
||||
xorg-setxkbmap
|
||||
xorg-xauth
|
||||
xorg-xbacklight
|
||||
xorg-xdpyinfo
|
||||
xorg-xev
|
||||
xorg-xhost
|
||||
xorg-xinit
|
||||
xorg-xinput
|
||||
xorg-xkill
|
||||
xorg-xmodmap
|
||||
xorg-xprop
|
||||
xorg-xrandr
|
||||
xorg-xset
|
||||
xorg-xwininfo
|
||||
xz
|
||||
yay
|
||||
yubikey-manager
|
||||
yubikey-personalization-gui
|
||||
zerofree
|
||||
zfs-dkms
|
||||
zip
|
||||
|
|
|
|||
|
|
@ -77,12 +77,7 @@ SigLevel = Optional TrustAll
|
|||
# ==== END sysrescuerepo ====
|
||||
|
||||
[archzfs]
|
||||
Server = https://github.com/archzfs/archzfs/releases/download/experimental
|
||||
SigLevel = TrustAll
|
||||
|
||||
[systemrescue+zfs]
|
||||
Server = http://oss.blazis.com/pacman/$repo/$arch
|
||||
SigLevel = Optional
|
||||
Server = https://archzfs.com/$repo/$arch
|
||||
|
||||
[core]
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
|
|
|||
|
|
@ -9,15 +9,6 @@ LINUX boot/%ISO_ARCH%/vmlinuz
|
|||
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
|
||||
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% %DEFAULT_KERNEL_PARAM% %CONSOLES%
|
||||
|
||||
LABEL sysresccd_nofirewall
|
||||
TEXT HELP
|
||||
Boot the SystemRescue live medium with the firewall disabled.
|
||||
ENDTEXT
|
||||
MENU LABEL Boot SystemRescue with the firewall disabled (nofirewall)
|
||||
LINUX boot/%ISO_ARCH%/vmlinuz
|
||||
INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img
|
||||
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% %DEFAULT_KERNEL_PARAM% %CONSOLES% nofirewall
|
||||
|
||||
LABEL sysresccd_copytoram
|
||||
TEXT HELP
|
||||
Boot the SystemRescue live medium and copy system to RAM
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
sysconfig:
|
||||
bookmarks: false # don't generate Firefox configuration
|
||||
2
website
2
website
|
|
@ -1 +1 @@
|
|||
Subproject commit 632fcb4024ebd1f5b191da46b581780f8135b92e
|
||||
Subproject commit 8c3da5be7fc2427f07115acdc9ad8823f0847d44
|
||||
Loading…
Reference in a new issue