webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-18 23:12:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2018-12-12 09:27:59 +01:00
parent 8cf04a1656 58e840bd96
commit a13ddf04d9
284 changed files with 26196 additions and 21390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/scripts/backupiso
View File

@@ -1,13 +1,31 @@
#!/bin/sh
# FIXME: edit this lines before release
IPFVER=2.21
COREVER=$(cat /opt/pakfire/db/core/mine)
arch=$(uname -m)
case "${arch}" in
aarch64|x86_64)
;;
i?86)
arch="i586"
;;
*)
echo "Arch is not supported" >&2
exit 1
;;
esac
URL="https://downloads.ipfire.org/releases/ipfire-2.x/$IPFVER-core$COREVER/"
ISO="ipfire-$IPFVER.$arch-full-core$COREVER.iso"
makeiso() {
local dir="${1}"
local output="${2}"
local args="-J -r -V 'ipfire backup ${TS}' \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog"
local args=
# Add EFI options when EFI image is present
if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
@@ -15,7 +33,10 @@ makeiso() {
fi
# Compose ISO
mkisofs ${args} ${dir} > ${output}
mkisofs -J -r -V "IPFire ${IPFVER} ${arch}" \
-b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-c boot/isolinux/boot.catalog \
${args} ${dir} > ${output}
# Add DOS paritition table
if [ -e "${dir}/boot/isolinux/efiboot.img" ]; then
@@ -27,26 +48,6 @@ makeiso() {
return 0
}
case $arch in
i?86)
arch="i586"
echo "Your arch is $arch"
;;
x86_64)
arch="x86_64"
echo "Your arch is $arch"
;;
*)
echo "Arch is not supported"
exit 1
;;
esac
COREVER=$(cat /opt/pakfire/db/core/mine)
# FIXME: edit this lines before release
URL="https://downloads.ipfire.org/releases/ipfire-2.x/2.21-core$COREVER/"
ISO="ipfire-2.21.$arch-full-core$COREVER.iso"
if [ -z $1 ]; then
echo usage: $0 backup-file
exit
@@ -98,6 +99,9 @@ rm -r backupiso.tmp.${TS}
# Copy backup file to disk
cp "/var/ipfire/backup/${TS}.ipf" "backupiso.${TS}/backup.ipf"
# Add a version tag
touch "backupiso.${TS}/backup-${TS}.media"
echo "Running mkisofs"
makeiso backupiso.${TS} $(basename ${ISO} .iso)-${TS}.iso

17
src/scripts/makegraphs
View File

@@ -85,10 +85,17 @@ sub updatehdddata{
my $smart_output = '';
system("$path_smartctl -iHA /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
if ( -e "/var/run/smartctl_out_hddtemp-".$array[$#array] ){
my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
my @t = split(/\s+/,$hdd_output);
$temp = $t[9];
}else{$temp = 0;}
my $hdd_nvme = `grep "NVMe Log" /var/run/smartctl_out_hddtemp-$array[$#array]`;
if ( $hdd_nvme !~/NVMe Log/ ) {
my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
my @t = split(/\s+/,$hdd_output);
$temp = $t[9];
} else {
my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature:`;
my @t = split(/\s+/,$hdd_output);
$temp = $t[1];
}
} else { $temp = 0; }
print "Temperature for ".$array[$#array]."->".$temp."<-\n";
# Nur ins RDD wenn nicht 0 (sonst klappt die min Anzeige nicht)
if ($temp){
@@ -102,7 +109,7 @@ sub updatehdddata{
## Update vnstat
system ('/usr/bin/vnstat -u');
my @disks = `ls -1 /sys/block | grep -E '^sd|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
my @disks = `ls -1 /sys/block | grep -E '^sd|^nvme|^mmcblk|^xvd|^vd|^md' | sort | uniq`;
system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
foreach (@disks){
my $disk = $_;