mkhrmpf.sh: refactor.

2 files changed, 337 insertions, 343 deletions

diff --git a/hrmpf.packages b/hrmpf.packages
new file mode 100644
index 0000000..cacb3e8
--- /dev/null
+++ b/hrmpf.packages
@@ -0,0 +1,328 @@
+acpi
+aiccu
+alsa-lib
+alsa-utils
+apg
+at
+attr
+autoconf
+automake
+bc
+biew
+bind-utils
+binutils
+bison
+bmon
+bonnie++
+bridge-utils
+bsdcpio
+bsdtar
+btrfs-progs
+busybox
+bwm-ng
+byobu
+bzip2
+cabextract
+cdrtools
+cksfv
+cpio
+cpuburn
+cpufrequtils
+cpupower
+cronie
+cryptsetup
+csync
+csync2
+curl
+cv
+cvs
+daemonize
+dar
+dash
+dateutils
+ddate
+ddclient
+ddrescue
+debootstrap
+dhcpcd
+dhex
+di
+dialog
+diffutils
+dmraid
+dnsmap
+dnsmasq
+dos2unix
+dosfstools
+dpkg
+dstat
+duff
+duplicity
+dwdiff
+e2fsprogs
+ebtables
+ed
+edbrowse
+efmd
+eject
+elinks
+emacs
+ent
+entr
+es
+ethtool
+exfat-utils
+ext4magic
+extrace
+extundelete
+fastd
+fatrace
+fbset
+fbterm
+fdupes
+file
+findutils
+firejail
+flex
+foremost
+fping
+fuse
+fuse-exfat
+fuse-sshfs
+gawk
+gcc
+gdb
+gettext
+git
+git-perl
+git-svn
+glibc-devel
+gnupg
+gnupg2
+gpm
+gptfdisk
+grep
+grub
+gzip
+haveged
+hdapsd
+hddtemp
+hdparm
+hfsprogs
+horst
+hostapd
+ht
+htop
+httpie
+ifenslave
+iftop
+inetutils-ftp
+inetutils-inetd
+inetutils-talk
+inetutils-telnet
+inotify-tools
+iodine
+ioping
+iotop
+ipcalc
+iperf
+iproute2
+ipset
+iptables
+iptraf-ng
+iputils
+irqbalance
+irssi
+iw
+jfsutils
+john
+jupp
+kbd
+kbd-data
+kexec-tools
+kpartx
+kpcli
+ksh
+less
+lftp
+liboping
+libressl-openssl
+libtool
+lilo
+linux-firmware
+lm_sensors
+logrotate
+lshw
+lsof
+ltrace
+lvm2
+lxc
+lynx
+lzop
+m4
+make
+mbuffer
+mc
+mcabber
+mcelog
+mdadm
+memtest86+
+mercurial
+mg
+miller
+mksh
+mmv
+mosh
+most
+mpg123
+msmtp
+msrc_base
+mt-st
+mtools
+mtr
+mtree
+multitail
+mutt
+ncdu
+ndisc6
+net-snmp
+net-tools
+nfs-utils
+nftables
+ngrep
+nmap
+nmon
+nq
+nsd
+ntfs-3g
+ntp
+numactl
+nvi
+nwipe
+open-iscsi
+openbsd-netcat
+opensmtpd
+openssh
+openvpn
+oue
+outils
+p7zip
+partclone
+parted
+passwdqc
+patch
+pax
+pax-utils
+pbzip2
+pciutils
+perl
+pev
+pflask-git
+picocom
+pigz
+pixz
+pkg-config
+pm-utils
+pmr
+posh
+powertop
+ppp
+pptpclient
+privoxy
+procmail
+profanity
+pv
+pwgen
+python
+radvd
+rc
+rcs
+rdfind
+rdumpfs
+redo
+reptyr
+rfkill
+rkhunter
+rng-tools
+rpcbind
+rpmextract
+rsnapshot
+rsync
+rsyslog
+rtorrent
+ruby
+runit-kdump
+s-nail
+s3cmd
+s3fs-fuse
+samba
+sample
+schroot
+screen
+sdparm
+sg3_utils
+sharutils
+shorewall
+shorewall6
+simple-mtpfs
+sleuthkit
+slrn
+slurm
+smartmontools
+sndio
+socat
+squashfs-tools
+ssdeep
+sslscan
+strace
+stunnel
+subversion
+sudo
+sysfsutils
+syslinux
+sysstat
+tar
+tcpdump
+tcsh
+testdisk
+texinfo
+tftp-hpa
+tgt
+tin
+tlsdate
+tmux
+tor
+trace-cmd
+traceroute
+tree
+tweak
+unbound
+unison
+unrar
+unzip
+usbutils
+util-linux
+vbindiff
+vde2
+vim
+vpnc
+w3m
+which
+whois
+wireless_tools
+wol
+wpa_supplicant
+wvdial
+xfsdump
+xfsprogs
+xinetd
+xjobs
+xmlstarlet
+xtools
+xz
+zbackup
+zerofree
+zip
+zmap
+zpaq
+zsh
diff --git a/mkhrmpf.sh b/mkhrmpf.sh
index 9755f1d..fbe0199 100755
--- a/mkhrmpf.sh
+++ b/mkhrmpf.sh
@@ -1,345 +1,11 @@
 #!/bin/sh
 
-pkgs='
-acpi
-aiccu
-alpine
-alsa-lib
-alsa-utils
-apg
-at
-attr
-autoconf
-automake
-bc
-biew
-bind-utils
-binutils
-bison
-bmon
-bonnie++
-bridge-utils
-bsdcpio
-bsdtar
-btrfs-progs
-busybox
-bwm-ng
-byobu
-bzip2
-cabextract
-cdrtools
-cksfv
-cpio
-cpuburn
-cpufrequtils
-cpupower
-crash
-cronie
-cryptsetup
-csync
-csync2
-curl
-cv
-cvs
-daemonize
-dar
-dash
-dateutils
-ddate
-ddclient
-ddrescue
-debootstrap
-dhcpcd
-dhex
-di
-dialog
-diffutils
-dmraid
-dnsmap
-dnsmasq
-dos2unix
-dosfstools
-dpkg
-dstat
-duff
-duplicity
-dwdiff
-e2fsprogs
-ebtables
-ed
-edbrowse
-efmd
-eject
-elinks
-emacs
-ent
-entr
-es
-ethtool
-exfat-utils
-ext4magic
-extrace
-extundelete
-fastd
-fatrace
-fbset
-fbterm
-fdupes
-file
-findutils
-firejail
-flex
-foremost
-fping
-fuse
-fuse-exfat
-fuse-sshfs
-gawk
-gcc
-gdb
-gettext
-git
-git-perl
-git-svn
-glibc-devel
-gnupg
-gnupg2
-gpm
-gptfdisk
-grep
-grub
-gzip
-haveged
-hdapsd
-hddtemp
-hdparm
-hfsprogs
-horst
-hostapd
-ht
-htop
-httpie
-ifenslave
-iftop
-inetutils-ftp
-inetutils-inetd
-inetutils-talk
-inetutils-telnet
-inotify-tools
-iodine
-ioping
-iotop
-ipcalc
-iperf
-iproute2
-ipset
-iptables
-iptraf-ng
-iputils
-irqbalance
-irssi
-iw
-jfsutils
-john
-jupp
-kbd
-kbd-data
-kexec-tools
-kpartx
-kpcli
-ksh
-less
-lftp
-liboping
-libressl-openssl
-libtool
-lilo
-linux-firmware
-lm_sensors
-logrotate
-lshw
-lsof
-ltrace
-lvm2
-lxc
-lynx
-lzop
-m4
-make
-mbuffer
-mc
-mcabber
-mcelog
-mdadm
-memtest86+
-mercurial
-mg
-miller
-mksh
-mmv
-mosh
-most
-mpg123
-msmtp
-msrc_base
-mt-st
-mtools
-mtr
-mtree
-multitail
-mutt
-ncdu
-ndisc6
-net-snmp
-net-tools
-nfs-utils
-nftables
-ngrep
-nmap
-nmon
-nq
-nsd
-ntfs-3g
-ntp
-numactl
-nvi
-nwipe
-open-iscsi
-openbsd-netcat
-openssh
-openvpn
-oue
-outils
-p7zip
-partclone
-parted
-passwdqc
-patch
-pax
-pax-utils
-pbzip2
-pciutils
-perl
-pev
-pflask-git
-picocom
-pigz
-pixz
-pkg-config
-pm-utils
-pmr
-posh
-postfix
-powertop
-ppp
-pptpclient
-privoxy
-procmail
-profanity
-pv
-pwgen
-python
-radvd
-rc
-rcs
-rdfind
-rdumpfs
-redo
-reptyr
-rfkill
-rkhunter
-rng-tools
-rpcbind
-rpmextract
-rsnapshot
-rsync
-rsyslog
-rtorrent
-ruby
-runit-kdump
-s-nail
-s3cmd
-s3fs-fuse
-samba
-sample
-schroot
-screen
-sdparm
-sg3_utils
-sharutils
-shorewall
-shorewall6
-simple-mtpfs
-sleuthkit
-slrn
-slurm
-smartmontools
-sndio
-socat
-squashfs-tools
-ssdeep
-sslscan
-strace
-stunnel
-subversion
-sudo
-sysfsutils
-syslinux
-sysstat
-tar
-tcpdump
-tcsh
-testdisk
-texinfo
-tftp-hpa
-tgt
-tin
-tlsdate
-tmux
-tor
-trace-cmd
-traceroute
-tree
-tweak
-unbound
-unison
-unrar
-unzip
-usbutils
-util-linux
-vbindiff
-vde2
-vim
-vpnc
-w3m
-which
-whois
-wireless_tools
-wol
-wpa_supplicant
-wvdial
-xfsdump
-xfsprogs
-xinetd
-xjobs
-xmlstarlet
-xtools
-xz
-zbackup
-zerofree
-zip
-zmap
-zpaq
-zsh
-'
-#for p in $pkgs; do
-#	echo -n "$p "
-#	xbps-query -R -p installed_size -S $p
-#	xbps-query --fulldeptree -R -x $p
-#done
-#exit 1
-
-./mklive.sh -T "hrmpf live/rescue system" -C "loglevel=6 printk.time=1 net.ifnames=0" -r http://repo.voidlinux.eu/current -r http://repo.voidlinux.eu/current/nonfree -p "$pkgs"
-# cups?
-# qemu?
-# zfs?
+./mklive.sh \
+	-T "hrmpf live/rescue system" \
+	-C "loglevel=6 printk.time=1 net.ifnames=0" \
+	-r http://repo.voidlinux.eu/current \
+	-r http://repo.voidlinux.eu/current/nonfree \
+	-B extra/balder10.img \
+	-B extra/mhdd32ver4.6.iso \
+	-B extra/ipxe.iso \
+	-p "$(cat hrmpf.packages)"