Merge branch 'master' of square-r00t.net:bdisk

extra/packages.both

@@ -12,14 +12,19 @@ asciidoc
 atop
 autopsy
 autossh
+backuppc
+#bacula ## TODO: grab all the bacula packages in here
 beep
 bin86
 bind-tools
 binutils
 bluez-utils
 bonnie++
+boxbackup-client
+boxbackup-server
 bozocrack-git
 bridge-utils
+burp-backup-git
 btrfs-progs
 cabextract
 cdrtools
@@ -30,6 +35,7 @@ chntpw
 cifs-utils
 ckermit
 clamav
+clonezilla
 cmospwd
 colordiff
 cowpatty
@@ -39,6 +45,7 @@ cpupower
 crackpkcs12
 #cryptcat
 cryptsetup
+csync2
 customizepkg-scripting
 dar
 dcfldd
@@ -156,6 +163,7 @@ megaraid-cli
 memtester
 mfoc
 minicom
+mondo
 mtd-utils
 mtr
 mtree
@@ -177,6 +185,7 @@ nmon
 ntfs-3g
 ntfsfixboot
 nwipe
+obnam
 open-iscsi
 openipmi
 ophcrack
@@ -184,6 +193,8 @@ os-prober
 p7zip
 pack
 par2cmdline
+partclone
+partclone-utils
 parted
 partimage
 pax-utils
@@ -207,7 +218,7 @@ procps-ng
 progsreiserfs
 psmisc
 pwgen
-pxz
+pixz
 pyrit-svn
 python2-gnuplot
 python2-pyx
@@ -241,7 +252,7 @@ smartmontools
 smbclient
 s-nail
 socat
-#star
+#star ## do people even USE tape packups anymore?
 strace
 stress
 sucrack
@@ -263,6 +274,7 @@ tor
 udftools
 #udpcast
 unace
+unison
 unrar
 unshield
 unzip
@@ -295,6 +307,7 @@ xfsprogs
 xmlto
 xorg
 xorg-drivers
+xorg-xinit
 zerofree
 zip
 zsh

lib/prereqs/CentOS/meta

@@ -1,4 +1,5 @@
 NAME='CentOS'
+# Currently fails on installing software *inside* the chroot. Will troubleshoot and restore when figured out.
 SUPPORTED='yes'
 CHECK_METHOD='egrep "^CentOS" /etc/redhat-release'
 PKG_MGR='yum -y install ${pkgname}'
@@ -9,6 +10,7 @@ URL='http://centos.org/'
 function distro_specific_tweaks {
  # NOTE: we handle installing of squashfs-tools (maybe) and xorriso in centos_is_stupid function.
  # because they *suck*. Seriously. I need to install tk just to install xorriso. I mean, what?
+ # You need EPEL enabled, by the way.
 
  echo "No tweaks found."
 

lib/prereqs/Debian/meta

@@ -1,5 +1,5 @@
 NAME='Debian'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^NAME=\"Debian\ GNU/Linux\"$" /etc/os-release'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get update'

lib/prereqs/Fedora/meta

@@ -1,5 +1,5 @@
 NAME='Fedora'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep '^Fedora' /etc/redhat-release'
 PKG_MGR='dnf -y install ${pkgname}'
 PRE_RUN='none'

lib/prereqs/Gentoo/meta

@@ -1,5 +1,5 @@
 NAME='Gentoo'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^Gentoo\ Base\ System" /etc/gentoo-release'
 PKG_MGR='emerge -q1Dn ${pkgname}'
 PRE_RUN='emerge -q --sync'

lib/prereqs/Mageia/meta

@@ -1,5 +1,5 @@
 NAME='Mageia'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^Mageia\ release\ " /etc/mageia-release'
 PKG_MGR='urpmi --force --auto ${pkgname}'
 PRE_RUN='urpmi.update -a'

lib/prereqs/Manjaro/meta

@@ -1,5 +1,5 @@
 NAME='Manjaro'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^NAME=\"Manjaro Linux\"$" /etc/os-release'
 PKG_MGR='pacman -S --needed --noconfirm ${pkgname}'
 PRE_RUN='pacman -Syyyu'

lib/prereqs/Mint/meta

@@ -1,5 +1,5 @@
 NAME='Mint'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^DESCRIPTION=\"Linux\ Mint\"" /etc/linuxmint/info'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'

lib/prereqs/RHEL/meta

@@ -1,5 +1,5 @@
-NAME=RHEL
-SUPPORTED=yes
+NAME='RHEL'
+SUPPORTED='untested'
 # Red Hat Enterprise Linux Server release 6.5 (Santiago)
 CHECK_METHOD='egrep "^Red\ Hat\ Enterprise\ Linux" /etc/redhat-release'
 PKG_MGR='yum -y install'

lib/prereqs/SUSE/meta

@@ -1,5 +1,5 @@
 NAME='SUSE'
-SUPPORTED='yes'
+SUPPORTED='untested'
 # Both SLED and SLES. We can probably safely combine them.
 CHECK_METHOD='egrep "^NAME=\"SLE(D|S)\"$" /etc/os-release'
 PKG_MGR='zypper install --no-confirm -l ${pkgname}'

lib/prereqs/Ubuntu/meta

@@ -1,5 +1,5 @@
 NAME='Ubuntu'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^DISTRIB_ID=Ubuntu$" /etc/lsb-release'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'

lib/prereqs/elementaryOS/meta

@@ -1,5 +1,5 @@
 NAME='elementaryOS'
-SUPPORTED='yes'
+SUPPORTED='untested'
 CHECK_METHOD='egrep "^DISTRIB_ID=\"elementary OS\"$" /etc/lsb-release'
 PKG_MGR='apt-get -y install ${pkgname}'
 PRE_RUN='apt-get -y update'

lib/prereqs/openSUSE/meta

@@ -1,5 +1,5 @@
 NAME='openSUSE'
-SUPPORTED='yes'
+SUPPORTED='untested'
 # Default doesn't have the quotes around the value, but I have a feeling that's a bug that will get "fixed" soon.
 CHECK_METHOD='egrep "^NAME=\"?openSUSE\"?$" /etc/os-release'
 PKG_MGR='zypper install --no-confirm -l ${pkgname}'

src/ipxe

@@ -1 +1 @@
-Subproject commit 24112d91a0ab4c29794bc7750cbfc4166bc9026a
+Subproject commit ae7f22eb28dbfdd0e4743a2d9e7aa33344a07246