diff --git a/ChangeLog b/ChangeLog index df79c49..6f29b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ SystemRescueCd ChangeLog ======================== +------------------------------------------------------------------------------- +6.0.2 (2019-02-21): +------------------------------------------------------------------------------- +* Updated kernel to Long-Term-Supported linux-4.19.24 +* Added packages: borg, nwipe, lshw, zerofree, joe, rkhunter, strace +* Replaced Notepadqq graphical editor with FeatherPad to save space + ------------------------------------------------------------------------------- 6.0.1 (2019-02-09): ------------------------------------------------------------------------------- diff --git a/VERSION b/VERSION index 5fe6072..9b9a244 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.1 +6.0.2 diff --git a/airootfs/etc/modprobe.d/sysresccd.conf b/airootfs/etc/modprobe.d/sysresccd.conf new file mode 100644 index 0000000..1c85cd7 --- /dev/null +++ b/airootfs/etc/modprobe.d/sysresccd.conf @@ -0,0 +1 @@ +softdep tg3 pre: broadcom diff --git a/airootfs/root/.config/xfce4/panel/launcher-5/15481895254.desktop b/airootfs/root/.config/xfce4/panel/launcher-5/15481895254.desktop index 5d375ae..f71bfff 100644 --- a/airootfs/root/.config/xfce4/panel/launcher-5/15481895254.desktop +++ b/airootfs/root/.config/xfce4/panel/launcher-5/15481895254.desktop @@ -1,24 +1,19 @@ [Desktop Entry] -Encoding=UTF-8 -Name=Notepadqq -GenericName=Notepadqq source code editor -Comment=Edit source code files -Exec=notepadqq --allow-root %U +Name=FeatherPad +GenericName=Text Editor +Comment=Lightweight Qt5 text editor +Exec=featherpad %F +Icon=featherpad Terminal=false Type=Application -StartupNotify=false -MimeType=text/plain;text/html;text/x-php;text/x-c;text/x-shellscript; -Icon=notepadqq -Categories=Development;Utility;TextEditor; -Actions=Window;Document; -X-XFCE-Source=file:///usr/share/applications/notepadqq.desktop +MimeType=text/plain; +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 Window] -Name=Open a New Window -Exec=notepadqq --allow-root --new-window -OnlyShowIn=Unity; +[Desktop Action new-window] +Name=New Window +Exec=featherpad --win -[Desktop Action Document] -Name=Open a New Document -Exec=notepadqq --allow-root -OnlyShowIn=Unity; diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index b1259f7..64a1f47 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -12,8 +12,10 @@ cp -aT /etc/skel/ /root/ # Permissions chmod 700 /root chown root:root /root -R -chmod 755 /etc/systemd/scripts/sysresccd-* -chown root:root /etc/systemd/scripts/sysresccd-* +chmod 755 /etc/systemd/scripts/* +chown root:root /etc/systemd -R +chown root:root /etc/modprobe.d -R +chown root:root /etc/{fstab,hostname} # Configuration sed -i 's/#\(PermitRootLogin \).\+/\1yes\nAllowUsers root/' /etc/ssh/sshd_config @@ -37,12 +39,12 @@ systemctl set-default multi-user.target # Cleanup find /usr/lib -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete -# Fix desktop -sed -i -e 's!Exec=notepadqq!Exec=notepadqq --allow-root!g' /usr/share/applications/notepadqq.desktop +# Update pacman.conf +sed -i -e '/# ==== BEGIN customrepos ====/,/# ==== END customrepos ====/d' /etc/pacman.conf # Customizations /usr/bin/updatedb # Packages -pacman -Qe > /root/packages-list.txt +pacman -Q > /root/packages-list.txt pacman -Qi | egrep '^(Name|Installed)' | cut -f2 -d':' | paste - - | column -t | sort -nrk 2 | grep MiB > /root/packages-size.txt diff --git a/airootfs/usr/bin/bashlogin b/airootfs/usr/bin/bashlogin index ac9c39e..b52de39 100755 --- a/airootfs/usr/bin/bashlogin +++ b/airootfs/usr/bin/bashlogin @@ -37,7 +37,7 @@ echo -e " Type ${lc2}startx${dc2} to run the graphical environment" echo -e " X.Org comes with the XFCE environment and several graphical tools:" echo -e " ${dc1}-${dc2} Partition manager:..${lc2}gparted${dc2}" echo -e " ${dc1}-${dc2} Web browser:........${lc2}firefox${dc2}" -echo -e " ${dc1}-${dc2} Text editor:........${lc2}notepadqq${dc2}" +echo -e " ${dc1}-${dc2} Text editor:........${lc2}featherpad${dc2}" echo fbecho diff --git a/build.sh b/build.sh index e72b290..86f8889 100755 --- a/build.sh +++ b/build.sh @@ -92,6 +92,10 @@ make_setup_mkinitcpio() { gpg --export ${gpg_key} >${work_dir}/gpgkey exec 17<>${work_dir}/gpgkey fi + + mkdir -p ${work_dir}/x86_64/airootfs/etc/modprobe.d + cp ${script_path}/airootfs/etc/modprobe.d/* ${work_dir}/x86_64/airootfs/etc/modprobe.d/ + ARCHISO_GNUPG_FD=${gpg_key:+17} mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-lts -g /boot/sysresccd.img' run if [[ ${gpg_key} ]]; then exec 17<&- diff --git a/mkinitcpio.conf b/mkinitcpio.conf index c04f1dc..f3f4ebe 100644 --- a/mkinitcpio.conf +++ b/mkinitcpio.conf @@ -1,2 +1,3 @@ +FILES=(/etc/modprobe.d/sysresccd.conf) HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/packages.x86_64 b/packages.x86_64 index 5eb8122..461b071 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -1,6 +1,7 @@ arch-install-scripts atop b43-fwcutter +borg btrfs-progs chntpw cifs-utils @@ -20,6 +21,7 @@ elinks ethtool exfat-utils f2fs-tools +featherpad firefox fsarchiver geany @@ -37,11 +39,13 @@ iotop ipw2100-fw ipw2200-fw irssi +joe keepassxc lftp lightdm linux-atm linux-lts-headers +lshw lsof lsscsi lzip @@ -58,10 +62,10 @@ networkmanager-vpnc nfs-utils nilfs-utils nmap -notepadqq ntfs-3g ntp nvme-cli +nwipe openconnect openssh openvpn @@ -74,6 +78,7 @@ pptpclient pv rdesktop refind-efi +rkhunter rp-pppoe rsync ruby @@ -81,6 +86,7 @@ screen sdparm sg3_utils smartmontools +strace sudo sysstat tcpdump @@ -115,5 +121,6 @@ xorg-server xorg-xinit yubikey-manager-qt yubikey-personalization-gui +zerofree zile zip diff --git a/pacman.conf b/pacman.conf index 3531a05..065fdbf 100644 --- a/pacman.conf +++ b/pacman.conf @@ -70,6 +70,7 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +# ==== BEGIN customrepos ==== #[archrepo] #Server = http://archrepo.system-rescue-cd.org/archpkgs/ #SigLevel = Optional TrustAll @@ -77,6 +78,7 @@ LocalFileSigLevel = Optional [custompkgs] Server = http://archrepo.system-rescue-cd.org/custompkgs/ SigLevel = Optional TrustAll +# ==== END customrepos ==== [core] Include = /etc/pacman.d/mirrorlist