2 files changed, 308 insertions, 281 deletions
diff --git a/hrmpf.packages b/hrmpf.packages
index a94e360..47f982b 100644
--- a/hrmpf.packages
+++ b/hrmpf.packages
@@ -1,379 +1,406 @@
+# diagnosis
 acpi
+atop
+bonnie++
+cpuburn
+dmidecode
+dstat
+extrace
+fatrace
+hdapsd
+hddtemp
+htop
+ioping
+iotop
+lm_sensors
+lshw
+lsof
+ltrace
+mcelog
+nethogs
+pciutils
+powertop
+smartmontools
+strace
+sysstat
+tiptop
+usbutils
+
+# networking
 aiccu
+autossh
+bind-utils
+bmon
+bwm-ng
+bridge-utils
+ddclient
+dhcpcd
+dnsmasq
+ebtables
+ethtool
+ettercap
+fastd
+fping
+horst
+hostapd
+ifenslave
+iftop
+inetutils-ftp
+inetutils-inetd
+inetutils-talk
+inetutils-telnet
+iodine
+ipcalc
+iperf
+iproute2
+ipset
+iptables
+iptraf-ng
+iputils
+iw
+ldns
+liboping
+miniupnpc
+miruo
+mosh
+msmtp
+mtr
+ndisc6
+net-snmp
+net-tools
+nfs-utils
+nftables
+nginx
+ngrep
+nmon
+nsd
+ntp
+openbsd-netcat
+opensmtpd
+openssh
+openvpn
+pchar
+polipo
+polysh
+ppp
+pptpclient
+privoxy
+procmail
+radvd
+rfkill
+rpcbind
+rsyslog
+s6-dns
+s6-networking
+shorewall
+shorewall6
+slurm
+socat
+swaks
+tcpdump
+tftp-hpa
+tlsdate
+tor
+traceroute
+unbound
+vde2
+vpnc
+wavemon
+whois
+wireless_tools
+wol
+wpa_supplicant
+wvdial
+xinetd
+
+# general system tools
 alsa-lib
 alsa-utils
-apg
 at
-atop
 attr
-autoconf
-automake
-autossh
 bc
 beep
-biew
-bind-utils
-binutils
-bison
-bmon
-bonnie++
-bridge-utils
-bsdcpio
-bsdtar
-btrfs-progs
 busybox
-bwm-ng
 byobu
-bzip2
-cabextract
 cdrtools
-cksfv
-cmus
-cmus-flac
-cmus-libao
-cmus-mpc
 colordiff
-cpio
-cpuburn
 cpulimit
 cpupower
 crda
 cronie
-cryptsetup
-csync
-csync2
 curl
-cvs
 daemonize
-dar
-dash
 dateutils
 db
-ddate
-ddclient
-ddrescue
 debootstrap
 detox
-dhcpcd
-dhex
 di
 dialog
 diffutils
-dmidecode
-dmraid
-dnsmap
-dnsmasq
 dos2unix
-dosfstools
-dpkg
-dstat
 dtach
 duff
-dumpet
-duplicity
 dvtm
-e2fsprogs
-ebtables
-ed
-edbrowse
-efibootmgr
-efivar
 efmd
-elinks
-emacs
-ent
 entr
-es
-ethtool
-ettercap
 execline
-exfat-utils
-ext4magic
-extrace
-extundelete
-fastd
-fatrace
 fbset
 fdupes
 file
 findutils
 firejail
-flashrom
-flex
-foremost
-fping
-fuse
-fuse-exfat
-fuse-sshfs
 gawk
-gcc
-gdb
-gettext
-git
-git-perl
-glibc-devel
-gnupg
-gnupg2
 gpm
-gptfdisk
 grep
-grub
-grub-i386-efi
-grub-x86_64-efi
-gummiboot
-gzip
-haveged
-hdapsd
-hddtemp
-hdparm
-hfsprogs
-horst
-hostapd
-ht
-htop
-ifenslave
-iftop
-ii
-inetutils-ftp
-inetutils-inetd
-inetutils-talk
-inetutils-telnet
 inotify-tools
-iodine
-ioping
-iotop
-ipcalc
-iperf
-iproute2
-ipset
-iptables
-iptraf-ng
-iputils
-ired
 irqbalance
-irssi
-iw
-jfsutils
-jhead
-john
-jupp
 kbd
 kbd-data
 kexec-tools
-keyutils
-kpartx
-ksh
-ldns
 less
-lftp
-libao-sndio
-liboping
-libressl
-libtool
-lilo
 linux-firmware
-lm_sensors
-logrotate
-lrzip
 lrzsz
-lshw
-lsof
-ltrace
-lvm2
+logrotate
 lxc
-lynx
-lzop
-m4
-make
 mbuffer
 mc
-mcabber
-mcelog
-mdadm
-mercurial
 metalog
-mg
 miller
-miniupnpc
-miruo
-mksh
 mmv
-mosh
-mpg123
-ms-sys
-msmtp
 msrc_base
-mt-st
-mtools
-mtr
-mtree
 multitail
-mutt
-nano
-nbd
 ncdu
-ndisc6
-net-snmp
-net-tools
-nethack
-nethogs
-nfs-utils
-nftables
-nginx
-ngrep
-nmap
-nmon
 nq
-nsd
-ntfs-3g
-ntp
 numactl
-nvi
-nwipe
 odo
-open-iscsi
-openbsd-netcat
-opensmtpd
-openssh
-openvpn
 oue
 outils
-p7zip
 par
-par2cmdline
 parallel
-partclone
-parted
-passwdqc
-patch
-pax
 pax-utils
-pbzip2
-pchar
-pciutils
 perl
-pev
 pflask-git
 picocom
-pigz
-pixz
-pkg-config
 pm-utils
 pmr
-polipo
-polysh
-posh
-powertop
-ppp
-pptpclient
-privoxy
-procmail
 progress
 pv
-pwgen
 python
-radvd
 ranger
-rc
-rcs
 rdfind
-rdumpfs
-redo
 reptyr
-rfkill
-rkhunter
 rlwrap
-rng-tools
-rpcbind
-rpmextract
-rsnapshot
-rsync
-rsyslog
-rtorrent
-s-nail
-s3cmd
-s3fs-fuse
 s6
-s6-dns
-s6-networking
 sample
 schedtool
 screen
-scrypt
-sdparm
-sg3_utils
-sharutils
-shorewall
-shorewall6
-sic
-simple-mtpfs
-sleuthkit
-slurm
-smartmontools
-sndio
-socat
 socklog-void
-squashfs-tools
-ssdeep
-sslscan
-strace
 stunnel
 sudo
-swaks
-sysfsutils
-syslinux
-sysstat
-tar
-tc-play
-tcpdump
-tcsh
-testdisk
-texinfo
-tftp-hpa
-tgt
 the_silver_searcher
 time
-tin
-tiptop
-tlsdate
 tmux
-tor
-traceroute
 tree
-trn
 ttyrec
-tweak
-unbound
-unison
-unrar
-unzip
-usbutils
 util-linux
-vbindiff
-vboot-utils
-vde2
-vim
-vorbis-tools
-vpnc
-w3m
-wavemon
 wgetpaste
 which
-whois
-wireless_tools
-wol
-wpa_supplicant
-wvdial
-xfsdump
-xfsprogs
-xinetd
 xjobs
 xmlstarlet
 xtools
-xz
-zbackup
+
+# filesystems & storage
+btrfs-progs
+cryptsetup
+dmraid
+dosfstools
+dumpet
+e2fsprogs
+exfat-utils
+ext4magic
+fuse
+fuse-exfat
+fuse-sshfs
+gptfdisk
+hdparm
+hfsprogs
+jfsutils
+kpartx
+lvm2
+mdadm
+mtools
+nbd
+ntfs-3g
+nwipe
+open-iscsi
+partclone
+parted
+s3cmd
+s3fs-fuse
+sdparm
+sg3_utils
+simple-mtpfs
+squashfs-tools
+sysfsutils
+tc-play
+tgt
+xfsdump
+xfsprogs
 zerofree
+
+# bootloader
+efibootmgr
+efivar
+grub
+grub-i386-efi
+grub-x86_64-efi
+gummiboot
+lilo
+ms-sys
+syslinux
+vboot-utils
+
+# archives
+bsdcpio
+bsdtar
+bzip2
+cabextract
+cksfv
+cpio
+dpkg
+gzip
+lrzip
+lzop
+p7zip
+par2cmdline
+pax
+pbzip2
+pigz
+pixz
+rpmextract
+sharutils
+tar
+unrar
+unzip
+xz
 zip
-zmap
 zpaq
+
+# security
+apg
+dnsmap
+ent
+gnupg
+gnupg2
+haveged
+john
+keyutils
+libressl
+nmap
+passwdqc
+pwgen
+rng-tools
+scrypt
+sslscan
+zmap
+
+# development
+autoconf
+automake
+binutils
+bison
+cvs
+flex
+gcc
+gdb
+gettext
+git
+git-perl
+glibc-devel
+libtool
+m4
+make
+mercurial
+patch
+pkg-config
+rcs
+redo
+texinfo
+
+# rescue & forensics
+biew
+ddrescue
+dhex
+extundelete
+flashrom
+foremost
+ht
+ired
+jhead
+mtree
+pev
+rkhunter
+sleuthkit
+ssdeep
+testdisk
+tweak
+vbindiff
+
+# entertainment
+cmus
+cmus-flac
+cmus-libao
+cmus-mpc
+ddate
+libao-sndio
+mpg123
+nethack
+sndio
+vorbis-tools
+
+# backup
+csync
+csync2
+dar
+duplicity
+mt-st
+rdumpfs
+rsnapshot
+rsync
+unison
+zbackup
+
+# shells
+dash
+es
+ksh
+mksh
+posh
+rc
+tcsh
 zsh
+
+# text editors
+ed
+emacs
+jupp
+mg
+nano
+nvi
+vim
+
+# clients
+edbrowse
+elinks
+ii
+irssi
+lftp
+lynx
+mcabber
+mutt
+rtorrent
+s-nail
+sic
+tin
+trn
+w3m
diff --git a/mkhrmpf.sh b/mkhrmpf.sh
index f1a3cd4..f7f32a8 100755
--- a/mkhrmpf.sh
+++ b/mkhrmpf.sh
@@ -10,4 +10,4 @@
 	-B extra/mhdd32ver4.6.iso \
 	-B extra/ipxe.iso \
 	-B extra/memtest86+-5.01.iso \
-	-p "$(cat hrmpf.packages)"
+	-p "$(grep '^[^#].' hrmpf.packages)"