--- /dev/null
+usr/bin/whatmask
+#usr/man/man1/whatmask.1
* spandsp-0.0.3pre24
* squashfs3.2-r2
* squid-2.6.STABLE12
-* squid-2.6.STABLE9
* squid-graph-3.2
* squidGuard-1.2.0
* stund_0.96_Aug13
* vlc-0.8.5
* web-cyradm-0.5.5-CVS-for-ipfire
* wget-1.10.2
+* whatmask-1.2
* wireless_tools.28
* wput-0.6
* xinetd-2.3.14
{
$upnpsettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system('/usr/local/bin/upnpctrl upnpdstart $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}');
+ system("/usr/local/bin/upnpctrl upnpdstart $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}");
}
elsif ($upnpsettings{'ACTION'} eq 'Stop')
{
$upnpsettings{'ENABLED'} = 'off';
&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system('/usr/local/bin/upnpctrl upnpstop');
+ system("/usr/local/bin/upnpctrl stop");
}
elsif ($upnpsettings{'ACTION'} eq $Lang::tr{'restart'})
{
&General::writehash("${General::swroot}/upnp/settings", \%upnpsettings);
- system('/usr/local/bin/upnpctrl upnpstop');
- system('/usr/local/bin/upnpctrl upnpstart $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}');
+ system("/usr/local/bin/upnpctrl stop");
+ system("/usr/local/bin/upnpctrl start $netsettings{'RED_DEV'} $netsettings{'GREEN_DEV'}");
}
&General::readhash("${General::swroot}/upnp/settings", \%upnpsettings);
}
return $status;
-}
\ No newline at end of file
+}
install -d -m 755 /etc/rc.d/init.d/net/red
install -d -m 755 /etc/rc.d/helper
install -d -m 755 /etc/sysconfig
+ -rm -rf /etc/init.d
ln -svf rc.d/init.d /etc/init.d
for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
chmod 644 /etc/rc.d/init.d/functions
for i in $(DIR_SRC)/src/initscripts/init.d/net/*; do \
- install -v -m 754 $$i /etc/rc.d/init.d/net/; \
+ if [ -f $$i ]; then \
+ install -v -m 754 $$i /etc/rc.d/init.d/net/; \
+ fi; \
done
for i in $(DIR_SRC)/src/initscripts/init.d/net/common/*; do \
ipfiremake hdparm
ipfiremake ibod
ipfiremake initscripts
+ ipfiremake whatmask
ipfiremake iptables
ipfiremake libupnp
ipfiremake ipp2p IPT=1
case "$2" in
up)
- boot_mesg -n "Starting dhcpcd on the $1 interface..."
+ boot_mesg -n "Starting dhcpcd on the $1 interface..."
+ echo -n "${1}" > /var/ipfire/red/iface
+
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]
then
if [ -n "${DHCP_HOSTNAME}" ]; then
DHCP_START+="-h ${DHCP_HOSTNAME}"
fi
- /sbin/dhcpcd $1 $DHCP_START
+ /sbin/dhcpcd $1 $DHCP_START >/dev/null 2>&1
# Save the return value
RET="$?"
# Print the assigned settings if requested
if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then
. /var/ipfire/dhcpc/dhcpcd-$1.info
+ logger -t ipfire "DHCPCD Success"
if [ "$PRINTALL" = "yes" ]; then
echo ""
echo_ok
fi
else
echo ""
+ logger -t ipfire "DHCPCD Fail"
$(exit "$RET")
evaluate_retval
fi
if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
name=red /etc/rc.d/init.d/net/ifup
fi
+ ;;
stop)
-
+ # Stopping interfaces...
+ # GREEN
+ name=green /etc/rc.d/init.d/net/ifdown
+
+ # BLUE
+ if [ "$CONFIG_TYPE" = "4" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+ name=blue /etc/rc.d/init.d/net/ifdown
+ fi
+
+ # ORANGE
+ if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "7" ]; then
+ name=orange /etc/rc.d/init.d/net/ifdown
+ fi
+
+ # RED
+ if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+ name=red /etc/rc.d/init.d/net/ifdown
+ fi
;;
restart)
/* default stuff for main/settings. */
replacekeyvalue(kv, "LANGUAGE", lang);
replacekeyvalue(kv, "HOSTNAME", SNAME);
+ replacekeyvalue(kv, "THEME", "ipfire");
writekeyvalues(kv, "/harddisk" CONFIG_ROOT "/main/settings");
freekeyvalues(kv);
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
+ fprintf(flog, "Selected language: %s\n", shortlangname);
mysystem("/bin/setfont lat0-16");
/* Save USB controller type to modules.conf */
write_usb_modules_conf();
+
+ /* Save language und local settings */
+ write_lang_configs(shortlangname);
/* touch the modules.dep files */
snprintf(commandstring, STRING_SIZE,
replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
/* if we detected SCSI/USB then fixup */
- mysystem("/bin/probecntrl.sh");
+/* mysystem("/bin/probecntrl.sh");
if ((handle = fopen("/tmp/cntrldriver", "r")))
{
char *driver;
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
}
- }
+ } */
if (raid_disk)
sprintf(string, "root=%sp3", hdparams.devnode);