From 71e9d7be5daaafa6b8d0a3668f4b4cb849786754 Mon Sep 17 00:00:00 2001 From: brent s Date: Fri, 24 Jul 2015 04:50:51 -0400 Subject: [PATCH 1/2] adding some backup packages, disabling untested distros --- extra/packages.both | 17 +++++++++++++++-- lib/prereqs/CentOS/meta | 4 +++- lib/prereqs/Debian/meta | 2 +- lib/prereqs/Fedora/meta | 2 +- lib/prereqs/Gentoo/meta | 2 +- lib/prereqs/Mageia/meta | 2 +- lib/prereqs/Manjaro/meta | 2 +- lib/prereqs/Mint/meta | 2 +- lib/prereqs/RHEL/meta | 4 ++-- lib/prereqs/SUSE/meta | 2 +- lib/prereqs/Ubuntu/meta | 2 +- lib/prereqs/elementaryOS/meta | 2 +- lib/prereqs/openSUSE/meta | 2 +- 13 files changed, 30 insertions(+), 15 deletions(-) diff --git a/extra/packages.both b/extra/packages.both index 871c2cf..8765f95 100644 --- a/extra/packages.both +++ b/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 diff --git a/lib/prereqs/CentOS/meta b/lib/prereqs/CentOS/meta index f552883..7861b7e 100644 --- a/lib/prereqs/CentOS/meta +++ b/lib/prereqs/CentOS/meta @@ -1,5 +1,6 @@ NAME='CentOS' -SUPPORTED='yes' +# Currently fails on installing software *inside* the chroot. Will troubleshoot and restore when figured out. +SUPPORTED='untested' CHECK_METHOD='egrep "^CentOS" /etc/redhat-release' PKG_MGR='yum -y install ${pkgname}' PRE_RUN='none' @@ -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." diff --git a/lib/prereqs/Debian/meta b/lib/prereqs/Debian/meta index 1c9eab3..afd1093 100644 --- a/lib/prereqs/Debian/meta +++ b/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' diff --git a/lib/prereqs/Fedora/meta b/lib/prereqs/Fedora/meta index 3ab01f1..156be2a 100644 --- a/lib/prereqs/Fedora/meta +++ b/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' diff --git a/lib/prereqs/Gentoo/meta b/lib/prereqs/Gentoo/meta index 5c1b9dc..aa004a2 100644 --- a/lib/prereqs/Gentoo/meta +++ b/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' diff --git a/lib/prereqs/Mageia/meta b/lib/prereqs/Mageia/meta index 4f62a30..6a86a74 100644 --- a/lib/prereqs/Mageia/meta +++ b/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' diff --git a/lib/prereqs/Manjaro/meta b/lib/prereqs/Manjaro/meta index e88e970..f19f900 100644 --- a/lib/prereqs/Manjaro/meta +++ b/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' diff --git a/lib/prereqs/Mint/meta b/lib/prereqs/Mint/meta index ad5d74b..36f219e 100644 --- a/lib/prereqs/Mint/meta +++ b/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' diff --git a/lib/prereqs/RHEL/meta b/lib/prereqs/RHEL/meta index d5319ab..81e9c3a 100644 --- a/lib/prereqs/RHEL/meta +++ b/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' diff --git a/lib/prereqs/SUSE/meta b/lib/prereqs/SUSE/meta index cbdb475..cc0eafb 100644 --- a/lib/prereqs/SUSE/meta +++ b/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}' diff --git a/lib/prereqs/Ubuntu/meta b/lib/prereqs/Ubuntu/meta index aaa98f2..c2a3372 100644 --- a/lib/prereqs/Ubuntu/meta +++ b/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' diff --git a/lib/prereqs/elementaryOS/meta b/lib/prereqs/elementaryOS/meta index 34f10ae..943e46a 100644 --- a/lib/prereqs/elementaryOS/meta +++ b/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' diff --git a/lib/prereqs/openSUSE/meta b/lib/prereqs/openSUSE/meta index d33230d..1093ebe 100644 --- a/lib/prereqs/openSUSE/meta +++ b/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}' From 003605533095f2d056cddc8230424787b1ace1cc Mon Sep 17 00:00:00 2001 From: brent s Date: Fri, 24 Jul 2015 04:53:55 -0400 Subject: [PATCH 2/2] updating ipxe sources. fingers crossed patches still work, haven't tested yet. --- src/ipxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipxe b/src/ipxe index 24112d9..2b15ae5 160000 --- a/src/ipxe +++ b/src/ipxe @@ -1 +1 @@ -Subproject commit 24112d91a0ab4c29794bc7750cbfc4166bc9026a +Subproject commit 2b15ae55073dfbaf66dbbb41ebe804a16cf47f1e