r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

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

Browse Source
This commit is contained in:
brent s. 2015-07-30 01:25:02 -04:00
commit c6f5a880c5
14 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extra/packages.both
View File

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

2
lib/prereqs/CentOS/meta
View File

@ -1,4 +1,5 @@
NAME='CentOS' NAME='CentOS'
# Currently fails on installing software *inside* the chroot. Will troubleshoot and restore when figured out.
SUPPORTED='yes' SUPPORTED='yes'
CHECK_METHOD='egrep "^CentOS" /etc/redhat-release' CHECK_METHOD='egrep "^CentOS" /etc/redhat-release'
PKG_MGR='yum -y install ${pkgname}' PKG_MGR='yum -y install ${pkgname}'
@ -9,6 +10,7 @@ URL='http://centos.org/'
function distro_specific_tweaks { function distro_specific_tweaks {
# NOTE: we handle installing of squashfs-tools (maybe) and xorriso in centos_is_stupid function. # 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? # 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." echo "No tweaks found."



2
lib/prereqs/Debian/meta
View File

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

2
lib/prereqs/Fedora/meta
View File

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

2
lib/prereqs/Gentoo/meta
View File

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

2
lib/prereqs/Mageia/meta
View File

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

2
lib/prereqs/Manjaro/meta
View File

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

2
lib/prereqs/Mint/meta
View File

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

4
lib/prereqs/RHEL/meta
View File

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

2
lib/prereqs/SUSE/meta
View File

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

2
lib/prereqs/Ubuntu/meta
View File

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

2
lib/prereqs/elementaryOS/meta
View File

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

2
lib/prereqs/openSUSE/meta
View File

@ -1,5 +1,5 @@
NAME='openSUSE' 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. # 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' CHECK_METHOD='egrep "^NAME=\"?openSUSE\"?$" /etc/os-release'
PKG_MGR='zypper install --no-confirm -l ${pkgname}' PKG_MGR='zypper install --no-confirm -l ${pkgname}'

2
src/ipxe

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