webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: remove kudzu from scriots.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-08-13 14:24:27 +02:00
parent acb59f3a99
commit 337726bf3a
3 changed files with 31 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/install+setup/install/main.c
View File

@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
// Load common modules // Load common modules
mysystem("/sbin/modprobe iso9660"); // CDROM mysystem("/sbin/modprobe iso9660"); // CDROM
mysystem("/sbin/modprobe ext2"); // Boot patition // mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key mysystem("/sbin/modprobe vfat"); // USB key
/* German is the default */ /* German is the default */
@@ -375,16 +375,16 @@ int main(int argc, char *argv[])
} }
if (fstype == EXT2) { if (fstype == EXT2) {
mysystem("/sbin/modprobe ext2"); // mysystem("/sbin/modprobe ext2");
sprintf(mkfscommand, "/sbin/mke2fs -T ext2"); sprintf(mkfscommand, "/sbin/mke2fs -T ext2");
} else if (fstype == REISERFS) { } else if (fstype == REISERFS) {
mysystem("/sbin/modprobe reiserfs"); mysystem("/sbin/modprobe reiserfs");
sprintf(mkfscommand, "/sbin/mkreiserfs -f"); sprintf(mkfscommand, "/sbin/mkreiserfs -f");
} else if (fstype == EXT3) { } else if (fstype == EXT3) {
mysystem("/sbin/modprobe ext3"); // mysystem("/sbin/modprobe ext3");
sprintf(mkfscommand, "/sbin/mke2fs -T ext3"); sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
} else if (fstype == EXT4) { } else if (fstype == EXT4) {
mysystem("/sbin/modprobe ext4"); // mysystem("/sbin/modprobe ext4");
sprintf(mkfscommand, "/sbin/mke2fs -T ext4"); sprintf(mkfscommand, "/sbin/mke2fs -T ext4");
} }

78
src/install+setup/install/mountdest.sh
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -21,30 +21,10 @@
echo "Scanning for possible destination drives" echo "Scanning for possible destination drives"
# scan IDE devices # scan sd?
echo "--> IDE" echo "--> sd?"
for DEVICE in $(kudzu -qps -t 30 -c HD -b IDE | grep device: | cut -d ' ' -f 2 | sort | uniq); do for DEVICE in `find /sys/block/* -maxdepth 0 -name sd* -exec basename {} \; | sort | uniq`
if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then do
umount /harddisk 2> /dev/null
echo "${DEVICE} is empty - SKIP"
continue
fi
mount /dev/${DEVICE}1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP"
continue
else
umount /harddisk 2> /dev/null
echo -n "$DEVICE" > /tmp/dest_device
echo "${DEVICE} - yes, it is our destination"
exit 0 # IDE / use DEVICE for grub
fi
done
# scan USB/SCSI devices
echo "--> USB/SCSI"
for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do
if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
echo "${DEVICE} is empty - SKIP" echo "${DEVICE} is empty - SKIP"
@@ -66,19 +46,15 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
echo -n "$DEVICE" > /tmp/dest_device echo -n "$DEVICE" > /tmp/dest_device
echo "${DEVICE} - yes, it is our destination" echo "${DEVICE} - yes, it is our destination"
exit 1 # SCSI/USB (always use /dev/sda as bootdevicename) exit 1 # (always use /dev/sda as bootdevicename)
fi fi
fi fi
done done
# scan RAID devices # scan other
echo "--> RAID" echo "--> other"
for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do for DEVICE in `find /sys/block/* -maxdepth 0 ! -name sd* ! -name sr* ! -name fd* ! -name loop* ! -name ram* -exec basename {} \; | sort | uniq`
if [ "$(grep ${DEVICE}p1 /proc/partitions)" = "" ]; then do
umount /harddisk 2> /dev/null
echo "${DEVICE}p1 is empty - SKIP"
continue
fi
mount /dev/${DEVICE}p1 /harddisk 2> /dev/null mount /dev/${DEVICE}p1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null umount /harddisk 2> /dev/null
@@ -112,38 +88,4 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2
fi fi
done done
# Virtio devices
echo "--> Virtio"
for DEVICE in vda vdb vdc vdd; do
if [ ! -e /dev/${DEVICE} ]; then
continue
else
if [ "$(grep ${DEVICE} /proc/partitions)" = "" ]; then
umount /harddisk 2> /dev/null
echo "${DEVICE} is empty - SKIP"
continue
fi
mount /dev/${DEVICE} /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null
echo "${DEVICE} is source drive - SKIP"
continue
else
umount /harddisk 2> /dev/null
mount /dev/${DEVICE}1 /harddisk 2> /dev/null
if [ -n "$(ls /harddisk/ipfire-*.tlz 2>/dev/null)" ]; then
umount /harddisk 2> /dev/null
echo "${DEVICE}1 is source drive - SKIP"
continue
else
umount /harddisk 2> /dev/null
echo -n "$DEVICE" > /tmp/dest_device
echo "${DEVICE} - yes, it is our destination"
exit 0 # like ide / use device for grub
fi
fi
fi
done
exit 10 # Nothing found exit 10 # Nothing found

29
src/install+setup/install/mountsource.sh
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -21,8 +21,9 @@
echo "Scanning source media" echo "Scanning source media"
# scan CDROM devices # scan all Block devices
for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
do
mount /dev/${DEVICE} /cdrom 2> /dev/null mount /dev/${DEVICE} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
echo -n ${DEVICE} > /tmp/source_device echo -n ${DEVICE} > /tmp/source_device
@@ -34,9 +35,10 @@ for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sor
umount /cdrom 2> /dev/null umount /cdrom 2> /dev/null
done done
# scan HD device part1 (usb sticks, etc.) # scan all Partitions on block devices
for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///");do do
for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///" 2> /dev/null);do
mount /dev/${DEVICEP} /cdrom 2> /dev/null mount /dev/${DEVICEP} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
echo -n ${DEVICEP} > /tmp/source_device echo -n ${DEVICEP} > /tmp/source_device
@@ -49,17 +51,20 @@ for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort |
done done
done done
# scan HD device unpart (usb sticks, etc.) # scan all Partitions on raid/mmc devices
for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
mount /dev/${DEVICE} /cdrom 2> /dev/null do
for DEVICEP in $(ls /dev/${DEVICE}p? | sed "s/\/dev\///");do
mount /dev/${DEVICEP} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then
echo -n ${DEVICE} > /tmp/source_device echo -n ${DEVICEP} > /tmp/source_device
echo "Found tarball on ${DEVICE}" echo "Found tarball on ${DEVICEP}"
exit 0 exit 0
else else
echo "Found no tarballs on ${DEVICE} - SKIP" echo "Found no tarballs on ${DEVICEP} - SKIP"
fi fi
umount /cdrom 2> /dev/null umount /cdrom 2> /dev/null
done
done done
exit 10 exit 10