* Licence. See the file COPYING for details.
*
* (c) Lawrence Manning, 2001
- * Contains main entry point, and misc functions.
+ * Contains main entry point, and misc functions.6
*
*/
#include "install.h"
#define _GNU_SOURCE
-#define CDROM_INSTALL 0
-#define URL_INSTALL 1
-#define DISK_INSTALL 2
-#define INST_FILECOUNT 7000
+#define INST_FILECOUNT 6200
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
-int raid_disk = 0;
+#define REISER4 0
+#define REISERFS 1
+#define EXT3 2
+
FILE *flog = NULL;
char *mylog;
extern char url[STRING_SIZE];
-struct nic nics[20] = { { "" , "" } }; // only defined for compile
-struct knic knics[20] = { { "" , "" , "" } }; // only defined for compile
+struct nic nics[20] = { { "" , "" , "" } }; // only defined for compile
+struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
extern char *en_tr[];
extern char *de_tr[];
-int detect_smp() {
- FILE *fd = NULL;
- char line[STRING_SIZE];
- int cpu_count = 0;
-
- if ((fd = fopen("/proc/cpuinfo", "r")) == NULL) {
- return 0;
- }
- while (fgets(line, STRING_SIZE, fd) != NULL) {
- if (strstr(line, "processor") == line) {
- cpu_count++;
- }
- }
- (void)fclose(fd);
- return (cpu_count > 1);
-}
-
-long calc_swapsize(long memory, long disk) {
- if (memory < 128) {
- return 256;
- }
- if (memory > 1024) {
- return 512;
- }
-
- return memory*2;
-}
-
int main(int argc, char *argv[])
{
char *langnames[] = { "Deutsch", "English", NULL };
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
char hdletter;
- char harddrive[5], sourcedrive[5]; /* Device holder. */
+ char harddrive[11], sourcedrive[5]; /* Device holder. */
struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
- int cdmounted = 0; /* Loop flag for inserting a cd. */
int rc = 0;
char commandstring[STRING_SIZE];
- char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
- int installtype = CDROM_INSTALL;
+ char mkfscommand[STRING_SIZE];
+ char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL };
+ int fstype = REISER4;
int choice;
int i;
int found = 0;
char title[STRING_SIZE];
int allok = 0;
int allok_fastexit=0;
+ int raid_disk = 0;
struct keyvalue *ethernetkv = initkeyvalues();
FILE *handle, *cmdfile;
char line[STRING_SIZE];
char string[STRING_SIZE];
- long maximum_free = 0, current_free;
- long memory = 0;
+ long memory = 0, disk = 0, free;
long system_partition, boot_partition, root_partition, swap_file;
int scsi_disk = 0;
char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
} else {
fgets(line, STRING_SIZE, cmdfile);
- if (strstr (line, "noide") == NULL) {
- fprintf(flog, "Initializing IDE controllers.\n");
- initialize_ide();
- } else {
- fprintf(flog, "Skipping IDE detection.\n");
- }
- if (strstr (line, "nousb") == NULL) {
- fprintf(flog, "Initializing USB controllers.\n");
- initialize_usb();
- } else {
- fprintf(flog, "Skipping USB detection.\n");
- }
+
// check if we have to make an unattended install
if (strstr (line, "unattended") != NULL) {
unattended = 1;
- }
- // Loading the cdrom-filesystem
- mysystem("/sbin/modprobe iso9660");
- }
-
- if (unattended) {
- runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
- }
+ runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+ }
+ }
+
+ mysystem("/sbin/modprobe ide-generic");
+ mysystem("/sbin/modprobe generic");
+ mysystem("/sbin/modprobe ide-cd");
+ mysystem("/sbin/modprobe ide-disk");
+ mysystem("/sbin/modprobe uhci-hcd");
+ mysystem("/sbin/modprobe ohci-hcd");
+ mysystem("/sbin/modprobe ehci-hcd");
+ mysystem("/sbin/modprobe ohci1394");
+ mysystem("/sbin/modprobe sd_mod");
+ mysystem("/sbin/modprobe sr_mod");
+ mysystem("/sbin/modprobe usb-storage");
+ mysystem("/sbin/modprobe usbhid");
+
+ mysystem("/sbin/modprobe iso9660"); // CDROM
+ mysystem("/sbin/modprobe ext2"); // Boot patition
+ mysystem("/sbin/modprobe vfat"); // USB key
/* German is the default */
for (choice = 0; langnames[choice]; choice++)
goto EXIT;
if (!unattended) {
- rc = newtWinMenu("Language selection",
- "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
+ rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
langnames, &choice, "Ok", NULL);
}
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
- fprintf(flog, "Selected language: %s\n", shortlangname);
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
- if (!unattended) {
- sprintf(message, ctr[TR_WELCOME], NAME);
- newtWinMessage(title, ctr[TR_OK], message);
-
- sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
- rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
- 50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
- ctr[TR_CANCEL], NULL);
- } else {
- rc = 1;
- installtype = CDROM_INSTALL;
- }
-
- if (rc == 2)
- goto EXIT;
-
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
- runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
-
- /* CDROM INSTALL */
- if (installtype == CDROM_INSTALL) {
- switch (mysystem("/bin/mountsource.sh")) {
- case 0:
- installtype = CDROM_INSTALL;
- cdmounted = 1;
- break;
- case 1:
- installtype = DISK_INSTALL;
- break;
- case 10:
- errorbox(ctr[TR_NO_CDROM]);
- goto EXIT;
- }
- /* read source drive letter */
- if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
- errorbox(ctr[TR_ERROR_PROBING_CDROM]);
- goto EXIT;
- }
- fgets(sourcedrive, 5, handle);
- fprintf(flog, "Source drive: %s\n", sourcedrive);
- fclose(handle);
- }
+ sprintf(message, ctr[TR_WELCOME], NAME);
+ newtWinMessage(title, ctr[TR_OK], message);
- /* Configure the network now! */
- if (installtype == URL_INSTALL) {
- /* Network driver and params. */
- if (!(networkmenu(ethernetkv))) {
- errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
- goto EXIT;
- }
+ switch (mysystem("/bin/mountsource.sh")) {
+ case 0:
+ break;
+ case 10:
+ errorbox(ctr[TR_NO_CDROM]);
+ goto EXIT;
+ }
- /* Check for ipfire-<VERSION>.tbz2 */
- if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
- errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
- goto EXIT;
- }
+ /* read source drive letter */
+ if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
+ errorbox(ctr[TR_ERROR_PROBING_CDROM]);
+ goto EXIT;
}
+ fgets(sourcedrive, 5, handle);
+ fprintf(flog, "Source drive: %s\n", sourcedrive);
+ fclose(handle);
i = 0;
while (found == 0) {
switch (mysystem("/bin/mountdest.sh") % 255) {
case 0: // Found IDE disk
scsi_disk = 0;
+ raid_disk = 0;
found = 1;
break;
case 1: // Found SCSI disk
scsi_disk = 1;
+ raid_disk = 0;
+ found = 1;
+ break;
+ case 2: // Found RAID disk
+ scsi_disk = 0;
+ raid_disk= 1;
found = 1;
break;
case 10: // No harddisk found
}
}
- /*
- // Need to clean this up at some point
- // scsi disk is sdb/sdc when sda/sdb is used for usb-key
- // if scsi-disk is sdd or more, it is not discovered
- // Support only 2 usb keys, none could be unplugged
- if (checkusb("sdb") && try_scsi("sdc")) {
- scsi_disk = 1;
- sprintf(harddrive, "sdc");
- goto FOUND_DESTINATION;
- }
- if (checkusb("sda") && try_scsi("sdb")) {
- scsi_disk = 1;
- sprintf(harddrive, "sdb");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("sda")) {
- scsi_disk = 1;
- sprintf(harddrive, "sda");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("ida/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "ida/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("cciss/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "cciss/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("rd/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "rd/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("ataraid/d0")) {
- raid_disk = 1;
- sprintf(harddrive, "ataraid/d0");
- goto FOUND_DESTINATION;
- } */
-
- FOUND_DESTINATION:
if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
errorbox(ctr[TR_NO_HARDDISK]);
goto EXIT;
}
- fgets(harddrive, 5, handle);
+ fgets(harddrive, 11, handle);
fclose(handle);
/* load unattended configuration */
sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
if (unattended) {
hardyn = 1;
+ } else {
+ yesnoharddisk[0] = ctr[TR_NO];
+ yesnoharddisk[1] = ctr[TR_YES];
+ yesnoharddisk[2] = NULL;
}
- yesnoharddisk[0] = ctr[TR_NO];
- yesnoharddisk[1] = ctr[TR_YES];
- yesnoharddisk[2] = NULL;
-
while (! hardyn) {
rc = newtWinMenu(title, message,
50, 5, 5, 6, yesnoharddisk,
if (rc == 2)
goto EXIT;
+ if (!unattended) {
+ sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
+ rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
+ 50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
+ ctr[TR_CANCEL], NULL);
+ } else {
+ rc = 1;
+ fstype = REISER4; // Reiser4 is our standard filesystem. Love it or shut up!
+ }
+ if (rc == 2)
+ goto EXIT;
+
/* Calculate amount of memory in machine */
if ((handle = fopen("/proc/meminfo", "r")))
{
system(commandstring);
/* Calculate amount of disk space */
- if ((handle = fopen("/tmp/disksize", "r")))
- {
- fgets(line, STRING_SIZE-1, handle);
- if (sscanf (line, "%s", string)) {
- maximum_free = atoi(string) / 1024;
- }
- fclose(handle);
- }
+ if ((handle = fopen("/tmp/disksize", "r"))) {
+ fgets(line, STRING_SIZE-1, handle);
+ if (sscanf (line, "%s", string)) {
+ disk = atoi(string) / 1024;
+ }
+ fclose(handle);
+ }
- fprintf(flog, "maximum_free = %ld, memory = %ld",
- maximum_free, memory);
+ fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
- swap_file = calc_swapsize(memory, maximum_free);
-
- if (maximum_free < 512 + swap_file ) {
- if (maximum_free < 512) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- if (!unattended) {
- rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
- }
- else {
- rc = 1;
- }
+ /* Calculating Swap-Size dependend of Ram Size */
+ if (memory < 128)
+ swap_file = 32;
+ else if (memory >= 1024)
+ swap_file = 512;
+ else
+ swap_file = memory;
+
+ /* Calculating Root-Size dependend of Max Disk Space */
+ if ( disk < 756 )
+ root_partition = 200;
+ else if ( disk >= 756 && disk <= 3072 )
+ root_partition = 512;
+ else
+ root_partition = 2048;
- if (rc != 1)
- goto EXIT;
- swap_file = 0;
- }
-
+
+ /* Calculating the amount of free space */
boot_partition = 20; /* in MB */
- current_free = maximum_free - boot_partition - swap_file;
-
- root_partition = 2048 ;
- if (current_free < 512) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- current_free = current_free - root_partition;
- if (!swap_file) {
- root_partition = root_partition + swap_file;
- }
-
- system_partition = current_free;
-
- fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
- boot_partition, swap_file, system_partition, root_partition);
-
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
+
+ fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+ boot_partition, swap_file, system_partition, root_partition);
+ rc = 0;
+
+ if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition )) > 256)) ) {
+ rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
+ if (rc == 1){
+ swap_file = 0;
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
+ fprintf(flog, "Changing Swap Size to 0 MB.\n");
+ }
+ else if (rc == 2){
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+ }
+ else if (disk - (root_partition + swap_file + boot_partition) >= 256) {
+
+ }
+ else {
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+
handle = fopen("/tmp/partitiontable", "w");
/* Make swapfile */
- if (swap_file) {
- fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
- boot_partition, swap_file, root_partition);
- } else {
- fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
- boot_partition, root_partition);
- }
+ if (swap_file) {
+ fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
+ boot_partition, swap_file, root_partition);
+ } else {
+ fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
+ boot_partition, root_partition);
+ }
fclose(handle);
errorbox(ctr[TR_UNABLE_TO_PARTITION]);
goto EXIT;
}
-
- mysystem("/sbin/udevstart");
-
- snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+
+ if (fstype == REISER4) {
+ mysystem("/sbin/modprobe reiser4");
+ sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y");
+ } else if (fstype == REISERFS) {
+ mysystem("/sbin/modprobe reiserfs");
+ sprintf(mkfscommand, "/sbin/mkreiserfs -f");
+ } else if (fstype == EXT3) {
+ mysystem("/sbin/modprobe ext3");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
+ }
+
+ snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
}
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "%s %s3", mkfscommand, hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
goto EXIT;
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "%s %s4", mkfscommand, hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
{
- errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
+ errorbox(ctr[TR_UNABLE_TO_MAKE_LOG_FILESYSTEM]);
goto EXIT;
}
- /* Mount harddisk. */
- mysystem("/sbin/modprobe reiserfs"); // to be banished...
-
snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
{
goto EXIT;
}
- if (installtype == URL_INSTALL) {
- snprintf(commandstring, STRING_SIZE,
- "/bin/wget -q -O - %s/" SNAME "-" VERSION ".tbz2 | /bin/tar -C /harddisk -xvjf -", url);
- }
-
- if (installtype == CDROM_INSTALL) {
- snprintf(commandstring, STRING_SIZE,
- "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
- }
+ snprintf(commandstring, STRING_SIZE,
+ "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
ctr[TR_INSTALLING_FILES]))
errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
goto EXIT;
}
-
- /* Save USB controller type to modules.conf */
- write_usb_modules_conf();
/* Save language und local settings */
write_lang_configs(shortlangname);
/* Update /etc/fstab */
replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
+
+ if (fstype == REISER4) {
+ replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
+ replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"reiser4 ");
+ replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
+ } else if (fstype == REISERFS) {
+ replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
+ replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+ } else if (fstype == EXT3) {
+ snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
+ if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+ {
+ errorbox(ctr[TR_JOURNAL_ERROR]);
+ replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+ goto NOJOURNAL;
+ }
+ snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
+ if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+ {
+ errorbox(ctr[TR_JOURNAL_ERROR]);
+ replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+ goto NOJOURNAL;
+ }
+ replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
+ NOJOURNAL:
+ replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
+ replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+ }
/* Going to make our initrd... */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
sprintf(string, "root=%s3", hdparams.devnode_part_run);
chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
snprintf(commandstring, STRING_SIZE,
- "/sbin/chroot /harddisk /boot/grub/grubbatch");
+ "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
goto EXIT;
}
- /* Install bootsplash */
- // mysystem("/bin/installbootsplash.sh"); We cannot use this at the moment, it conflicts with our initrds...
-
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+
+ mysystem("umount /cdrom");
+ snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+ mysystem(commandstring);
if (!unattended) {
sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
NAME, SNAME, NAME);
newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
}
-
+
allok = 1;
EXIT:
newtFinished();
if (!unattended) {
- // Copy our scanned nics to the disk and lock because scan doesn't work in chroot
- system("touch /harddisk/var/ipfire/ethernet/scan_lock");
- system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
printf("Unable to run setup.\n");
- system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
}
if (system("/bin/umount /harddisk/proc"))