#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16.42-ipfire
-# Sun Mar 25 17:52:03 2007
+# Sat Apr 7 18:35:00 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_FAT_FS=m
# CONFIG_MSDOS_FS is not set
CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_CODEPAGE=850
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
#
# Hardware crypto devices
#
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=y
#
# Library routines
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16.42-ipfire
-# Sun Mar 25 17:52:32 2007
+# Sat Apr 7 18:35:28 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_FAT_FS=m
# CONFIG_MSDOS_FS is not set
CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_CODEPAGE=850
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_NTFS_FS is not set
#
# Hardware crypto devices
#
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=y
#
# Library routines
#opt/i586-uClibc/usr/include/sysfs
#opt/i586-uClibc/usr/include/sysfs/dlist.h
#opt/i586-uClibc/usr/include/sysfs/libsysfs.h
+#bin/dlist_test
+#bin/get_bus_devices_list
+#bin/get_class_dev
+#bin/get_classdev_parent
+#bin/get_device
+#bin/get_driver
+#bin/systool
+#bin/testlibsysfs
+#bin/write_attr
+#lib/libsysfs.a
+#lib/libsysfs.la
+lib/libsysfs.so
+lib/libsysfs.so.1
+lib/libsysfs.so.1.0.3
+#man
+#man/man1
+#man/man1/systool.1
+#usr/include/sysfs
+#usr/include/sysfs/dlist.h
+#usr/include/sysfs/libsysfs.h
# Touch empty files
for i in auth/users backup/include.user backup/exclude.user \
certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
- dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
+ dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings\
isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
-mkdir -p /var/ipfire/samba
- cp -vf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
+ cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
chown nobody:nobody -R /var/ipfire/samba/
cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global
cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc
cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares
cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer
cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
- useradd -c 'Samba User' -s /bin/false
- groupadd sambauser
- groupadd sambawks
+ #useradd -c 'Samba User' -s /bin/false
+ #groupadd sambauser
+ #groupadd sambawks
@rm -rf $(DIR_APP)
@$(POSTBUILD)
# Create directories
-mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt}
- -mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
+ -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
extras/firmware extras/floppy extras/path_id \
extras/scsi_id extras/usb_id extras/volume_id" install
cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/
+ touch /etc/udev/rules.d/30-persistent-network.rules
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)
beautify message DONE
# Create images for install
- if [ ! -f ipfire-$VERSION.i586-devel.iso ]; then
- ipfiremake cdrom ED=devel
- fi
+ #if [ ! -f $BASEDIR/ipfire-$VERSION.i586-devel.iso ]; then
+ # ipfiremake cdrom ED=devel
+ #fi
ipfiremake cdrom ED=full
# Check if there is a loop device for building in virtual environments
fi
$PPPCOMMAND "${PPPOECOMMAND}" $ARGS $DEMAND >/dev/null 2>&1
+ PID=$$
evaluate_retval
+ echo $PID > /var/run/ppp-ipfire.pid
else
modprobe pppoe
fi
$PPPCOMMAND $DEMAND >/dev/null 2>&1
+ PID=$$
evaluate_retval
+ echo $PID > /var/run/ppp-ipfire.pid
fi
;;
boot_mesg "Bringing down the PPPoE interface on ${1}..."
modprobe -r pppoe >/dev/null 2>&1
- killall pppd
+ kill $(cat /var/run/pppd-ipfire.pid)
sleep 2
ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${1}
// 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) {
fclose(flog);
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"))
#!/bin/sh
-hwinfo --netcard | egrep "Model|HW Address" | \
- awk -F": " '{ print $2 }' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" | \
- tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | \
- sort > /var/ipfire/ethernet/scanned_nics 2>/dev/null
+case "$1" in
+ install)
+ hwinfo --netcard | egrep "Model|HW Address" | \
+ awk -F": " '{ print $2 }' | sed -e '/..:..:..:..:..:../a\\' | sed -e "s/$/\;/g" | \
+ tr "\n" "XX" | sed -e "s/XX/\n/g" | sed -e "s/\;X/\;/g" | \
+ sort > /tmp/scanned_nics 2>/dev/null
+ ;;
+ "")
+ if [ ! -e /var/ipfire/ethernet/scan_lock ]; then
+ hwinfo --netcard | egrep "Model|HW Address" | \
+ awk -F": " '{ print $2 }' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" | \
+ tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | \
+ sort > /var/ipfire/ethernet/scanned_nics 2>/dev/null
+ fi
+ ;;
+esac
+exit 0
mysystem("/bin/probenic.sh");
// Read the nics we already use
- if( (fp = fopen(KNOWN_NICS, "r")) == NULL )
+ if((fp = fopen(KNOWN_NICS, "r")) == NULL)
{
fprintf(flog,"Couldn't open " KNOWN_NICS);
return 1;
}
-
while (fgets(temp_line, STRING_SIZE, fp) != NULL)
{
strcpy(knics[kcount].description, strtok(temp_line,";"));
return 0;
} else {
// We have to add here that you can manually add a device
- newtWinMessage("NetcardMenu", ctr[TR_OK], "Es wurden leider keine freien Netzwerkkarten fuer die Schnittstelle \"%s\" in ihrem System gefunden.", colour);
+ errorbox("Es wurden leider keine freien Netzwerkkarten fuer die Schnittstelle in ihrem System gefunden.");
return 1;
}
}
char temp[STRING_SIZE];
int configtype;
int green = 0, red = 0, blue = 0, orange = 0;
-
+
if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")))
{
freekeyvalues(kv);
return 0;
}
- strcpy(temp, "0"); findkey(kv, "CONFIG_TYPE", temp);
- configtype = atol(temp);
-
runcommandwithstatus("/etc/rc.d/init.d/network stop red blue orange",
ctr[TR_PUSHING_NON_LOCAL_NETWORK_DOWN]);
-
+
if (configtype == 0)
{ green = 1; }
else if (configtype == 1)
else if (configtype == 6)
{ green = 1; red = 1; blue = 1; }
else if (configtype == 7)
- { green = 1; red = 1; blue = 1; orange = 1;}
+ { green = 1; red = 1; blue = 1; orange = 1; }
if (green && !cardassigned("green"))
nicmenu("green");